diff --git a/.clang-format b/.clang-format
index 5649307e1055..36cdf8b7ede8 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,3 +1,93 @@
+# QGroundControl C++ Code Formatting
+# Based on Google style with QGC customizations
+# Matches CodingStyle.cc/h patterns
+
 BasedOnStyle: Google
+Language: Cpp
+
+# Line length and indentation
 ColumnLimit: 120
 IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ContinuationIndentWidth: 4
+
+# Bracing - Custom QGC style
+# Functions/Classes: New line (Allman)
+# Control statements: Same line (K&R)
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterClass: true
+  AfterControlStatement: Never
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: false
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+
+# Pointer and reference alignment
+PointerAlignment: Left
+ReferenceAlignment: Left
+DerivePointerAlignment: false
+
+# Spacing
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInAngles: Never
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# Include sorting
+SortIncludes: CaseSensitive
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^<Q.*>'  # Qt headers
+    Priority: 1
+  - Regex: '^<.*>'   # System/STL headers
+    Priority: 2
+  - Regex: '.*'      # Project headers
+    Priority: 3
+
+# Alignment
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignOperands: Align
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 1
+
+# Line breaks
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ConstructorInitializerIndentWidth: 4
+
+# Namespace formatting
+CompactNamespaces: false
+NamespaceIndentation: None
+
+# Other formatting
+BinPackArguments: true
+BinPackParameters: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+ReflowComments: true
+Standard: c++20
diff --git a/.clang-tidy b/.clang-tidy
index 5e2e27df0e17..0b8dc84b8e11 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,66 @@
+# QGroundControl C++ Static Analysis
+# Clang-Tidy configuration for C++20 and Qt 6
+
 ---
 Checks: >
-    clang-analyzer-*,
-WarningsAsErrors: '*'
+  -*,
+  bugprone-*,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-exception-escape,
+  clang-analyzer-*,
+  -clang-analyzer-cplusplus.NewDeleteLeaks,
+  modernize-*,
+  -modernize-use-trailing-return-type,
+  -modernize-avoid-c-arrays,
+  performance-*,
+  readability-*,
+  -readability-magic-numbers,
+  -readability-identifier-length,
+  -readability-function-cognitive-complexity,
+  cppcoreguidelines-*,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -cppcoreguidelines-pro-type-vararg,
+  -cppcoreguidelines-avoid-const-or-ref-data-members,
+
+WarningsAsErrors: ''  # Don't treat warnings as errors by default
+
+CheckOptions:
+  # Naming conventions (match QGC style)
+  - key: readability-identifier-naming.ClassCase
+    value: CamelCase
+  - key: readability-identifier-naming.StructCase
+    value: CamelCase
+  - key: readability-identifier-naming.EnumCase
+    value: CamelCase
+  - key: readability-identifier-naming.FunctionCase
+    value: camelBack
+  - key: readability-identifier-naming.VariableCase
+    value: camelBack
+  - key: readability-identifier-naming.PrivateMemberPrefix
+    value: '_'
+  - key: readability-identifier-naming.ProtectedMemberPrefix
+    value: '_'
+  - key: readability-identifier-naming.ConstexprVariableCase
+    value: CamelCase
+
+  # Modernization options
+  - key: modernize-use-nullptr.NullMacros
+    value: 'NULL'
+  - key: modernize-loop-convert.MinConfidence
+    value: 'reasonable'
+
+  # Performance options
+  - key: performance-for-range-copy.WarnOnAllAutoCopies
+    value: 'true'
+  - key: performance-move-const-arg.CheckTriviallyCopyableMove
+    value: 'true'
+
+  # Readability options
+  - key: readability-braces-around-statements.ShortStatementLines
+    value: '0'  # Always require braces
+
+HeaderFilterRegex: '.*'
+FormatStyle: file
 ...
diff --git a/.clangd b/.clangd
index fa8caec073e9..80dc126a18ab 100644
--- a/.clangd
+++ b/.clangd
@@ -1,3 +1,32 @@
+# QGroundControl Clangd Configuration
+# Language server for C++ code completion and navigation
+
+CompileFlags:
+  Add:
+    - "-std=c++20"
+    - "-Wall"
+    - "-Wextra"
+  Remove:
+    - "-m*"  # Remove machine-specific flags
+
 Diagnostics:
+  # Qt macros and moc generate code that triggers false positives
   UnusedIncludes: None
   MissingIncludes: None
+  # Suppress common Qt-related warnings
+  Suppress:
+    - "unknown_typename"
+    - "expansion_to_defined"
+
+Index:
+  Background: Build
+  StandardLibrary: Yes
+
+InlayHints:
+  Enabled: Yes
+  ParameterNames: Yes
+  DeducedTypes: Yes
+  Designators: Yes
+
+Hover:
+  ShowAKA: Yes
diff --git a/.cmake-format b/.cmake-format
index 81c2f7d06aed..0167a8c388b4 100644
--- a/.cmake-format
+++ b/.cmake-format
@@ -1,11 +1,23 @@
+# QGroundControl CMake Formatting Configuration
+# Used by cmake-format for consistent CMake file formatting
+# Install: pip install cmake-format
+
 format:
-    line_width: 120
-    tab_size: 4
-    max_prefix_chars: 40
-    use_tabchars: false
+  line_width: 120
+  tab_size: 4
+  max_prefix_chars: 40
+  use_tabchars: false
+  dangle_parens: true
+  dangle_align: prefix
+  max_subgroups_hwrap: 2
+  max_pargs_hwrap: 6
+  separate_ctrl_name_with_space: false
+  separate_fn_name_with_space: false
+  command_case: canonical
 
 parse:
   additional_commands:
+    # CPM Package Manager commands
     cpmaddpackage:
       pargs:
         nargs: '*'
@@ -41,3 +53,40 @@ parse:
         flags: []
       spelling: CPMFindPackage
       kwargs: *cpmaddpackagekwargs
+
+    # Qt macros
+    qt_add_qml_module:
+      pargs:
+        nargs: '1+'
+      kwargs:
+        URI: 1
+        VERSION: 1
+        QML_FILES: +
+        SOURCES: +
+        RESOURCES: +
+        OUTPUT_DIRECTORY: 1
+        RESOURCE_PREFIX: 1
+
+    qt_add_resources:
+      pargs:
+        nargs: '2+'
+      kwargs:
+        PREFIX: 1
+        FILES: +
+
+markup:
+  enable_markup: false
+
+lint:
+  disabled_codes: []
+  function_pattern: '[0-9a-z_]+'
+  macro_pattern: '[0-9A-Z_]+'
+  global_var_pattern: '[A-Z][0-9A-Z_]+'
+  internal_var_pattern: '_[A-Z][0-9A-Z_]+'
+  local_var_pattern: '[a-z][a-z0-9_]+'
+  private_var_pattern: '_[0-9a-z_]+'
+  public_var_pattern: '[A-Z][0-9A-Z_]+'
+  keyword_pattern: '[A-Z][0-9A-Z_]+'
+  max_conditionals_custom_parser: 2
+  min_statement_spacing: 1
+  max_statement_spacing: 2
diff --git a/.editorconfig b/.editorconfig
index 509c02a01145..2fbe0ce251ec 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,64 @@
+# QGroundControl EditorConfig
+# https://editorconfig.org/
+
 root = true
 
+# Default settings for all files
 [*]
 charset = utf-8
 insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+
+# C++ source files
+[*.{cc,h,cpp,hpp,cxx}]
+indent_style = space
+indent_size = 4
+max_line_length = 120
+
+# CMake files
+[{CMakeLists.txt,*.cmake}]
+indent_style = space
+indent_size = 4
+
+# QML and JavaScript
+[*.{qml,js}]
+indent_style = space
+indent_size = 4
+
+# JSON files
+[*.json]
+indent_style = space
+indent_size = 2
+
+# YAML files
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+# Markdown files
+[*.md]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false  # Preserve trailing spaces for line breaks
+
+# XML files (including Qt resource files)
+[*.{xml,qrc,ui}]
+indent_style = space
+indent_size = 2
+
+# Shell scripts
+[*.sh]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+
+# Python scripts
+[*.py]
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace=true
+max_line_length = 100
+
+# Makefiles (require tabs)
+[{Makefile,*.mk}]
+indent_style = tab
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f78245fb2a27..ff794fcc9826 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,17 +1,324 @@
-# QGroundControl License
+# Contributing to QGroundControl
 
-Thank you for considering to contribute to QGroundControl.
+Thank you for considering contributing to QGroundControl! This guide will help you get started with contributing code, reporting issues, and improving documentation.
 
-Contributions must be made under QGroundControl's dual-license system, under GPLv3 and Apache 2.0. This by definition rules out the re-use of any copyleft (e.g. GPL) licensed code. All contributions must be original or from a compatible license (BSD 2/3 clause, MIT, Apache 2.0).
+## Table of Contents
 
-## Apache 2.0 License
+1. [Getting Started](#getting-started)
+2. [How to Contribute](#how-to-contribute)
+3. [Coding Standards](#coding-standards)
+4. [Testing Requirements](#testing-requirements)
+5. [Pull Request Process](#pull-request-process)
+6. [License Requirements](#license-requirements)
 
-The [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) License is a permissive license which allows QGC to be built and used in any environment, including proprietary applications. It allows QGC to be built for mobile app stores. When building with Apache 2.0 a commercial Qt license is required.
+---
 
-## GPL v3 License
+## Getting Started
 
-The [GPL v3 License](http://www.gnu.org/licenses/gpl-3.0.en.html) is a strong copyleft license. When building QGC under this license the open source version of Qt can be used. Our licensing grants the permission to use a later version of the license, however, contributions have to be made under 3.0.
+### Prerequisites
 
-## Contact
+Before you begin, please:
 
-If you have questions regarding the licensing, please contact the maintainer Lorenz Meier, [lm@groundcontrol.org].
+1. Read the [Developer Guide](https://dev.qgroundcontrol.com/en/)
+2. Review the [Build Instructions](https://dev.qgroundcontrol.com/en/getting_started/)
+3. Familiarize yourself with the [Architecture](copilot-instructions.md)
+
+### Development Environment
+
+- **Language**: C++20 with Qt 6.10+ framework
+- **Build System**: CMake 3.25+
+- **Platforms**: Windows, macOS, Linux, Android, iOS
+- **IDE**: Qt Creator (recommended), VS Code, or your preferred IDE
+
+---
+
+## How to Contribute
+
+### Reporting Issues
+
+Before creating a new issue:
+
+1. **Search existing issues** to avoid duplicates
+2. **Provide complete information**:
+   - QGroundControl version
+   - Operating system and version
+   - Detailed steps to reproduce
+   - Log files (from `~/.local/share/QGroundControl/`)
+   - Screenshots or videos if applicable
+
+**Create an issue**: https://github.com/mavlink/qgroundcontrol/issues
+
+**For security vulnerabilities**: See our [Security Policy](SECURITY.md) for responsible disclosure procedures.
+
+### Suggesting Enhancements
+
+Feature requests are welcome! Please:
+
+1. Check if the feature already exists or has been requested
+2. Explain the use case and benefits
+3. Consider implementation complexity
+4. Be prepared to contribute code if possible
+
+### Contributing Code
+
+1. **Fork the repository**
+   ```bash
+   git clone https://github.com/YOUR-USERNAME/qgroundcontrol.git
+   cd qgroundcontrol
+   ```
+
+2. **Create a feature branch**
+   ```bash
+   git checkout -b feature/my-new-feature
+   ```
+
+3. **Make your changes** following our [coding standards](#coding-standards)
+
+4. **Test your changes thoroughly**
+   - Run unit tests: `./qgroundcontrol --unittest`
+   - Test on all relevant platforms when possible
+   - Test with both PX4 and ArduPilot if applicable
+
+5. **Commit your changes**
+   ```bash
+   git add .
+   git commit -m "Add feature: brief description"
+   ```
+
+6. **Push to your fork**
+   ```bash
+   git push origin feature/my-new-feature
+   ```
+
+7. **Create a Pull Request** from your fork to `mavlink/qgroundcontrol:master`
+
+---
+
+## Coding Standards
+
+### C++ Guidelines
+
+- **Standard**: C++20
+- **Framework**: Qt 6 guidelines
+- **Naming Conventions**:
+  - Classes: `PascalCase`
+  - Methods/functions: `camelCase`
+  - Private members: `_leadingUnderscore`
+  - Constants: `ALL_CAPS` or `kPascalCase`
+
+- **Always use braces** for if/else/for/while statements
+  ```cpp
+  // Good
+  if (condition) {
+      doSomething();
+  }
+
+  // Bad
+  if (condition) doSomething();
+  ```
+
+- **Defensive coding**:
+  - Always null-check pointers before use
+  - Validate all inputs
+  - Use Q_ASSERT for debug-build development checks only (compiled out in release builds)
+  - Always use defensive error handling in production code paths (never rely on Q_ASSERT)
+  - Handle errors gracefully in production code
+
+- **Code formatting**:
+  - Run `clang-format` before committing
+  - Follow `.clang-format` in the repository
+  - 4 spaces for indentation (no tabs)
+
+### QML Guidelines
+
+- Follow Qt QML coding conventions
+- Use type annotations
+- Prefer declarative over imperative code
+- See `src/QmlControls/QGCButton.qml` for examples
+
+### Logging
+
+Use Qt logging categories:
+
+```cpp
+Q_DECLARE_LOGGING_CATEGORY(MyComponentLog)
+QGC_LOGGING_CATEGORY(MyComponentLog, "qgc.component.name")
+
+qCDebug(MyComponentLog) << "Debug message:" << value;
+qCWarning(MyComponentLog) << "Warning message";
+qCCritical(MyComponentLog) << "Critical error";
+```
+
+### Architecture Patterns
+
+#### Fact System (Required for Parameters)
+
+Always use the Fact System for vehicle parameters:
+
+```cpp
+Fact* param = vehicle->parameterManager()->getParameter(-1, "PARAM_NAME");
+if (param) {
+    param->setCookedValue(newValue);  // For display values
+    // param->setRawValue(newValue);  // For MAVLink values
+}
+```
+
+#### Multi-Vehicle Awareness
+
+Always check for null vehicles:
+
+```cpp
+Vehicle* vehicle = MultiVehicleManager::instance()->activeVehicle();
+if (vehicle) {
+    // Use vehicle
+}
+```
+
+#### Firmware Plugin System
+
+Use FirmwarePlugin for firmware-specific behavior instead of hardcoding:
+
+```cpp
+vehicle->firmwarePlugin()->isCapable(capability);
+vehicle->firmwarePlugin()->flightModes();
+```
+
+---
+
+## Testing Requirements
+
+### Unit Tests
+
+- Add unit tests for new functionality
+- Place tests in `test/` directory mirroring `src/` structure
+- Use Qt Test framework with `UnitTest` base class
+- Run tests before submitting:
+  ```bash
+  ./qgroundcontrol --unittest
+  ```
+
+### Manual Testing
+
+Test your changes on:
+- Multiple platforms (Windows, macOS, Linux if possible)
+- Both PX4 and ArduPilot firmware (if applicable)
+- Different vehicle types (multirotor, fixed-wing, VTOL, rover)
+
+### Pre-commit Checks
+
+Run before committing:
+
+```bash
+# Format code
+clang-format -i path/to/changed/files.cc
+
+# Run pre-commit hooks (optional)
+pre-commit run --all-files
+```
+
+---
+
+## Pull Request Process
+
+### Before Submitting
+
+1. **Rebase on latest master**
+   ```bash
+   git fetch upstream
+   git rebase upstream/master
+   ```
+
+2. **Ensure all tests pass**
+3. **Update documentation** if needed
+4. **Write a clear PR description**:
+   - What problem does it solve?
+   - How was it tested?
+   - Breaking changes (if any)
+   - Screenshots for UI changes
+
+### PR Requirements
+
+- ✅ All CI checks must pass
+- ✅ Code follows style guidelines
+- ✅ Tests added for new features
+- ✅ No unrelated changes
+- ✅ Commit messages are clear and descriptive
+
+### Review Process
+
+- Maintainers will review your PR
+- Address feedback in new commits (don't force-push during review)
+- Once approved, a maintainer will merge your PR
+
+### After Merging
+
+- Delete your feature branch
+- Your contribution will appear in the next release
+- Thank you for contributing! 🎉
+
+---
+
+## License Requirements
+
+### Dual-License Requirement
+
+**Important**: All contributions to QGroundControl must be compatible with our **dual-license system** (Apache 2.0 AND GPL v3).
+
+### What This Means
+
+- **Your code must be original** or from a compatible license
+- **Compatible licenses**: BSD 2-clause, BSD 3-clause, MIT, Apache 2.0
+- **Incompatible licenses**: GPL-only, proprietary, copyleft-only licenses
+
+By contributing, you agree that:
+1. Your contributions are your original work or properly licensed
+2. You grant QGroundControl rights under **both** Apache 2.0 and GPL v3 licenses
+3. You have the right to submit the contribution
+
+### License Background
+
+QGroundControl uses a dual-license system:
+
+#### Apache License 2.0
+- Permissive license
+- Allows use in proprietary applications
+- Allows distribution via app stores
+- **Requires commercial Qt license**
+
+Full text: [LICENSE-APACHE](../LICENSE-APACHE)
+
+#### GNU General Public License v3 (GPL v3)
+- Copyleft license
+- Ensures software remains open source
+- **Can use open-source Qt**
+- Users can use later GPL versions (v3 is minimum for contributions)
+
+Full text: [LICENSE-GPL](../LICENSE-GPL)
+
+### Questions About Licensing
+
+If you have questions about licensing, please contact:
+- Lorenz Meier: lm@qgroundcontrol.org
+
+For more details, see [COPYING.md](COPYING.md).
+
+---
+
+## Additional Resources
+
+- **User Manual**: https://docs.qgroundcontrol.com/en/
+- **Developer Guide**: https://dev.qgroundcontrol.com/en/
+- **API Documentation**: In-code documentation and `copilot-instructions.md`
+- **Support Guide**: For help and community resources, see [SUPPORT.md](SUPPORT.md)
+- **Discussion Forum**: https://discuss.px4.io/c/qgroundcontrol
+- **Discord**: https://discord.gg/dronecode
+
+---
+
+## Code of Conduct
+
+QGroundControl is part of the Dronecode Foundation. Please follow our [Code of Conduct](CODE_OF_CONDUCT.md).
+
+---
+
+Thank you for contributing to QGroundControl! Your efforts help make drone control accessible to everyone.
diff --git a/.github/COPYING.md b/.github/COPYING.md
new file mode 100644
index 000000000000..6ad26798a633
--- /dev/null
+++ b/.github/COPYING.md
@@ -0,0 +1,45 @@
+# QGroundControl License Information
+
+QGroundControl is licensed under a dual-license system to allow maximum flexibility for users and contributors.
+
+## Dual-License System
+
+QGroundControl is available under **both** the Apache License 2.0 and the GNU General Public License v3 (GPL v3). You may choose which license you want to use based on your use case.
+
+### Apache License 2.0
+
+The [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0) is a permissive license which allows QGroundControl to be built and used in any environment, including proprietary applications. It allows QGroundControl to be built for mobile app stores.
+
+**Note**: When building with Apache 2.0, a commercial Qt license is required.
+
+**Full License**: See [LICENSE-APACHE](../LICENSE-APACHE) in the root directory.
+
+### GNU General Public License v3 (GPL v3)
+
+The [GPL v3 License](http://www.gnu.org/licenses/gpl-3.0.en.html) is a strong copyleft license. When building QGroundControl under this license, the open source version of Qt can be used.
+
+Our licensing grants the permission to use a later version of the license; however, contributions must be made under GPL v3.
+
+**Full License**: See [LICENSE-GPL](../LICENSE-GPL) in the root directory.
+
+## Contributing to QGroundControl
+
+Contributions must be made under QGroundControl's dual-license system (both GPL v3 AND Apache 2.0). This by definition rules out the re-use of any copyleft (e.g., GPL-only) licensed code.
+
+**All contributions must be:**
+- Original work, OR
+- From a compatible license: BSD 2-clause, BSD 3-clause, MIT, or Apache 2.0
+
+For contribution guidelines, see [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## Questions
+
+If you have questions regarding the licensing, please contact the maintainer:
+- Lorenz Meier: lm@qgroundcontrol.org
+
+---
+
+**Quick Summary:**
+- **Use GPL v3** if you want to use the open-source Qt version (copyleft)
+- **Use Apache 2.0** if you need to use QGroundControl in proprietary applications (requires commercial Qt license)
+- **Contributing** requires code compatible with BOTH licenses
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cb3e3b43662e..ef52ed76da6f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,7 @@
 name: Bug report
 description: Create a report to help us improve
 labels: ["Report: Bug"]
+type: bug
 
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 1b0aebe6bbb1..7c29789ac7d0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,7 @@
 name: Feature request
 description: Tell us about your new idea
 labels: ["Feature Request"]
+type: feature
 
 body:
   - type: markdown
diff --git a/.github/actions/checks/action.yml b/.github/actions/checks/action.yml
index bf75189c3476..949a76acd196 100644
--- a/.github/actions/checks/action.yml
+++ b/.github/actions/checks/action.yml
@@ -10,15 +10,15 @@ inputs:
 runs:
   using: "composite"
   steps:
-  - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
 
-  - name: Run clang-format style check for C++ Source Files.
-    if: inputs.format == 'true'
-    uses: jidicula/clang-format-action@main
-    with:
-      clang-format-version: '17'
-      check-path: 'src'
+    - name: Run clang-format style check for C++ Source Files.
+      if: inputs.format == 'true'
+      uses: jidicula/clang-format-action@main
+      with:
+        clang-format-version: '17'
+        check-path: 'src'
 
-  - name: Check spelling
-    if: inputs.spelling == 'true'
-    uses: crate-ci/typos@master
+    - name: Check spelling
+      if: inputs.spelling == 'true'
+      uses: crate-ci/typos@master
diff --git a/.github/actions/gstreamer/action.yml b/.github/actions/gstreamer/action.yml
index 0eb486c6bef7..650a4c434ca0 100644
--- a/.github/actions/gstreamer/action.yml
+++ b/.github/actions/gstreamer/action.yml
@@ -95,7 +95,9 @@ runs:
 
     - name: Setup Environment
       working-directory: ${{ runner.temp }}/gstreamer
-      run: echo "PKG_CONFIG_PATH=${{ inputs.install_directory }}/lib/x86_64-linux-gnu/pkgconfig:${{ inputs.install_directory }}/lib/x86_64-linux-gnu/gstreamer-1.0/pkgconfig:${{ env.PKG_CONFIG_PATH }}" >> "$GITHUB_ENV"
+      run: >
+        echo "PKG_CONFIG_PATH=${{ inputs.install_directory }}/lib/x86_64-linux-gnu/pkgconfig:${{
+        inputs.install_directory }}/lib/x86_64-linux-gnu/gstreamer-1.0/pkgconfig:${{ env.PKG_CONFIG_PATH }}" >> "$GITHUB_ENV"
       shell: bash
 
     - name: Save artifact
diff --git a/.github/actions/qt-android/action.yml b/.github/actions/qt-android/action.yml
index e44941c11163..3a2283354240 100644
--- a/.github/actions/qt-android/action.yml
+++ b/.github/actions/qt-android/action.yml
@@ -10,7 +10,7 @@ inputs:
   version:
     description: Qt Version
     required: false
-    default: 6.8.3
+    default: 6.10.1
   abis:
     description: ABIs to Build
     required: false
@@ -33,9 +33,10 @@ runs:
 
     - name: Setup Android Environment
       uses: android-actions/setup-android@v3
+      id: setup-android
       with:
-        cmdline-tools-version: 12266719
-        packages: 'platform-tools platforms;android-36 build-tools;36.0.0' # ndk;26.1.10909125,27.2.12479018'
+        cmdline-tools-version: 13114758
+        packages: 'platform-tools platforms;android-35 build-tools;35.0.0' # ndk;27.2.12479018'
         log-accepted-android-sdk-licenses: false
 
     - name: Install Android NDK
@@ -44,17 +45,21 @@ runs:
       with:
         ndk-version: r27c
         add-to-path: false
+        local-cache: true
 
-    - run: |
+    - name: Update Android SDK / NDK / Tools
+      shell: bash
+      run: |
         echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
         echo "ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
         echo "ANDROID_NDK=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
-      shell: bash
-
-    - name: Update Android SDK / NDK / Tools
-      if: runner.os != 'Windows'
-      run: sdkmanager --update
-      shell: bash
+        if [[ "$RUNNER_OS" == "Windows" ]]; then
+          "${ANDROID_SDK_ROOT}"/cmdline-tools/latest/bin/sdkmanager.bat --update
+          "${GITHUB_WORKSPACE}"/android/gradlew.bat --version
+        else
+          sdkmanager --update
+          "${GITHUB_WORKSPACE}"/android/gradlew --version
+        fi
 
     - name: Setup Caching
       uses: ./.github/actions/cache
@@ -72,7 +77,7 @@ runs:
         target: desktop
         arch: ${{ inputs.arch }}
         dir: ${{ runner.temp }}
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
         setup-python: false
         cache: true
 
@@ -85,7 +90,7 @@ runs:
         target: android
         arch: android_arm64_v8a
         dir: ${{ runner.temp }}
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
         setup-python: false
         cache: true
 
@@ -98,7 +103,7 @@ runs:
         target: android
         arch: android_armv7
         dir: ${{ runner.temp }}
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
         setup-python: false
         cache: true
 
@@ -111,7 +116,7 @@ runs:
         target: android
         arch: android_x86_64
         dir: ${{ runner.temp }}
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
         setup-python: false
         cache: true
 
@@ -124,15 +129,6 @@ runs:
         target: android
         arch: android_x86
         dir: ${{ runner.temp }}
-        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+        modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
         setup-python: false
         cache: true
-
-    - name: Build Info
-      shell: bash
-      run: |
-        if [[ "$RUNNER_OS" == "Windows" ]]; then
-          "${GITHUB_WORKSPACE}"/android/gradlew.bat --version
-        else
-          "${GITHUB_WORKSPACE}"/android/gradlew --version
-        fi
diff --git a/.github/actions/upload/action.yml b/.github/actions/upload/action.yml
index 9601f0b73473..be52339f418e 100644
--- a/.github/actions/upload/action.yml
+++ b/.github/actions/upload/action.yml
@@ -22,7 +22,7 @@ inputs:
   upload_aws:
     description: Upload artifact to AWS
     required: true
-    default: true
+    default: 'true'
 
 runs:
   using: composite
@@ -34,7 +34,7 @@ runs:
         path: ${{ runner.temp }}/build/${{ inputs.artifact_name }}
 
     - name: Configure AWS Credentials
-      if: ${{ inputs.upload_aws && github.event_name == 'push' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
+      if: ${{ fromJSON(inputs.upload_aws) && github.event_name == 'push' && github.repository_owner == 'mavlink' && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
       uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-access-key-id: ${{ inputs.aws_key_id }}
@@ -42,53 +42,32 @@ runs:
         aws-region: us-west-2
 
     - name: Upload all push builds to S3 Bucket
-      if: ${{ inputs.upload_aws && github.event_name == 'push' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
-      working-directory: ${{ runner.temp }}/build/${{ inputs.source }}
-      run: aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }} --acl public-read
+      if: ${{ fromJSON(inputs.upload_aws) && github.event_name == 'push' && github.repository_owner == 'mavlink' && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
+      working-directory: ${{ runner.temp }}/build
+      run: aws s3 cp "${{ inputs.artifact_name }}" "s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }}" --acl public-read
       shell: bash
 
-    - name: Invalidate daily/continuous push build CloudFront Cache
-      if: ${{ inputs.upload_aws && github.event_name == 'push' && github.ref_name == 'master' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' && inputs.aws_distribution_id != '' }}
-      run: |
-        aws cloudfront create-invalidation \
-          --distribution-id ${{ inputs.aws_distribution_id }} \
-          --paths s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }}
-      shell: bash
-      env:
-        AWS_ACCESS_KEY_ID: ${{ inputs.aws_key_id }}
-        AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
-        AWS_REGION: us-west-2
-
     - name: Upload tagged stable push build to S3 latest Bucket
-      if: ${{ inputs.upload_aws && github.event_name == 'push' && github.ref_type == 'tag' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
-      working-directory: ${{ runner.temp }}/build/${{ inputs.source }}
-      run: aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/latest/${{ inputs.artifact_name }} --acl public-read
+      if: >-
+        ${{ fromJSON(inputs.upload_aws) && github.event_name == 'push' &&
+        github.repository_owner == 'mavlink' && github.ref_type == 'tag' &&
+        inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
+      working-directory: ${{ runner.temp }}/build
+      run: aws s3 cp "${{ inputs.artifact_name }}" "s3://qgroundcontrol/latest/${{ inputs.artifact_name }}" --acl public-read
       shell: bash
 
     - name: Invalidate tagged stable push build CloudFront Cache
-      if: ${{ inputs.upload_aws && github.event_name == 'push' && github.ref_type == 'tag' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' && inputs.aws_distribution_id != '' }}
+      if: >-
+        ${{ fromJSON(inputs.upload_aws) && github.event_name == 'push' &&
+        github.repository_owner == 'mavlink' && github.ref_type == 'tag' &&
+        inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' &&
+        inputs.aws_distribution_id != '' }}
       run: |
         aws cloudfront create-invalidation \
-          --distribution-id ${{ inputs.aws_distribution_id }} \
-          --paths s3://qgroundcontrol/latest/${{ inputs.artifact_name }}
+          --distribution-id "${{ inputs.aws_distribution_id }}" \
+          --paths "/latest/${{ inputs.artifact_name }}"
       shell: bash
       env:
         AWS_ACCESS_KEY_ID: ${{ inputs.aws_key_id }}
         AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
         AWS_REGION: us-west-2
-
-# Commented out since it is 100% fail in CI
-#    - name: Create Continuous Release
-#      if: ${{ github.event_name != 'pull_request' && github.ref_name == 'master' && inputs.github_token != '' }}
-#      uses: Wandalen/wretry.action@master
-#      with:
-#        action: softprops/action-gh-release@v2
-#        with: |
-#          tag_name: latest
-#          target_commitish: master
-#          files: ${{ runner.temp }}/build/${{ inputs.source }}/${{ inputs.artifact_name }}
-#          name: "Continuous Release"
-#          body: "This release is continuously updated with every commit to master."
-#          draft: false
-#          prerelease: true
-#          token: ${{ inputs.github_token }}
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 000000000000..e6419818cc34
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,384 @@
+# QGroundControl Development Guide
+
+Ground Control Station for MAVLink-enabled UAVs supporting PX4 and ArduPilot.
+
+## Quick Start for AI Assistants
+
+**First-time here?** Start with these critical files:
+1. **This file** - Architecture patterns and coding standards
+2. `.github/CONTRIBUTING.md` - Contribution workflow
+3. `src/FactSystem/Fact.h` - The most important pattern in QGC
+4. `src/Vehicle/Vehicle.h` - Core vehicle model
+
+**Most Critical Pattern**: The **Fact System** handles ALL vehicle parameters. Never create custom parameter storage - always use Facts.
+
+**Golden Rule**: Multi-vehicle support means ALWAYS null-check `MultiVehicleManager::instance()->activeVehicle()`.
+
+## Tech Stack
+- **C++20** with **Qt 6.10.1** (QtQml, QtQuick)
+- **Build**: CMake 3.25+, Ninja
+- **Protocol**: MAVLink 2.0
+- **Platforms**: Windows, macOS, Linux, Android, iOS
+
+## Critical Architecture Patterns
+
+### 1. Fact System (Parameter Management)
+**Most important pattern in QGC** - All vehicle parameters use this.
+
+```cpp
+// Access parameters (always null-check!)
+Fact* param = vehicle->parameterManager()->getParameter(-1, "PARAM_NAME");
+if (param && param->validate(newValue, false).isEmpty()) {
+    param->setCookedValue(newValue);  // Use cookedValue for UI (with units)
+    // param->rawValue() for MAVLink/storage
+}
+
+// Expose to QML
+Q_PROPERTY(Fact* myParam READ myParam CONSTANT)
+```
+
+**Key classes:**
+- `Fact` - Single parameter with validation, units, metadata
+- `FactGroup` - Hierarchical container (handles MAVLink via `handleMessage()`)
+- `FactMetaData` - JSON-based metadata (min/max, enums, descriptions)
+
+**Rules:**
+- Wait for `parametersReady` signal before accessing
+- Use `cookedValue` (display) vs `rawValue` (storage)
+- Metadata in `*.FactMetaData.json` files
+
+### 2. Plugin Architecture
+Three types handle firmware customization:
+
+**FirmwarePlugin** - Firmware behavior (flight modes, capabilities)
+```cpp
+virtual QList<FlightMode> flightModes() override;
+virtual bool setFlightMode(const QString& mode) override;
+```
+
+**AutoPilotPlugin** - Vehicle setup UI (returns `VehicleComponent` list)
+
+**VehicleComponent** - Individual setup items (Radio, Sensors, Safety)
+```cpp
+virtual QString name() const override;
+virtual bool setupComplete() const override;
+virtual QUrl setupSource() const override;  // QML UI
+```
+
+### 3. Manager Singletons
+```cpp
+// Always null-check activeVehicle (multi-vehicle support)
+Vehicle* vehicle = MultiVehicleManager::instance()->activeVehicle();
+if (vehicle) {
+    vehicle->parameterManager()->getParameter(...);
+}
+
+// Other managers
+SettingsManager::instance()->appSettings()->...
+LinkManager::instance()->...
+```
+
+### 4. QML/C++ Integration
+```cpp
+Q_OBJECT
+QML_ELEMENT           // Creatable in QML
+QML_SINGLETON         // Singleton
+QML_UNCREATABLE("")   // C++-only
+
+Q_PROPERTY(Type name READ getter WRITE setter NOTIFY signal)
+Q_INVOKABLE void method();
+Q_ENUM(EnumType)
+```
+
+### 5. State Machines
+For complex workflows (parameter loading, calibration):
+```cpp
+QGCStateMachine machine("Workflow", vehicle);
+auto* sendCmd = new SendMavlinkCommandState("SendCmd", &machine);
+auto* waitMsg = new WaitForMavlinkMessageState("WaitResponse", &machine);
+sendCmd->addTransition(sendCmd, &SendMavlinkCommandState::done, waitMsg);
+machine.start();
+```
+
+### 6. Settings Framework
+```cpp
+class MySettings : public SettingsGroup {
+    DEFINE_SETTINGFACT(settingName)  // Creates Fact with JSON metadata
+};
+// Access: SettingsManager::instance()->mySettings()->settingName()
+```
+
+## Code Structure
+```
+src/
+├── Vehicle/            # Vehicle state/comms (Vehicle.h is key)
+├── FactSystem/         # Parameter management (READ THIS FIRST!)
+├── FirmwarePlugin/     # PX4/ArduPilot abstraction
+├── AutoPilotPlugins/   # Vehicle setup UI
+├── MissionManager/     # Mission planning
+├── MAVLink/            # Protocol handling
+├── Comms/              # Serial/UDP/TCP/Bluetooth
+├── Settings/           # Persistent settings
+├── UI/                 # QML UI (MainWindow.qml)
+└── Utilities/          # StateMachine, helpers
+```
+
+## Coding Standards
+
+**Naming:**
+- Classes/Enums: `PascalCase`
+- Methods/properties: `camelCase`
+- Private members: `_leadingUnderscore`
+- Files: `ClassName.h`, `ClassName.cc`
+
+**Logging:**
+```cpp
+Q_DECLARE_LOGGING_CATEGORY(MyLog)
+QGC_LOGGING_CATEGORY(MyLog, "qgc.component.name")
+qCDebug(MyLog) << "Message:" << value;
+```
+
+**Defensive Coding (Critical!):**
+```cpp
+void method(Vehicle* vehicle) {
+    if (!vehicle) {
+        qCWarning(Log) << "Invalid vehicle";
+        return;  // Early return on invalid state
+    }
+    // Always use braces
+    if (condition) {
+        doSomething();
+    }
+}
+```
+
+**Code Style Tools:**
+- Use `.clang-format`, `.clang-tidy`, `.editorconfig` configured in repo root
+- Keep comments minimal - code should be self-documenting
+- Do NOT create verbose file headers or unnecessary documentation files
+- Do NOT add README files unless explicitly requested
+
+**Security & Dependencies:**
+- Never commit secrets, API keys, or credentials
+- Validate all external inputs (MAVLink messages, file uploads, user input)
+- Use Qt's built-in sanitization for SQL and string operations
+- When adding dependencies, check for known vulnerabilities
+- Prefer Qt's built-in functionality over external libraries
+
+## Common Pitfalls (DO NOT!)
+
+1. ❌ Assume single vehicle - Always null-check `activeVehicle()`
+2. ❌ Access Facts before `parametersReady` signal
+3. ❌ Hardcode parameter names - Use Fact System
+4. ❌ Bypass FirmwarePlugin for firmware behavior
+5. ❌ Use `Q_ASSERT` in production - Use defensive checks
+6. ❌ Ignore platform differences - Check `#ifdef Q_OS_*`
+7. ❌ Mix cookedValue/rawValue without conversion
+8. ❌ Create custom parameter storage - Use Fact System
+9. ❌ Access FactGroups before `telemetryAvailable`
+10. ❌ Forget to emit property signals (breaks QML bindings)
+
+## Build Commands
+```bash
+git submodule update --init --recursive
+~/Qt/6.10.1/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+cmake --build build --config Debug
+./build/Debug/QGroundControl --unittest  # Run tests
+```
+
+**Key CMake Options** (cmake/CustomOptions.cmake):
+- `QGC_STABLE_BUILD` - Release vs daily
+- `QGC_BUILD_TESTING` - Unit tests
+- `QGC_ENABLE_BLUETOOTH` - Bluetooth support
+- `QGC_DISABLE_APM_PLUGIN` / `QGC_DISABLE_PX4_PLUGIN`
+
+## Testing
+
+### Running Tests
+```bash
+# Run all unit tests
+./build/Debug/QGroundControl --unittest
+
+# Run specific test
+./build/Debug/QGroundControl --unittest:<TestClassName>
+
+# Run with verbose output
+./build/Debug/QGroundControl --unittest --logging:full
+```
+
+### Test Structure
+- Tests mirror `src/` structure in `test/` directory
+- Use `UnitTest` base class from Qt Test framework
+- Mock vehicle connections when testing vehicle-dependent code
+- Always test with null vehicle checks
+
+### Adding New Tests
+```cpp
+class MyComponentTest : public UnitTest {
+    Q_OBJECT
+private slots:
+    void init();    // Called before each test
+    void cleanup(); // Called after each test
+    void testMyFunction();
+};
+```
+
+## Troubleshooting
+
+### Build Issues
+- **Qt not found**: Set `CMAKE_PREFIX_PATH` to Qt installation, or use qt-cmake
+- **Submodule errors**: Run `git submodule update --init --recursive`
+- **Missing dependencies**: Check platform-specific build instructions at https://dev.qgroundcontrol.com/
+- **CMake cache issues**: Delete `build/` directory and reconfigure
+
+### Runtime Issues
+- **Crash on startup**: Check log files in `~/.local/share/QGroundControl/` (Linux/macOS) or `%LOCALAPPDATA%\QGroundControl` (Windows)
+- **Vehicle not connecting**: Verify MAVLink protocol compatibility, check link configuration
+- **Parameter load failures**: Ensure `parametersReady` signal before accessing Facts
+
+### Development Environment
+- **Qt Creator recommended**: Import CMakeLists.txt as project
+- **clangd for VSCode**: Uses `.clangd` config in repo root
+- **Pre-commit hooks**: Run `pre-commit install` to enable automatic formatting
+
+## Performance Tips
+- Batch updates: `fact->setSendValueChangedSignals(false)`
+- Suppress live updates: `factGroup->setLiveUpdates(false)`
+- Cache frequently accessed values
+- MAVLink handled on separate thread
+- Qt parent/child ownership for cleanup
+
+## Common Tasks
+
+### Working with Vehicle Parameters
+```cpp
+// 1. Get parameter (always null-check!)
+Vehicle* vehicle = MultiVehicleManager::instance()->activeVehicle();
+if (!vehicle) return;
+
+Fact* param = vehicle->parameterManager()->getParameter(-1, "PARAM_NAME");
+if (!param) {
+    qCWarning(Log) << "Parameter not found";
+    return;
+}
+
+// 2. Validate before setting
+QString error = param->validate(newValue, false);
+if (!error.isEmpty()) {
+    qCWarning(Log) << "Invalid value:" << error;
+    return;
+}
+
+// 3. Set value (cookedValue for UI with units)
+param->setCookedValue(newValue);
+
+// 4. Listen to changes
+connect(param, &Fact::valueChanged, this, [](QVariant value) {
+    qCDebug(Log) << "Parameter changed:" << value;
+});
+```
+
+### Creating a Settings Group
+```cpp
+// 1. Define in MySettings.h
+class MySettings : public SettingsGroup {
+    Q_OBJECT
+public:
+    DEFINE_SETTINGFACT(mySetting)  // Creates Fact with JSON metadata
+};
+
+// 2. Create MySettings.SettingsGroup.json with metadata
+{
+    "mySetting": {
+        "shortDescription": "My setting",
+        "type": "uint32",
+        "default": 100,
+        "min": 0,
+        "max": 1000
+    }
+}
+
+// 3. Access anywhere
+int value = SettingsManager::instance()->mySettings()->mySetting()->rawValue().toInt();
+```
+
+### Adding a Vehicle Component
+```cpp
+// 1. Create MyComponent.h (subclass VehicleComponent)
+class MyComponent : public VehicleComponent {
+    Q_OBJECT
+public:
+    MyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
+
+    QString name() const override { return "My Component"; }
+    QString description() const override { return "Component description"; }
+    QString iconResource() const override { return "/qmlimages/MyComponentIcon.svg"; }
+    bool requiresSetup() const override { return true; }
+    bool setupComplete() const override { return _setupComplete; }
+    QUrl setupSource() const override { return QUrl::fromUserInput("qrc:/qml/MyComponentSetup.qml"); }
+};
+
+// 2. Register in AutoPilotPlugin::getVehicleComponents()
+```
+
+### Handling MAVLink Messages
+```cpp
+// In a FactGroup or custom component
+void MyFactGroup::handleMessage(Vehicle* vehicle, mavlink_message_t& message) {
+    switch (message.msgid) {
+    case MAVLINK_MSG_ID_MY_MESSAGE: {
+        mavlink_my_message_t msg;
+        mavlink_msg_my_message_decode(&message, &msg);
+
+        // Update Facts (thread-safe via Qt signals)
+        myFact()->setRawValue(msg.value);
+        break;
+    }
+    }
+}
+```
+
+### Adding a QML UI Component
+```qml
+// 1. Create MyControl.qml
+import QtQuick
+import QGroundControl
+import QGroundControl.Controls
+
+QGCButton {
+    text: "My Action"
+
+    property var vehicle: QGroundControl.multiVehicleManager.activeVehicle
+
+    enabled: vehicle && vehicle.armed
+
+    onClicked: {
+        if (vehicle) {
+            // Always null-check vehicle!
+            vehicle.sendMavCommand(...)
+        }
+    }
+}
+```
+
+## Essential Files to Read
+1. `.github/CONTRIBUTING.md` - Contribution guidelines
+2. `src/FactSystem/Fact.h` - Parameter system (CRITICAL!)
+3. `src/Vehicle/Vehicle.h` - Vehicle model
+4. `src/FirmwarePlugin/FirmwarePlugin.h` - Firmware abstraction
+
+## Resources
+- **User Manual**: https://docs.qgroundcontrol.com/
+- **Dev Guide**: https://dev.qgroundcontrol.com/
+- **MAVLink**: https://mavlink.io/
+- **Qt Docs**: https://doc.qt.io/qt-6/
+
+## Memory & Threading
+- Qt parent/child ownership (auto-cleanup)
+- Use `deleteLater()` for objects with active signals
+- `Qt::QueuedConnection` for cross-thread signals
+- MAVLink on LinkManager thread, UI on main thread
+
+---
+
+**Key Principle**: Match the style of code you're editing. Use defensive coding, validate inputs, handle errors gracefully, and respect the Fact System architecture.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 79f10533b04b..6237a6b2c8dd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +1,30 @@
 version: 2
 updates:
+  # Monitor GitHub Actions in workflows and all custom actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     commit-message:
-      prefix: "[ci] "
+      prefix: "[CI] "
+    open-pull-requests-limit: 10
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+
+  # Monitor npm dependencies for documentation
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "[Deps] "
+    open-pull-requests-limit: 5
+    groups:
+      npm-minor-patch:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 3bae6e52e23f..83187b3d7819 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -20,4 +20,4 @@ Related Issue
 <!-- If any, please provide issue ID. -->
 
 
-By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
\ No newline at end of file
+By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000000..e7de10f55d71
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,20 @@
+changelog:
+  categories:
+    - title: Features
+      labels:
+        - "RN: MAJOR FEATURE"
+        - "RN: MINOR FEATURE"
+        - "RN: MAJOR FEATURE - CUSTOM BUILD"
+        - "RN: MINOR FEATURE - CUSTOM BUILD"
+    - title: Improvements
+      labels:
+        - "RN: IMPROVEMENT"
+        - "RN: IMPROVEMENT - CUSTOM BUILD"
+        - "RN: REFACTORING"
+    - title: Fixes
+      labels:
+        - "RN: BUGFIX"
+        - "RN: BUGFIX - CUSTOM BUILD"
+    - title: Targets
+      labels:
+        - "RN: NEW BOARD SUPPORT"
diff --git a/.github/workflows/android-linux.yml b/.github/workflows/android-linux.yml
index d37f668fdc90..898a85cff51e 100644
--- a/.github/workflows/android-linux.yml
+++ b/.github/workflows/android-linux.yml
@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         build_type: [Release]
-        qt_version: [6.8.3]
+        qt_version: [6.10.1]
 
     defaults:
       run:
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -58,6 +58,14 @@ jobs:
       - name: Initial Setup
         uses: ./.github/actions/common
 
+      - name: Free Disk Space
+        if: runner.os == 'Linux'
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+          large-packages: false
+
       - name: Install Qt for Android
         uses: ./.github/actions/qt-android
         with:
@@ -92,6 +100,7 @@ jobs:
           package_name: ${{ env.PACKAGE }}
           aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           upload_aws: true
 
diff --git a/.github/workflows/android-macos.yml b/.github/workflows/android-macos.yml
index 0eb622729800..89c208608973 100644
--- a/.github/workflows/android-macos.yml
+++ b/.github/workflows/android-macos.yml
@@ -37,7 +37,7 @@ jobs:
 
     env:
       ARTIFACT: QGroundControl.apk
-      QT_VERSION: 6.8.3
+      QT_VERSION: 6.10.1
       QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/deploy/android/android_release.keystore
       QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -80,7 +80,7 @@ jobs:
         run: cmake --build . --target all --config ${{ matrix.BuildType }} --parallel
 
       - name: Save APK
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ env.ARTIFACT }}
           path: ${{ runner.temp }}/build/android-build/*.apk
diff --git a/.github/workflows/android-windows.yml b/.github/workflows/android-windows.yml
index 9eaefba13d97..aeacbc26b35d 100644
--- a/.github/workflows/android-windows.yml
+++ b/.github/workflows/android-windows.yml
@@ -37,7 +37,7 @@ jobs:
 
     env:
       ARTIFACT: QGroundControl.apk
-      QT_VERSION: 6.8.3
+      QT_VERSION: 6.10.1
       QT_ANDROID_KEYSTORE_PATH: ${{ github.workspace }}\deploy\android\android_release.keystore
       QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -80,7 +80,7 @@ jobs:
         run: cmake --build . --target all --config ${{ matrix.BuildType }} --parallel
 
       - name: Save APK
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ env.ARTIFACT }}
           path: ${{ runner.temp }}/build/android-build/*.apk
diff --git a/.github/workflows/cache-cleanup.yml b/.github/workflows/cache-cleanup.yml
index ee095b609103..876007676c2c 100644
--- a/.github/workflows/cache-cleanup.yml
+++ b/.github/workflows/cache-cleanup.yml
@@ -15,7 +15,7 @@ jobs:
       contents: read
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Cleanup
         run: |
diff --git a/.github/workflows/crowdin_docs_download.yml b/.github/workflows/crowdin_docs_download.yml
index 28b7769e8780..da8aa03d8ae1 100644
--- a/.github/workflows/crowdin_docs_download.yml
+++ b/.github/workflows/crowdin_docs_download.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: crowdin action
         uses: crowdin/github-action@v2
diff --git a/.github/workflows/crowdin_docs_upload.yml b/.github/workflows/crowdin_docs_upload.yml
index ae644c809032..43a1d0ef7fac 100644
--- a/.github/workflows/crowdin_docs_upload.yml
+++ b/.github/workflows/crowdin_docs_upload.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: crowdin push
         uses: crowdin/github-action@v2
         with:
diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml
index 90e9907de127..e490b07bab77 100644
--- a/.github/workflows/custom.yml
+++ b/.github/workflows/custom.yml
@@ -32,12 +32,12 @@ jobs:
         shell: cmd
 
     env:
-      QT_VERSION: 6.8.3
+      QT_VERSION: 6.10.1
       GST_VERSION: 1.22.12
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -74,7 +74,7 @@ jobs:
           target: desktop
           arch: win64_msvc2022_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
           setup-python: false
           cache: true
 
diff --git a/.github/workflows/docker-linux.yml b/.github/workflows/docker-linux.yml
index 1767dca13953..7db2a1d64b43 100644
--- a/.github/workflows/docker-linux.yml
+++ b/.github/workflows/docker-linux.yml
@@ -32,14 +32,14 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
           fetch-tags: true
 
       - name: Get all tags for correct version determination
-        working-directory:  ${{ github.workspace }}
+        working-directory: ${{ github.workspace }}
         run: git fetch --all --tags --force --depth 1
 
       - run: chmod a+x ./deploy/docker/run-docker-ubuntu.sh
diff --git a/.github/workflows/docs_deploy.yml b/.github/workflows/docs_deploy.yml
index 5864fb98b650..94ee4aad16d8 100644
--- a/.github/workflows/docs_deploy.yml
+++ b/.github/workflows/docs_deploy.yml
@@ -22,10 +22,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 20
           cache: npm
@@ -39,7 +39,7 @@ jobs:
           touch docs/.vitepress/dist/.nojekyll
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: qgc_docs_build
           path: docs/.vitepress/dist/
@@ -52,7 +52,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: qgc_docs_build
           path: ~/_book
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index c8fa3f9e548b..65c847a4db2e 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -8,7 +8,7 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:gnome-47
       options: --privileged
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: org.mavlink.qgroundcontrol.flatpak
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 816b08c56150..9abdc12ddb81 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -22,11 +22,11 @@ jobs:
     env:
       ARTIFACT: QGroundControl.app
       PACKAGE: QGroundControl
-      QT_VERSION: 6.8.3
+      QT_VERSION: 6.10.1
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -56,7 +56,7 @@ jobs:
           target: desktop
           arch: clang_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
           setup-python: false
           cache: true
 
@@ -83,7 +83,7 @@ jobs:
         run: cmake --build . --target all --config ${{ matrix.BuildType }} --parallel
 
       - name: Save App
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ env.PACKAGE }}
           path: ${{ runner.temp }}/build/*.app
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c173c062227f..2efb5e8513d1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -54,11 +54,11 @@ jobs:
         shell: bash
 
     env:
-      QT_VERSION: 6.8.3
+      QT_VERSION: 6.10.1
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -88,7 +88,7 @@ jobs:
           target: desktop
           arch: ${{ matrix.arch }}
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
           setup-python: false
           cache: true
 
@@ -133,4 +133,5 @@ jobs:
           package_name: ${{ matrix.package }}
           aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lupdate.yaml b/.github/workflows/lupdate.yaml
index b5c9c828410f..5418aa2420b2 100644
--- a/.github/workflows/lupdate.yaml
+++ b/.github/workflows/lupdate.yaml
@@ -21,19 +21,18 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Qt for Linux
         uses: jurplel/install-qt-action@v4
         with:
-          version: 6.8.3
+          version: 6.10.1
           cache: true
 
       - name: Update translation files
         run: |
-          cd translations
-          ${{ env.QT_ROOT_DIR }}/bin/lupdate ../src -ts qgc.ts -no-obsolete
-          python3 qgc-lupdate-json.py
+          ${{ env.QT_ROOT_DIR }}/bin/lupdate src -ts translations/qgc.ts -no-obsolete
+          python3 tools/translations/qgc-lupdate-json.py
 
       - name: Configure Git
         run: |
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a38e728cd206..3730dd03fbb9 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -34,12 +34,11 @@ jobs:
         shell: bash
 
     env:
-      QT_VERSION: 6.8.3
-      QGC_MACOS_SIGNING_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY }}
+      QT_VERSION: 6.10.1
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -51,7 +50,7 @@ jobs:
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: latest-stable
+          xcode-version: '<=16.x'
 
       - name: Install Dependencies (include GStreamer)
         working-directory: ${{ github.workspace }}/tools/setup
@@ -73,43 +72,46 @@ jobs:
           target: desktop
           arch: clang_64
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
           setup-python: false
           cache: true
 
-      - name: Import Code Signing Certificate
-        if: github.event_name != 'pull_request'
-        uses: apple-actions/import-codesign-certs@v5
-        with:
-          p12-file-base64: ${{ secrets.MACOS_SIGNING_CERTS_P12 }}
-          p12-password: ${{ secrets.MACOS_SIGNING_CERTS_PASS }}
-
-      - name: Configure
+      - name: CMake configure
         working-directory: ${{ runner.temp }}/build
         run: ${{ env.QT_ROOT_DIR }}/bin/qt-cmake -S ${{ github.workspace }} -B . -G Ninja
               -DCMAKE_BUILD_TYPE=${{ matrix.BuildType }}
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
+              -DQGC_MACOS_SIGN_WITH_IDENTITY=${{ github.event_name != 'pull_request' && 'ON' || 'OFF' }}
 
       - name: Build
         working-directory: ${{ runner.temp }}/build
         run: cmake --build . --target all --config ${{ matrix.BuildType }} --parallel
 
       - name: Sanity check dev build executable
-        if: matrix.BuildType == 'Release'
         working-directory: ${{ runner.temp }}/build/Release/QGroundControl.app/Contents/MacOS
         run: ./QGroundControl --simple-boot-test
 
-      - name: Create DMG
+      - name: Import Code Signing Certificate
+        if: github.event_name != 'pull_request'
+        uses: apple-actions/import-codesign-certs@v5
+        with:
+          p12-file-base64: ${{ secrets.MACOS_CERT_P12_BASE64 }}
+          p12-password: ${{ secrets.MACOS_CERT_P12_PASSWORD }}
+
+      - name: Create signed/notarized/stapled app bundle
         working-directory: ${{ runner.temp }}/build
         run: cmake --install . --config ${{ matrix.BuildType }}
+        env:
+          QGC_MACOS_SIGNING_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY }}
+          QGC_MACOS_NOTARIZATION_USERNAME: ${{ secrets.MACOS_NOTARIZATION_USERNAME }}
+          QGC_MACOS_NOTARIZATION_PASSWORD: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}
+          QGC_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
 
       - name: Mount DMG
-        if: matrix.BuildType == 'Release'
         working-directory: ${{ runner.temp }}/build
         run: hdiutil attach QGroundControl.dmg
 
       - name: Sanity check DMG executable
-        if: matrix.BuildType == 'Release'
         working-directory: /Volumes/QGroundControl/QGroundControl.app/Contents/MacOS
         run: ./QGroundControl --simple-boot-test
 
@@ -121,4 +123,5 @@ jobs:
           package_name: QGroundControl
           aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 82ed2023ca46..f484f6b15571 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -6,6 +6,21 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+
+      - name: Install Qt and qmllint
+        run: |
+          sudo apt-get update -y --quiet
+          sudo apt-get install python3 python3-pip pipx -y
+          pipx install aqtinstall
+          pipx ensurepath
+          USER_BASE_BIN="$(python3 -m site --user-base)/bin"
+          export PATH="$USER_BASE_BIN:$PATH"
+          QT_VERSION=6.10.1
+          QT_ARCH=linux_gcc_64
+          QT_PATH=/opt/Qt
+          aqt install-qt linux desktop $QT_VERSION $QT_ARCH -O $QT_PATH
+          echo "$QT_PATH/$QT_VERSION/gcc_64/bin" >> $GITHUB_PATH
+
       - uses: pre-commit/action@v3.0.1
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 1e263b062c83..ddfd97eae73c 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           days-before-stale: 30
           days-before-close: -1
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7f11ee5e04d3..25189b49d67b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -43,22 +43,25 @@ jobs:
             build_type: Release
             package: QGroundControl-installer-ARM64
 
+          # Qt 6.10.0 for cross-compiled until aqtinstall fix is released
+          # See: https://github.com/miurahr/aqtinstall/pull/952
           - os: windows-2022
             host: windows
             arch: win64_msvc2022_arm64_cross_compiled
             build_type: Release
             package: QGroundControl-installer-AMD64-ARM64
+            qt_version: '6.10.0'
 
     defaults:
       run:
         shell: cmd
 
     env:
-      QT_VERSION: 6.8.3
+      QT_VERSION: 6.10.1
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 1
@@ -85,15 +88,15 @@ jobs:
           build-type: ${{ matrix.build_type }}
           cpm-modules: ${{ runner.temp }}\build\cpm_modules
 
-      - name: Install Qt ${{ env.QT_VERSION }}
+      - name: Install Qt ${{ matrix.qt_version || env.QT_VERSION }}
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ env.QT_VERSION }}
+          version: ${{ matrix.qt_version || env.QT_VERSION }}
           host: ${{ matrix.host }}
           target: desktop
           arch: ${{ matrix.arch }}
           dir: ${{ runner.temp }}
-          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
+          modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml
           setup-python: false
           cache: true
 
@@ -132,5 +135,6 @@ jobs:
           package_name: ${{ matrix.package }}
           aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          upload_aws: ${{ matrix.arch == 'win64_msvc2022_arm64_cross_compiled' && false || true }}
+          upload_aws: ${{ matrix.arch == 'win64_msvc2022_arm64_cross_compiled' && 'false' || 'true' }}
diff --git a/.gitignore b/.gitignore
index b200f76138e7..2e3cd5566edd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,96 +1,160 @@
+# ==============================================================================
+# QGroundControl - Git Ignore Patterns
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# IDEs & Editors
+# ------------------------------------------------------------------------------
 .idea/
 .vscode/
-.cache/
-cmake-build-*/
-out/
-libs/lib/Frameworks/GStreamer.framework
-*_qmlcache.qrc
+.qtcreator/
+.fleet/
+.vs/
+.settings/
+
+# Editor temp/backup files
 *.swp
-*.nfs
-CMakeFiles
-tags
-build/
-obj
-.DS_Store
-*.log
 *~
 *~.skp
-bin/*.exe
-bin/*.txt
-bin/mac
-*pro.user*
-.qmake.stash
+*.autosave
+tags
+
+# ------------------------------------------------------------------------------
+# Build System & CMake
+# ------------------------------------------------------------------------------
+build/
+cmake-build-*/
+out/
+CMakeFiles
+CMakeLists.txt.user*
+CMakeUserPresets.json
+compile_commands.json
+cpm_modules
+.cache/
+
+# ------------------------------------------------------------------------------
+# Qt Generated Files
+# ------------------------------------------------------------------------------
+*_qmlcache.qrc
 qrc_*.cpp
+moc_*
+ui_*
+*.moc
+*.prl
+*.qm
+.qmlls.ini
+
+# ------------------------------------------------------------------------------
+# Compiled Objects & Binaries
+# ------------------------------------------------------------------------------
+*.o
 *.Debug
 *.Release
-tmp
-debug
-release
-/qgroundcontrol
-qgroundcontrol.xcodeproj/**
-doc/html
-doc/doxy.log
-controller_log*
-user_config.pri
 *.app
-*.ncb
-*.vcproj
-*.vcxproj*
-*.sdf
-*.ipch
+*.exe
+*.idb
 *.pdb
-*.sln
-*.sln
+tmp/
+obj/
+debug/
+release/
+/qgroundcontrol
+bin/*.exe
+bin/*.txt
+bin/mac
+
+# Libraries & dynamic/static objects
+*.a
+*.lib
+*.so
+*.so.*
+*.dylib
+*.dll
+
+# Build tool artifacts
+Makefile
+*.ninja
+.ninja_log
+build.ninja
+
+# Packaging & distribution
+*.dmg
+*.deb
+*.rpm
+*.AppImage
+*.apk
+*.aab
+*.ipa
+
+# ------------------------------------------------------------------------------
+# Platform-Specific
+# ------------------------------------------------------------------------------
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Windows - Visual Studio
 *.vcproj
-*.user
-*.ncb
-*.idb
-*.project
-*.cproject
+*.vcxproj*
 *.sln
 *.suo
-*.uhf.txt
+*.ncb
+*.sdf
+*.ipch
 *.opensdf
-thirdParty/qserialport-build-desktop/
-thirdParty/qserialport/bin/
-thirdParty/qserialport/lib/
-libs/thirdParty/libxbee/lib/
-GeneratedFiles/
-gstreamer-1.0-android*
-localization/qgroundcontrol/
-
-*.autosave
-.settings/
+*.uhf.txt
 
-# iOS Generated files
+# iOS
 ios/iOSForAppStore-Info.plist
 
-# Generated files
-moc_*
-ui_*
-*.o
-*.moc
-*.prl
-.qmlls.ini
-
-# android
+# Android
 android/local.properties
 *.class
 
-# doxygen
-src/html/
-src/latex/
+# Linux
+*.nfs
+
+# ------------------------------------------------------------------------------
+# Dependencies & Third Party
+# ------------------------------------------------------------------------------
+# Node.js (vitepress for user guide)
+node_modules/
+docs/.vitepress/cache/
+docs/.vitepress/dist/
+
+# Python
+*.pyc
+__pycache__/
+
+# ------------------------------------------------------------------------------
+# Runtime & Logs
+# ------------------------------------------------------------------------------
+*.log
+
+# Code coverage
+*.gcov
+*.gcda
+*.gcno
+*.coverage
 
-# vagrant
+# ------------------------------------------------------------------------------
+# Vagrant
+# ------------------------------------------------------------------------------
 .vagrant/
 Qt*-linux*.tar.*
 
-.vs/
+# ------------------------------------------------------------------------------
+# Local Development Tools
+# ------------------------------------------------------------------------------
 
-# vitepress - user guide
-node_modules/
-docs/.vitepress/cache/
-docs/.vitepress/dist/
+# Claude Code
+.claude/
 
-CMakeUserPresets.json
-cpm_modules
+# cc-sessions - personal AI development workflow
+sessions/
+CLAUDE.md
+
+# Pre-commit hooks
+.ruff_cache/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 47f7a26f76bf..62121cbb2eb5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,104 @@
+# QGroundControl Pre-Commit Configuration
+# Install: pre-commit install
+# Run: pre-commit run --all-files
+# Update: pre-commit autoupdate
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+  # Basic file checks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
     hooks:
-    -   id: check-yaml
+      - id: check-yaml
         args: [--allow-multiple-documents, --unsafe]
-    -   id: check-json
+      - id: check-json
+      - id: check-xml
+        exclude: ^test/
+      - id: check-merge-conflict
+      - id: check-added-large-files
+        args: ['--maxkb=1000']
+      - id: trailing-whitespace
+        args: ['--markdown-linebreak-ext=md']
+        exclude: ^translations/
+      - id: end-of-file-fixer
+        exclude: ^(translations/.*\.ts|.*\.(png|jpg|jpeg|gif|svg|ico|bin|dat))$
+      - id: mixed-line-ending
+        args: ['--fix=lf']
+        exclude: \.(bat|ps1)$
+
+  # C++ formatting (commented out - uncomment to enable)
+  # - repo: https://github.com/pre-commit/mirrors-clang-format
+  #   rev: v19.1.7
+  #   hooks:
+  #     - id: clang-format
+  #       types_or: [c++, c]
+  #       args: ['-i']
+  #       exclude: ^build/
+
+  # Python formatting
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.9.1
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
+
+  # Shell scripts
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.11.0.1
+    hooks:
+      - id: shellcheck
+
+  # YAML validation
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.37.1
+    hooks:
+      - id: yamllint
+        args: ['-d', '{extends: default, rules: {line-length: {max: 200}, document-start: disable, truthy: {check-keys: false}, comments: {min-spaces-from-content: 1}}}']
+
+  # QGC-specific checks
+  - repo: local
+    hooks:
+      - id: qmllint
+        name: Lint QML files
+        entry: bash -c 'if command -v qmllint &>/dev/null; then qmllint "$@" || true; else echo "qmllint not found - skipping QML linting (install qt6-declarative-dev-tools or Qt SDK)"; fi' --
+        language: system
+        files: \.qml$
+        exclude: ^build/
+        pass_filenames: true
+
+      - id: check-fact-metadata
+        name: Validate Fact metadata JSON
+        entry: python3
+        language: system
+        files: '\.FactMetaData\.json$|\.SettingsGroup\.json$'
+        pass_filenames: true
+        args:
+          - -c
+          - |
+            import sys, json
+            for f in sys.argv[1:]:
+                try:
+                    with open(f) as fp:
+                        json.load(fp)
+                except Exception as e:
+                    print(f"Invalid JSON in {f}: {e}")
+                    sys.exit(1)
+
+      - id: check-no-qassert
+        name: Check for Q_ASSERT in production code
+        entry: bash
+        language: system
+        files: \.(h|cc|cpp)$
+        exclude: ^(test/|UnitTest\.h|UnitTest\.cc)
+        pass_filenames: false
+        args:
+          - -c
+          - |
+            FILES=$(git diff --cached --name-only --diff-filter=d | grep -E '\.(h|cc|cpp)$' | grep -v '^test/' || true)
+            if [ -n "$FILES" ]; then
+              if echo "$FILES" | xargs grep -n 'Q_ASSERT' 2>/dev/null; then
+                echo "Warning: Q_ASSERT found in production code. Consider using defensive checks with early returns."
+              fi
+            fi
+
+exclude: ^build/
diff --git a/.qmllint.ini b/.qmllint.ini
new file mode 100644
index 000000000000..053b125a7e06
--- /dev/null
+++ b/.qmllint.ini
@@ -0,0 +1,95 @@
+# QGroundControl QML Linting Configuration
+# Requires Qt 6.10+ for "error" level support
+# See: https://doc.qt.io/qt-6/qtquick-tool-qmllint.html
+
+[General]
+DisableDefaultImports=false
+MaxWarnings=-1
+
+[Warnings]
+# Critical errors that should always be caught
+AccessSingletonViaObject=warning
+AliasCycle=warning
+AssignmentInCondition=warning
+BadSignalHandlerParameters=warning
+DuplicateEnumEntries=warning
+DuplicateImport=warning
+DuplicateInlineComponent=warning
+DuplicatePropertyBinding=warning
+DuplicatedName=warning
+# Disabled - QGC has custom modules that aren't available during linting
+ImportFailure=disable
+IncompatibleType=warning
+InheritanceCycle=warning
+# Disabled - QGC custom types have properties not known to qmllint
+MissingProperty=disable
+MissingType=disable
+NonListProperty=warning
+ReadOnlyProperty=warning
+UncreatableType=warning
+UnqualifiedAccess=warning
+UnreachableCode=warning
+UnresolvedAlias=warning
+UnresolvedType=warning
+
+# Warnings that improve code quality
+Comma=warning
+ComponentChildrenCount=warning
+ConfusingExpressionStatement=warning
+ConfusingMinuses=warning
+ConfusingPluses=warning
+Deprecated=warning
+EnumEntryMatchesEnum=warning
+EnumsAreNotTypes=warning
+EqualityTypeCoercion=warning
+Eval=warning
+InvalidLintDirective=warning
+LiteralConstructor=warning
+MissingEnumEntry=warning
+PreferNonVarProperties=warning
+PrefixedImportType=warning
+RedundantOptionalChaining=warning
+RequiredProperty=warning
+RestrictedType=warning
+StalePropertyRead=warning
+TopLevelComponent=warning
+TranslationFunctionMismatch=warning
+UnintentionalEmptyBlock=warning
+UnterminatedCase=warning
+UseProperFunction=warning
+VarUsedBeforeDeclaration=warning
+WithStatement=warning
+
+# Info-level (non-blocking)
+MultilineStrings=info
+UnusedImports=info
+
+# Disabled (too noisy or not applicable for QGC)
+AttachedPropertyReuse=disable
+CompilerWarnings=disable
+# QGC uses context properties extensively
+ContextProperties=disable
+FunctionUsedBeforeDeclaration=disable
+ImportFileSelector=disable
+LintPluginWarnings=disable
+Void=disable
+
+# Qt Quick specific warnings
+Quick.Anchors=warning
+Quick.AttachedPropertyReuse=disable
+Quick.AttachedPropertyType=warning
+Quick.Color=warning
+Quick.ControlsAttachedPropertyReuse=disable
+Quick.ControlsNativeCustomize=warning
+Quick.LayoutsPositioning=warning
+Quick.PropertyChangesParsed=warning
+Quick.StateNoChildItem=warning
+Quick.UnexpectedVarType=warning
+
+# Qt Design Studio (not used by QGC)
+QtDesignStudio.FunctionsNotSupportedInQmlUi=disable
+QtDesignStudio.ImperativeCodeNotEditableInVisualDesigner=disable
+QtDesignStudio.InvalidIdeInVisualDesigner=disable
+QtDesignStudio.ReferenceToParentItemNotSupportedByVisualDesigner=disable
+QtDesignStudio.UnsupportedRootTypeInQmlUi=disable
+QtDesignStudio.UnsupportedTypeInQmlUi=disable
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000000..a212caa12fd6
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,85 @@
+# QGroundControl Quick Reference for AI Assistants
+
+**Ground Control Station** for UAVs using MAVLink protocol. **C++20/Qt 6.10.1** with QML UI.
+
+## 🔑 Most Critical Architecture Pattern
+
+**Fact System** - QGC's type-safe parameter management. Every vehicle parameter uses it.
+
+```cpp
+// ALWAYS use this pattern for parameters
+Fact* param = vehicle->parameterManager()->getParameter(-1, "PARAM_NAME");
+if (param) {
+    param->setCookedValue(newValue);  // cookedValue = UI (with units)
+    // param->rawValue() = MAVLink/storage
+}
+```
+
+**Rules:**
+- Wait for `parametersReady` signal before accessing
+- Use cookedValue (display) vs rawValue (storage)
+- Never create custom parameter storage
+
+## 🏗️ Key Patterns
+
+1. **Plugins**: FirmwarePlugin (PX4/ArduPilot behavior), AutoPilotPlugin (setup UI), VehicleComponent (individual items)
+2. **Managers**: Singleton pattern - `MultiVehicleManager::instance()->activeVehicle()` (always null-check!)
+3. **QML Integration**: `QML_ELEMENT`, `Q_PROPERTY`, `Q_INVOKABLE`
+4. **State Machines**: Use `QGCStateMachine` for complex workflows (calibration, parameter loading)
+
+## 📂 Code Structure
+
+```
+src/
+├── FactSystem/         # Parameter management (READ FIRST!)
+├── Vehicle/            # Vehicle state (Vehicle.h is critical)
+├── FirmwarePlugin/     # PX4/ArduPilot abstraction
+├── AutoPilotPlugins/   # Vehicle setup UI
+├── MissionManager/     # Mission planning
+├── Comms/              # Serial/UDP/TCP/Bluetooth links
+```
+
+## ⚡ Quick Build
+
+```bash
+git submodule update --init --recursive
+~/Qt/6.10.1/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+cmake --build build --config Debug
+./build/Debug/QGroundControl --unittest  # Run tests
+```
+
+## ❌ Common Mistakes (DO NOT!)
+
+1. Assume single vehicle (always null-check `activeVehicle()`)
+2. Access Facts before `parametersReady`
+3. Use `Q_ASSERT` in production code
+4. Bypass FirmwarePlugin for firmware-specific behavior
+5. Mix cookedValue/rawValue without conversion
+
+## 📖 Essential Reading
+
+1. **`.github/copilot-instructions.md`** - Detailed architecture guide
+2. **`.github/CONTRIBUTING.md`** - Contribution guidelines
+3. **`src/FactSystem/Fact.h`** - Parameter system (MOST CRITICAL!)
+4. **`src/Vehicle/Vehicle.h`** - Vehicle model (~1477 lines)
+
+## 🧑‍💻 Coding Style
+
+- **Naming**: Classes `PascalCase`, methods `camelCase`, privates `_leadingUnderscore`
+- **Files**: `ClassName.h`, `ClassName.cc`
+- **Defensive**: Always validate inputs, null-check pointers, early returns
+- **Logging**: `QGC_LOGGING_CATEGORY(MyLog, "qgc.component")` + `qCDebug(MyLog)`
+- **Braces**: Always use, even for single-line if statements
+- **Formatting**: `.clang-format`, `.clang-tidy`, `.editorconfig` configured in repo root
+- **Comments**: Keep minimal - code should be self-documenting. No verbose headers or documentation files unless explicitly requested.
+
+## 🔗 Resources
+
+- **Dev Guide**: https://dev.qgroundcontrol.com/
+- **User Docs**: https://docs.qgroundcontrol.com/
+- **MAVLink**: https://mavlink.io/
+- **Qt 6**: https://doc.qt.io/qt-6/
+
+---
+
+**Key Principle**: Match existing code style. Use defensive coding. Respect the Fact System architecture.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 637e0f285ec0..790fd4b4acb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,60 +1,90 @@
+# ============================================================================
+# QGroundControl CMake Build Configuration
+# ============================================================================
+
 cmake_minimum_required(VERSION 3.25)
 
+# ----------------------------------------------------------------------------
+# CMake Module Paths
+# ----------------------------------------------------------------------------
 list(APPEND CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/cmake
-    ${CMAKE_SOURCE_DIR}/cmake/CPack
-    ${CMAKE_SOURCE_DIR}/cmake/find-modules
-    ${CMAKE_SOURCE_DIR}/cmake/install
-    ${CMAKE_SOURCE_DIR}/cmake/install/CPack
-    ${CMAKE_SOURCE_DIR}/cmake/modules
-    ${CMAKE_SOURCE_DIR}/cmake/platform
+    "${CMAKE_SOURCE_DIR}/cmake"
+    "${CMAKE_SOURCE_DIR}/cmake/CPack"
+    "${CMAKE_SOURCE_DIR}/cmake/find-modules"
+    "${CMAKE_SOURCE_DIR}/cmake/install"
+    "${CMAKE_SOURCE_DIR}/cmake/install/CPack"
+    "${CMAKE_SOURCE_DIR}/cmake/modules"
+    "${CMAKE_SOURCE_DIR}/cmake/platform"
 )
 
+# Include helper functions early
 include(Helpers)
 
+# ----------------------------------------------------------------------------
+# Default Build Type
+# ----------------------------------------------------------------------------
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
-    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configuration types" FORCE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (Debug or Release)" FORCE)
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Available configuration types" FORCE)
+    message(STATUS "No build type specified. Defaulting to Release.")
 endif()
 
+# ----------------------------------------------------------------------------
+# CMake Policy Configuration
+# ----------------------------------------------------------------------------
 set(CMAKE_REQUIRED_QUIET ON)
 set(CMAKE_POLICY_VERSION_MINIMUM ${CMAKE_MINIMUM_REQUIRED_VERSION})
 
-#######################################################
-#                Custom Build Configuration
-#######################################################
+# ============================================================================
+# Custom Build Configuration
+# ============================================================================
 
+# Load default options and allow custom builds to override
 include(CustomOptions)
 
 if(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/custom")
-    message(STATUS "QGC: Enabling custom build")
+    message(STATUS "QGC: Custom build directory detected")
     set(QGC_CUSTOM_BUILD ON)
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/custom/cmake")
     include(CustomOverrides)
 endif()
 
+# Disable testing if not explicitly enabled
 if(NOT QGC_BUILD_TESTING)
-    set(BUILD_TESTING OFF CACHE INTERNAL "" FORCE)
+    set(BUILD_TESTING OFF CACHE INTERNAL "Disable testing by default" FORCE)
 endif()
 
-#######################################################
-#                   Project Info
-#######################################################
+# ============================================================================
+# Project Configuration
+# ============================================================================
 
+# ----------------------------------------------------------------------------
+# Apple-Specific Pre-Project Settings
+# ----------------------------------------------------------------------------
 if(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
-    # set(CMAKE_OSX_SYSROOT "iphoneos")
+    # iOS builds: set(CMAKE_OSX_SYSROOT "iphoneos")
     if(QGC_MACOS_UNIVERSAL_BUILD)
-        set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+        # Universal binary for both Intel and Apple Silicon
+        set(CMAKE_OSX_ARCHITECTURES "x86_64h;arm64")
     endif()
 endif()
 
+# ----------------------------------------------------------------------------
+# Git Integration & Version Extraction
+# ----------------------------------------------------------------------------
 include(Git)
 
+# ----------------------------------------------------------------------------
+# Compiler Caching Configuration
+# ----------------------------------------------------------------------------
 if(QGC_USE_CACHE)
     qgc_config_caching()
 endif()
 
+# ----------------------------------------------------------------------------
+# Project Declaration
+# ----------------------------------------------------------------------------
 project(${QGC_APP_NAME}
     VERSION ${QGC_APP_VERSION}
     DESCRIPTION ${QGC_APP_DESCRIPTION}
@@ -62,48 +92,65 @@ project(${QGC_APP_NAME}
     LANGUAGES C CXX
 )
 
-#######################################################
-#            CMake Configuration Options
-#######################################################
+# ============================================================================
+# CMake & Build System Configuration
+# ============================================================================
 
+# Standard CMake modules
 include(GNUInstallDirs)
 include(FetchContent)
 include(CMakePrintHelpers)
 
-if(EXISTS "${QGC_CPM_SOURCE_CACHE}")
-    set(ENV{CPM_SOURCE_CACHE} "${QGC_CPM_SOURCE_CACHE}")
-else()
-    set(ENV{CPM_SOURCE_CACHE} "${CMAKE_BINARY_DIR}/cpm_modules")
-endif()
+# ----------------------------------------------------------------------------
+# CPM (CMake Package Manager) Configuration
+# ----------------------------------------------------------------------------
 include(CPM)
+if(NOT CPM_SOURCE_CACHE)
+    set(CPM_SOURCE_CACHE "${CMAKE_BINARY_DIR}/cpm_modules")
+endif()
 
+# ----------------------------------------------------------------------------
+# Toolchain Configuration (Compiler, Linker, Build Settings)
+# ----------------------------------------------------------------------------
 include(Toolchain)
 
+# ----------------------------------------------------------------------------
+# Output Directories
+# ----------------------------------------------------------------------------
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/$<CONFIG>/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/$<CONFIG>")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/$<CONFIG>")
+if(ANDROID)
+    set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+else()
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/$<CONFIG>")
+endif()
 
-# https://cmake.org/cmake/help/latest/policy/CMP0168.html#policy:CMP0168
+# ----------------------------------------------------------------------------
+# CMake Policies
+# ----------------------------------------------------------------------------
+# CMP0168: Modern FetchContent integration
 if(POLICY CMP0168)
     cmake_policy(SET CMP0168 NEW)
     set(CMAKE_POLICY_DEFAULT_CMP0168 NEW)
 endif()
 
-# https://cmake.org/cmake/help/latest/policy/CMP0141.html#policy:CMP0141
+# CMP0141: MSVC debug information format
 if(POLICY CMP0141)
     cmake_policy(SET CMP0141 NEW)
     set(CMAKE_POLICY_DEFAULT_CMP0141 NEW)
 endif()
 
-# https://cmake.org/cmake/help/latest/policy/CMP0075.html#policy:CMP0075
+# CMP0075: Include files in CheckIncludeFile
 if(POLICY CMP0075)
     cmake_policy(SET CMP0075 NEW)
     set(CMAKE_POLICY_DEFAULT_CMP0075 NEW)
 endif()
 
-#######################################################
-#               Qt6 Configuration
-#######################################################
+# ============================================================================
+# Qt6 Configuration
+# ============================================================================
+
+set(QT_NO_PRIVATE_MODULE_WARNING ON)
 
 find_package(Qt6
     ${QGC_QT_MINIMUM_VERSION}...${QGC_QT_MAXIMUM_VERSION}
@@ -116,6 +163,7 @@ find_package(Qt6
         Gui
         LinguistTools
         Location
+        LocationPrivate
         Multimedia
         Network
         Positioning
@@ -130,6 +178,7 @@ find_package(Qt6
         TextToSpeech
         Widgets
         Xml
+        StateMachine
     OPTIONAL_COMPONENTS
         Bluetooth
         MultimediaQuickPrivate
@@ -149,55 +198,73 @@ qt_standard_project_setup(
     I18N_SOURCE_LANGUAGE en
 )
 
+# ----------------------------------------------------------------------------
+# QML Linting Configuration
+# ----------------------------------------------------------------------------
+if(QGC_ENABLE_QMLLINT)
+    set(QT_QML_GENERATE_QMLLINT ON CACHE BOOL "Enable automatic QML linting" FORCE)
+else()
+    set(QT_QML_GENERATE_QMLLINT OFF CACHE BOOL "Disable automatic QML linting" FORCE)
+endif()
+
+# ----------------------------------------------------------------------------
+# Qt Policies (Enable modern Qt6 behaviors)
+# ----------------------------------------------------------------------------
 qt_policy(
-    SET QTP0001 NEW
-    SET QTP0002 NEW
-    SET QTP0003 NEW
-    SET QTP0004 NEW
-    SET QTP0005 NEW
+    SET QTP0001 NEW  # Modern resource handling
+    SET QTP0002 NEW  # New behavior for QML module URI
+    SET QTP0003 NEW  # Better QML type registration
+    SET QTP0004 NEW  # Improved translation handling
+    SET QTP0005 NEW  # Enhanced deployment handling
 )
 
-#######################################################
-#                Custom Build Configuration
-#######################################################
+# ============================================================================
+# Custom Build Subdirectory
+# ============================================================================
 
 if(QGC_CUSTOM_BUILD)
     add_subdirectory(custom)
 endif()
 
-#######################################################
-#                QGroundControl Resources
-#######################################################
+# ============================================================================
+# QGroundControl Resources
+# ============================================================================
 
-# Note: Adding Resources to Library instead requires using Q_INIT_RESOURCE(qgcresources)
+# Note: Resources added to executable (not library) to avoid needing Q_INIT_RESOURCE()
 
 list(APPEND QGC_RESOURCES
-    ${CMAKE_SOURCE_DIR}/qgcimages.qrc
-    ${CMAKE_SOURCE_DIR}/qgcresources.qrc
+    "${CMAKE_SOURCE_DIR}/qgcimages.qrc"
+    "${CMAKE_SOURCE_DIR}/qgcresources.qrc"
+    "${CMAKE_SOURCE_DIR}/resources/InstrumentValueIcons/InstrumentValueIcons.qrc"
 )
 
-list(APPEND QGC_RESOURCES
-    ${CMAKE_SOURCE_DIR}/resources/InstrumentValueIcons/InstrumentValueIcons.qrc
-)
-
-#######################################################
-#               QGroundControl Target
-#######################################################
+# ============================================================================
+# QGroundControl Executable Target
+# ============================================================================
 
+# Create the main executable
 qt_add_executable(${CMAKE_PROJECT_NAME}
-    WIN32
-    MACOSX_BUNDLE
+    WIN32          # Windows GUI application
+    MACOSX_BUNDLE  # macOS application bundle
     ${QGC_RESOURCES}
 )
 
+# ----------------------------------------------------------------------------
+# Platform-Specific Configuration
+# ----------------------------------------------------------------------------
 if(WIN32)
     include(Windows)
 elseif(APPLE)
     include(Apple)
 elseif(ANDROID)
     include(Android)
+elseif(LINUX)
+    include(Linux)
 endif()
 
+# ----------------------------------------------------------------------------
+# QML Module Configuration
+# ----------------------------------------------------------------------------
 qt_add_qml_module(${CMAKE_PROJECT_NAME}
     URI QGC
     VERSION 1.0
@@ -209,13 +276,21 @@ qt_add_qml_module(${CMAKE_PROJECT_NAME}
         QtQuick.Layouts
 )
 
+# ----------------------------------------------------------------------------
+# Source & Test Subdirectories
+# ----------------------------------------------------------------------------
 add_subdirectory(src)
+
 if(QGC_BUILD_TESTING)
     add_subdirectory(test)
+    # Exclude test directory from translation scanning
     set_property(DIRECTORY test PROPERTY QT_EXCLUDE_FROM_TRANSLATION ON)
 endif()
 
-file(GLOB TS_SOURCES ${CMAKE_SOURCE_DIR}/translations/qgc_*.ts)
+# ----------------------------------------------------------------------------
+# Translation/Localization Configuration
+# ----------------------------------------------------------------------------
+file(GLOB TS_SOURCES "${CMAKE_SOURCE_DIR}/translations/qgc_*.ts")
 set_source_files_properties(${TS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/i18n")
 
 qt_add_translations(${CMAKE_PROJECT_NAME}
@@ -224,24 +299,50 @@ qt_add_translations(${CMAKE_PROJECT_NAME}
     LUPDATE_OPTIONS -no-obsolete
     TS_FILE_DIR "${CMAKE_SOURCE_DIR}/translations"
     TS_FILE_BASE ${CMAKE_PROJECT_NAME}
+    # TS_FILES_OUTPUT_VARIABLE _ts_files_generated
+    # TS_OUTPUT_DIRECTORY "{CMAKE_SOURCE_DIR}/translations"
+    # QM_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/i18n"
+    # MERGE_QT_TRANSLATIONS
 )
 
-qgc_set_qt_resource_alias(${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf)
+# ----------------------------------------------------------------------------
+# Qt Quick Controls Configuration
+# ----------------------------------------------------------------------------
+qgc_set_qt_resource_alias("${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf")
 
 qt_add_resources(${CMAKE_PROJECT_NAME} "qgcresources_cmake"
     PREFIX "/"
-    FILES
-        "${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf"
+    FILES "${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf"
 )
 
-# cmake_print_variables(QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE)
+# ----------------------------------------------------------------------------
+# Qt Plugin Configuration
+# ----------------------------------------------------------------------------
 qt_import_plugins(${CMAKE_PROJECT_NAME}
     INCLUDE Qt6::QSvgPlugin
-    EXCLUDE_BY_TYPE geoservices
+    EXCLUDE_BY_TYPE geoservices  # Use built-in location plugins
     INCLUDE_BY_TYPE sqldrivers Qt6::QSQLiteDriverPlugin
-    # INCLUDE_BY_TYPE styles Qt6::qtquickcontrols2basicstyleplugin Qt6::qtquickcontrols2basicstyleimplplugin
 )
 
+# Linux-specific Qt platform plugins
+if(LINUX)
+    qt_import_plugins(${CMAKE_PROJECT_NAME}
+        INCLUDE
+            Qt6::QWaylandIntegrationPlugin      # Wayland support
+            Qt6::QXcbIntegrationPlugin          # X11 support
+            Qt6::QEglFSIntegrationPlugin        # Embedded GL support
+            Qt6::QWaylandEglPlatformIntegrationPlugin
+    )
+endif()
+
+# ============================================================================
+# Installation & Packaging
+# ============================================================================
+
 include(Install)
 
+# ============================================================================
+# Build Summary
+# ============================================================================
+
 include(PrintSummary)
diff --git a/_CMakePresets.json b/CMakePresets.json.template
similarity index 100%
rename from _CMakePresets.json
rename to CMakePresets.json.template
diff --git a/CodingStyle.cc b/CodingStyle.cc
index d50968fd0c7f..762d255a8745 100644
--- a/CodingStyle.cc
+++ b/CodingStyle.cc
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -12,84 +12,153 @@
 // Not all style choices are explained.
 
 #include "CodingStyle.h"
+
+#include <math.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+
 #include "QGCApplication.h"
+#include "QGCLoggingCategory.h"
+#include "Vehicle.h"
 
-#include <QFile>
-#include <QDebug>
+// Note how the Qt headers, System headers, and the QGroundControl headers above are kept in separate groups
+// with blank lines between them. Within each group, headers are sorted alphabetically.
 
-#include <math.h>
+// Use QGC_LOGGING_CATEGORY instead of Q_LOGGING_CATEGORY for runtime log configuration support
+QGC_LOGGING_CATEGORY(CodingStyleLog, "Example.CodingStyle")
 
-// Note how the Qt headers and the QGroundControl headers above are kept separate
+CodingStyle::CodingStyle(QObject* parent)
+    : QObject(parent)
+{
+    // Constructor body - use member initializer list above for initialization
+    _commonInit();
+}
 
-Q_LOGGING_CATEGORY(CodingStyleLog, "CodingStyleLog")
+CodingStyle::~CodingStyle()
+{
+    // Cleanup code here
+    // Qt parent/child ownership handles most cleanup automatically
+}
 
-const int CodingStyle::_privateStaticVariable = 0;
+void CodingStyle::_commonInit()
+{
+    // Common initialization code
+    qCDebug(CodingStyleLog) << "CodingStyle initialized";
+}
 
-CodingStyle::CodingStyle(QObject* parent) :
-    QObject(parent),
-    _protectedVariable(1),
-    _privateVariable1(2),
-    _privateVariable2(3)
+void CodingStyle::setExampleProperty(int value)
 {
+    if (_exampleProperty != value) {
+        _exampleProperty = value;
+        emit examplePropertyChanged(value);  // Always emit signals when properties change
+    }
+}
 
+bool CodingStyle::publicMethod1()
+{
+    // Implementation here
+    return true;
+}
+
+void CodingStyle::performAction(const QString& param)
+{
+    // Defensive coding: validate inputs early
+    if (param.isEmpty()) {
+        qCWarning(CodingStyleLog) << "performAction called with empty parameter";
+        return;
+    }
+
+    // Always null-check pointers before dereferencing
+    if (!_vehicle) {
+        qCWarning(CodingStyleLog) << "No vehicle available";
+        return;
+    }
+
+    qCDebug(CodingStyleLog) << "performAction:" << param;
 }
 
 /// Document non-obvious private methods in the code file.
-void CodingStyle::_privateMethod(void)
+void CodingStyle::_privateMethod()
 {
-    // Always include braces even for single line if/for/...
-    if (uas != _uasId) {
+    // Defensive coding example: validate preconditions and return early on errors
+    if (!_vehicle) {
+        qCWarning(CodingStyleLog) << "Vehicle not set, cannot proceed";
         return;
     }
-    
+
+    // Always include braces even for single line if/for/while/etc
+    if (_exampleProperty == 0) {
+        return;
+    }
+
     // Note the brace placement
-    if (_lastSeenComponent == -1) {
-        _lastSeenComponent = component;
+    if (_privateVariable1 == -1) {
+        _privateVariable1 = 42;
     } else {
-        Q_ASSERT(component == _lastSeenComponent);  // Asserts are your friend
+        // Use defensive checks instead of Q_ASSERT in production code
+        // Q_ASSERT is compiled out in release builds
+        if (_privateVariable1 != 42) {
+            qCWarning(CodingStyleLog) << "Unexpected value:" << _privateVariable1;
+        }
     }
 }
 
-void CodingStyle::_privateMethod2(void)
+void CodingStyle::_privateSlot()
 {
+    // Example: handling Fact value changes
     Fact* fact = qobject_cast<Fact*>(sender());
-    Q_ASSERT(fact);
-    
+    if (!fact) {
+        qCWarning(CodingStyleLog) << "Invalid sender in _privateSlot";
+        return;
+    }
+
+    // Use Fact System properly: cookedValue for display, rawValue for storage
+    const QVariant cookedValue = fact->cookedValue();
+    const QVariant rawValue = fact->rawValue();
+
+    qCDebug(CodingStyleLog) << "Fact changed:" << fact->name()
+                            << "cooked:" << cookedValue
+                            << "raw:" << rawValue;
+
+    // Example switch statement with proper formatting
     QVariant typedValue;
     switch (fact->type()) {
         case FactMetaData::valueTypeInt8:
         case FactMetaData::valueTypeInt16:
         case FactMetaData::valueTypeInt32:
-            typedValue.setValue(QVariant(value.toInt()));
+            typedValue.setValue(cookedValue.toInt());
             break;
-            
         case FactMetaData::valueTypeUint8:
         case FactMetaData::valueTypeUint16:
         case FactMetaData::valueTypeUint32:
-            typedValue.setValue(value.toUInt());
+            typedValue.setValue(cookedValue.toUInt());
             break;
-            
         case FactMetaData::valueTypeFloat: {
-            int localScopedVar = 1;
-            typedValue.setValue(value.toFloat());
-        }
+            // Use braces for local variable scope in case statements
+            const int localScopedVar = 1;
+            Q_UNUSED(localScopedVar);  // OK to use Q_UNUSED for intentionally unused variables
+            typedValue.setValue(cookedValue.toFloat());
             break;
-            
+        }
         case FactMetaData::valueTypeDouble:
-            typedValue.setValue(value.toDouble());
+            typedValue.setValue(cookedValue.toDouble());
+            break;
+        default:
+            qCWarning(CodingStyleLog) << "Unhandled fact type:" << fact->type();
             break;
     }
 }
 
-void CodingStyle::_methodWithManyArguments(QWidget*         parent,
-                                           const QString&   caption,
-                                           const QString&   dir,
-                                           Options          options1,
-                                           Options          /* options2 */,
-                                           Options          options3)
+void CodingStyle::_methodWithManyArguments(
+    QObject* parent,
+    const QString& caption,
+    const QString& dir,
+    int options1,
+    int /* options2 */,  // Unused arguments: comment out name but keep type
+    int options3)
 {
-    // options2 is an unused method argument.
-    // Do not use Q_UNUSUED and do not just remove the argument name and leave the type.
-
-    // Implementataion here...
+    // Do not use Q_UNUSED for method parameters - comment out the parameter name instead
+    // This makes it clear the parameter is intentionally unused
+    // Implementation here...
 }
diff --git a/CodingStyle.h b/CodingStyle.h
index 22300e5e2657..c06255c0340e 100644
--- a/CodingStyle.h
+++ b/CodingStyle.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
@@ -13,16 +13,22 @@
 
 #pragma once
 
-#include <QObject>
-#include <QMap>
-#include <QXmlStreamReader>
-#include <QLoggingCategory>
-
 #include <limits.h>
 
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtQmlIntegration/QtQmlIntegration>
+
 #include "Fact.h"
+#include "Vehicle.h"
 
-// Note how the Qt headers, System, headers and the QGroundControl headers above are kept in separate groups
+// Note how the Qt headers, System headers and the QGroundControl headers above are kept in separate groups
+// with blank lines between them. Within each group, headers are sorted alphabetically.
+// Use full paths for Qt headers (e.g., QtCore/QObject not QObject).
+
+// Forward declarations for classes that are only used as pointers/references
+class Vehicle;
 
 // If you are going to use a logging category for a class it should have the same name as the class
 // with a suffix of Log.
@@ -30,50 +36,90 @@ Q_DECLARE_LOGGING_CATEGORY(CodingStyleLog)
 
 /// Here is the class documentation. Class names are PascalCase. If you override any of the Qt base classes to provide
 /// generic base implementations for widespread use prefix the class name with QGC. For example:
-///     QGCMessageBox - is a QGC special vesion of Qt MessageBox
-///     QGCPalette - is a QGC special version of Qt Palette
-/// For normal single use classes do no prefix them name with QGC.
+/// For normal single use classes do not prefix the name with QGC.
+///
+/// Qt6 QML Integration: Use QML_ELEMENT for QML-creatable types, QML_SINGLETON for singletons,
+/// and QML_UNCREATABLE("reason") for C++-only instantiation.
 
 class CodingStyle : public QObject
 {
     Q_OBJECT
-    
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+    Q_MOC_INCLUDE("Vehicle.h")  // Use Q_MOC_INCLUDE for forward-declared types used in Q_PROPERTY
+    /// Q_PROPERTY definitions for QML binding
+    /// Format: Q_PROPERTY(Type name READ getter WRITE setter NOTIFY signal)
+    /// Use CONSTANT for properties that never change
+    /// Use MEMBER for direct member access (rarely needed)
+    Q_PROPERTY(int      exampleProperty     READ exampleProperty    WRITE setExampleProperty    NOTIFY examplePropertyChanged)
+    Q_PROPERTY(Vehicle* vehicle             READ vehicle                                        CONSTANT)
+    Q_PROPERTY(bool     readOnlyProperty    READ readOnlyProperty                               NOTIFY readOnlyPropertyChanged)
 public:
-    CodingStyle(QObject* parent = NULL);
-    ~CodingStyle();
-    
+    explicit CodingStyle(QObject* parent = nullptr);  // Use nullptr, not NULL
+    ~CodingStyle() override;  // Use override keyword for virtual destructors
+
+    // Enums exposed to QML must use Q_ENUM
+    enum class ExampleEnum {
+        EnumValue1,
+        EnumValue2,
+        EnumValue3,
+    };
+    Q_ENUM(ExampleEnum)
+
     /// Document public methods which are non-obvious in the header file
-    bool publicMethod1(void);
-    
+    /// Use Q_INVOKABLE for methods callable from QML
+    Q_INVOKABLE bool publicMethod1();
+    Q_INVOKABLE void performAction(const QString& param);
+
+    // Public getters/setters
+    int exampleProperty() const { return _exampleProperty; }
+    void setExampleProperty(int value);
+    Vehicle* vehicle() const { return _vehicle; }
+    bool readOnlyProperty() const { return _readOnlyProperty; }
+
 signals:
     /// Document signals which are non-obvious in the header file
-    void qtSignal(void);
-    
+    /// Signals should be emitted when properties change to maintain QML bindings
+    void examplePropertyChanged(int newValue);
+    void readOnlyPropertyChanged();
+    void qtSignal();
+
 public slots:
-    // Public slots should only be used if the slot is connected to from another class. Majority of slots
-    // should be private.
-    void publicSlot(void);
-    
+    // Public slots should only be used if the slot is connected to from another class.
+    // Most slots should be private. Prefer signals/slots over direct method calls for loose coupling.
+    void publicSlot();
+
     // Don't use protected methods or variables unless the class is specifically meant to be used as a base class.
 protected:
-    int _protectedVariable;         ///< variable names are camelCase
-    
-    void _protectedMethod(void);    ///< method names are camelCase
-    
+    int _protectedVariable = 0; ///< variable names are camelCase
+
+    void _protectedMethod();    ///< method names are camelCase
+
 private slots:
-    void _privateSlot(void);
-    
+    void _privateSlot();
+
 private:
     // Private methods and variable names begin with an "_". Documentation for
-    // non-obvious private methods goes in the code file, not the header.
-    void _privateMethod(void);
-    
-    void _methodWithManyArguments(QWidget* parent, const QString& caption, const QString& dir, Options options1, Options options2, Options options3);
+    // non-obvious private methods goes in the header file.
+    void _privateMethod();
+    void _commonInit();
+
+    // For methods with many arguments, align parameters vertically
+    void _methodWithManyArguments(
+        QObject* parent,
+        const QString& caption,
+        const QString& dir,
+        int options1,
+        int options2,
+        int options3);
 
     /// Document non-obvious variables in the header file. Long descriptions go here.
-    int _privateVariable1;
-    
-    int _privateVariable2;    ///< Short descriptions go here
-    
-    static const int _privateStaticVariable;
+    int _exampleProperty = 0;
+    bool _readOnlyProperty = false;
+    Vehicle* _vehicle = nullptr;
+
+    int _privateVariable1 = 2;        ///< Short descriptions go here
+    int _privateVariable2 = 3;
+
+    static constexpr int _privateStaticVariable = 42;  // Use constexpr for compile-time constants
 };
diff --git a/CodingStyle.qml b/CodingStyle.qml
index 5959a4a66635..9bf08700bbdf 100644
--- a/CodingStyle.qml
+++ b/CodingStyle.qml
@@ -1,64 +1,182 @@
 /****************************************************************************
  *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
  * QGroundControl is licensed according to the terms in the file
  * COPYING.md in the root of the source code directory.
  *
  ****************************************************************************/
 
-
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Layouts
 
 import QGroundControl
-
 import QGroundControl.Controls
 
-
 /// This is an example Qml file which is used to describe the QGroundControl coding style.
 /// In general almost everything in here has some coding style meaning including order of
-/// code. Not all style choices are explained. If there is any confusison please ask
+/// code. Not all style choices are explained. If there is any confusion please ask
 /// and we'll answer and update style as needed.
+///
+/// Qt6 Import Style: Use unversioned imports (QtQuick not QtQuick 2.15)
+/// Import order: Qt modules, blank line, QGroundControl modules
 Item {
-    // Property binding to item properties
+    id: root  // Use descriptive id for root item, not underscore prefix
+
+    // ===================================================================================
+    // PROPERTY BINDING SECTION
+    // Bind to item properties first, before property definitions
+    // ===================================================================================
+
     width:  ScreenTools.defaultFontPixelHeight * 10 // No hardcoded sizing. All sizing must be relative to a ScreenTools font size
     height: ScreenTools.defaultFontPixelHeight * 20
 
+    // ===================================================================================
+    // PUBLIC PROPERTIES SECTION
     // Property definitions available to consumers of this Qml Item come first
-    property int    myIntProperty:  10
-    property real   myRealProperty: 20.0
+    // Group by type for readability
+    // ===================================================================================
+
+    property int myIntProperty: 10
+    property real myRealProperty: 20.0
+    property string myStringProperty: "example"
+    property bool myBoolProperty: false
+
+    // ===================================================================================
+    // PRIVATE PROPERTIES SECTION
+    // Property definitions which are internal to the item are prepended with an underscore
+    // to signal private and come second. Use readonly appropriately to increase binding performance.
+    // ===================================================================================
 
-    // Property definitions which are internal to the item are prepending with an underscore
-    // to signal private and come second
-    readonly property real _rectWidth:  ScreenTools.defaultFontPixelWidth * 10  // Use readonly appropriately to increase binding performance
+    readonly property real _rectWidth: ScreenTools.defaultFontPixelWidth * 10
     readonly property real _rectHeight: ScreenTools.defaultFontPixelWidth * 10
+    readonly property bool _debugMode: false
+    readonly property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+
+    // ===================================================================================
+    // SIGNALS SECTION
+    // Define custom signals for communication
+    // ===================================================================================
+
+    signal buttonClicked()
+    signal valueChanged(int newValue)
+
+    // ===================================================================================
+    // FUNCTIONS SECTION
+    // Function definitions come after properties
+    // ===================================================================================
 
     function myFunction() {
         console.log("myFunction was called")
     }
 
+    function _privateFunction() {
+        // Private functions prefixed with underscore
+        if (_activeVehicle) {
+            console.log("Active vehicle:", _activeVehicle.id)
+        }
+    }
+
+    function calculateSomething(param1, param2) {
+        // Always validate parameters
+        if (!param1 || !param2) {
+            console.warn("Invalid parameters")
+            return 0
+        }
+        return param1 * param2
+    }
+
+    // ===================================================================================
+    // VISUAL COMPONENTS SECTION
+    // Child items come last
+    // ===================================================================================
+
+    // Use QGCPalette for all color theming - no hardcoded colors
     QGCPalette {
         id:                 qgcPal  // Note how id does not use an underscore
         colorGroupEnabled:  enabled
     }
 
-    // You should always use the QGC provided variants of base control since they automatically support
-    // our theming and font support.
-    QGCButton {
-        // Also not how there is no id: specified for this control. Only add id: if it is needed.
-        text: "Button"
+    // Use ColumnLayout or RowLayout for better organization when appropriate
+    ColumnLayout {
+        anchors.fill:   parent
+        spacing:        ScreenTools.defaultFontPixelHeight * 0.5
+
+        // You should always use the QGC provided variants of base controls since they automatically support
+        // our theming and font support (QGCButton, QGCLabel, QGCTextField, QGCCheckBox, etc.)
+        QGCButton {
+            // Note how there is no id: specified for this control. Only add id: if it is needed.
+            Layout.fillWidth:   true
+            text:               qsTr("Click Me")  // Use qsTr() for all user-visible strings
+
+            onClicked: {
+                myFunction()
+                buttonClicked()  // Emit signal
+            }
+        }
+
+        QGCLabel {
+            Layout.fillWidth:   true
+            text:               qsTr("Example Label: %1").arg(myIntProperty)
+            wrapMode:           Text.WordWrap
+        }
+
+        Rectangle {
+            Layout.fillWidth:   true
+            Layout.fillHeight:  true
+            color:              qgcPal.window   // Use QGC palette colors for everything, no hardcoded colors
+            border.color:       qgcPal.text
+            border.width:       1
+
+            QGCLabel {
+                anchors.centerIn:   parent
+                text:               _debugMode ? qsTr("Debug Mode") : qsTr("Normal Mode")
+                color:              qgcPal.text
+            }
+        }
 
-        onClicked: myFunction()
+        // Example: Conditional visibility
+        QGCButton {
+            Layout.fillWidth:   true
+            text:               qsTr("Vehicle Action")
+            visible:            _activeVehicle !== null  // Defensive: always check for null vehicle
+            enabled:            _activeVehicle ? _activeVehicle.armed : false
+
+            onClicked: {
+                if (_activeVehicle) {  // Always null-check before use
+                    _privateFunction()
+                }
+            }
+        }
+    }
+
+    // ===================================================================================
+    // CONNECTIONS SECTION
+    // Connections objects come after visual components
+    // ===================================================================================
+
+    Connections {
+        target: QGroundControl.multiVehicleManager
+
+        function onActiveVehicleChanged(vehicle) {
+            if (vehicle) {
+                console.log("Active vehicle changed:", vehicle.id)
+            }
+        }
     }
 
-    Rectangle {
-        width:  _rectWidth
-        height: _rectHeight
-        color:  qgcPal.window   // Use QGC palette colors for everything, no hardcoded colors
+    // ===================================================================================
+    // COMPONENT.ONCOMPLETED SECTION
+    // Initialization code comes at the end
+    // ===================================================================================
+
+    Component.onCompleted: {
+        console.log("CodingStyle QML component loaded")
+        _privateFunction()
     }
 
     // For scoped blocks which are long include a comment so you can tell what the brace is matching.
-    // This is very handy when the top level brace scrolls off the screen. The endbrace comment in this
+    // This is very handy when the top level brace scrolls off the screen. The end-brace comment in this
     // specific file is only included as style info. This example code is not long enough to really need it.
 } // Item - CodingStyle
diff --git a/README.md b/README.md
index 799e33fabbcb..b9405404a77c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 - *✈️ Comprehensive Flight Control*: Full flight control and mission management for *PX4* and *ArduPilot* powered UAVs.
 - *🛠️ Mission Planning*: Easily plan complex missions with a simple drag-and-drop interface.
 
-🔍 For a deeper dive into using QGC, check out the [User Manual](https://docs.qgroundcontrol.com/en/) – although, thanks to QGC's intuitive UI, you may not even need it!
+🔍 For a deeper dive into using QGC, check out the [User Manual](https://docs.qgroundcontrol.com/en/) – although thanks to QGC's intuitive UI, you may not even need it!
 
 
 ---
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 6d81650fe722..5d4a9db5cda1 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -6,15 +6,6 @@
 
     <!-- %%INSERT_PERMISSIONS -->
 
-    <uses-permission android:name="android.permission.USB_PERMISSION" />
-    <!-- Need MulticastLock to receive broadcast UDP packets -->
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <!-- Needed to keep working while 'asleep' -->
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <!-- Needed for read/write to SD Card Path in AppSettings -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
     <!-- %%INSERT_FEATURES -->
 
     <uses-feature android:name="android.hardware.audio.output" android:required="false" />
@@ -39,13 +30,13 @@
         android:requestLegacyExternalStorage="true"
         android:allowBackup="true"
         android:fullBackupOnly="false"
-        android:icon="@drawable/icon"
+        android:icon="-- %%INSERT_APP_ICON%% --"
         android:usesCleartextTraffic="true"
         android:networkSecurityConfig="@xml/network_security_config">
         <!-- android:theme="@style/AppTheme" -->
 
         <activity
-            android:name="org.qtproject.qt.android.bindings.QtActivity"
+            android:name="org.mavlink.qgroundcontrol.QGCActivity"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
             android:label="-- %%INSERT_APP_NAME%% --"
             android:launchMode="singleTop"
diff --git a/android/build.gradle b/android/build.gradle
index 6e3462cfe348..d6227c3d77e9 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -49,7 +49,7 @@ android {
     ndkVersion = androidNdkVersion
 
     // Extract native libraries from the APK
-    packagingOptions.jniLibs.useLegacyPackaging = true
+    // packagingOptions.jniLibs.useLegacyPackaging = true
 
     sourceSets {
         main {
@@ -66,7 +66,7 @@ android {
 
     tasks.withType(JavaCompile) {
         options.incremental = true
-        // options.compilerArgs += ['-Xlint:deprecation']
+        options.compilerArgs += ['-Xlint:all'] // deprecation
     }
 
     buildFeatures {
diff --git a/android/res/values/arrays.xml b/android/res/values/arrays.xml
index 730f0b0b356b..ca134a36bd26 100644
--- a/android/res/values/arrays.xml
+++ b/android/res/values/arrays.xml
@@ -85,4 +85,4 @@
         <item>direct: UsbSerialPort.read()</item>
     </string-array>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 8c81b304c134..8853b779878a 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 	<string name="devices">USB Devices</string>
     <string name="CdcAcm">CDC ACM USB Device</string>
     <string name="ChromeCcd">Chrome CCD USB Device</string>
diff --git a/android/res/xml/qtprovider_paths.xml b/android/res/xml/qtprovider_paths.xml
index ae5b4b6074e7..3488bf270811 100644
--- a/android/res/xml/qtprovider_paths.xml
+++ b/android/res/xml/qtprovider_paths.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- For getFilesDirectory() -->
     <files-path name="files_path" path="/"/>
+    <!-- For getExternalStorageDirectory() -->
+    <external-path name="external_path" path="/"/>
+    <!-- For getExternalFilesDir() -->
+    <external-files-path name="external_files_path" path="/"/>
+    <!-- For getExternalCacheDir() -->
+    <external-cache-path name="external_cache_path" path="/"/>
 </paths>
diff --git a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
index c40ed7273987..aa2f5a55dc28 100644
--- a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
+++ b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
@@ -1,17 +1,26 @@
 package org.mavlink.qgroundcontrol;
 
+import java.io.File;
 import java.util.List;
 import java.lang.reflect.Method;
 
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.PowerManager;
 import android.net.wifi.WifiManager;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.WindowManager;
 import android.app.Activity;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import org.qtproject.qt.android.bindings.QtActivity;
 
@@ -119,32 +128,102 @@ private void releaseMulticastLock() {
     public static String getSDCardPath() {
         StorageManager storageManager = (StorageManager)m_instance.getSystemService(Activity.STORAGE_SERVICE);
         List<StorageVolume> volumes = storageManager.getStorageVolumes();
-        Method mMethodGetPath;
-        String path = "";
+
         for (StorageVolume vol : volumes) {
-            try {
-                mMethodGetPath = vol.getClass().getMethod("getPath");
-            } catch (NoSuchMethodException e) {
-                e.printStackTrace();
+            if (!vol.isRemovable()) {
                 continue;
             }
-            try {
-                path = (String) mMethodGetPath.invoke(vol);
-            } catch (Exception e) {
-                e.printStackTrace();
-                continue;
+
+            String path = null;
+
+            // For Android 11+ (API 30+), use the proper getDirectory() method
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                File directory = vol.getDirectory();
+                if (directory != null) {
+                    path = directory.getAbsolutePath();
+                }
+            } else {
+                // For older versions, use reflection to get the path
+                try {
+                    Method mMethodGetPath = vol.getClass().getMethod("getPath");
+                    path = (String) mMethodGetPath.invoke(vol);
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to get path via reflection", e);
+                    continue;
+                }
             }
 
-            if (vol.isRemovable() == true) {
-                Log.i(TAG, "removable sd card mounted " + path);
+            if (path != null && !path.isEmpty()) {
+                Log.i(TAG, "removable sd card mounted at " + path);
                 return path;
-            } else {
-                Log.i(TAG, "storage mounted " + path);
             }
         }
+
+        Log.w(TAG, "No removable SD card found");
         return "";
     }
 
+    /**
+     * Checks and requests storage permissions for SD card access.
+     * For Android 11+ (API 30+), this requires MANAGE_EXTERNAL_STORAGE permission.
+     *
+     * @return true if permissions are granted, false otherwise
+     */
+    public static boolean checkStoragePermissions() {
+        if (m_instance == null) {
+            Log.e(TAG, "Activity instance is null");
+            return false;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            // Android 11+ (API 30+) requires MANAGE_EXTERNAL_STORAGE for full SD card access
+            if (!Environment.isExternalStorageManager()) {
+                Log.i(TAG, "MANAGE_EXTERNAL_STORAGE not granted, requesting...");
+                try {
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+                    intent.setData(Uri.parse("package:" + m_instance.getPackageName()));
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    m_instance.startActivity(intent);
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to open storage permission settings", e);
+                    // Fallback to general settings
+                    Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    m_instance.startActivity(intent);
+                }
+                return false;
+            }
+            Log.i(TAG, "MANAGE_EXTERNAL_STORAGE already granted");
+            return true;
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // Android 6.0+ (API 23+) requires runtime permissions
+            String[] permissions = {
+                android.Manifest.permission.READ_EXTERNAL_STORAGE,
+                android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+            };
+
+            boolean allGranted = true;
+            for (String permission : permissions) {
+                if (ContextCompat.checkSelfPermission(m_instance, permission) != PackageManager.PERMISSION_GRANTED) {
+                    allGranted = false;
+                    break;
+                }
+            }
+
+            if (!allGranted) {
+                Log.i(TAG, "Storage permissions not granted, requesting...");
+                ActivityCompat.requestPermissions(m_instance, permissions, 1);
+                return false;
+            }
+
+            Log.i(TAG, "Storage permissions already granted");
+            return true;
+        } else {
+            // Below Android 6.0, permissions are granted at install time
+            return true;
+        }
+    }
+
     // Native C++ functions
     public native boolean nativeInit();
     public native void qgcLogDebug(final String message);
diff --git a/android/src/org/mavlink/qgroundcontrol/QGCUsbSerialManager.java b/android/src/org/mavlink/qgroundcontrol/QGCUsbSerialManager.java
index 76e041fd43cc..006f2dac9c27 100644
--- a/android/src/org/mavlink/qgroundcontrol/QGCUsbSerialManager.java
+++ b/android/src/org/mavlink/qgroundcontrol/QGCUsbSerialManager.java
@@ -60,6 +60,10 @@ public static void initialize(Context context) {
         }
 
         usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
+        if (usbManager == null) {
+            QGCLogger.e(TAG, "Failed to get UsbManager");
+            return;
+        }
         setupUsbPermissionIntent(context);
         registerUsbReceiver(context);
         usbSerialProber = UsbSerialProber.getDefaultProber();
@@ -413,6 +417,10 @@ private static UsbSerialPort findPortByDeviceId(final int deviceId) {
     public static String[] availableDevicesInfo() {
         // updateCurrentDrivers();
 
+        if (usbManager == null) {
+            return null;
+        }
+
         if (usbManager.getDeviceList().size() < 1) {
             return null;
         }
@@ -420,8 +428,16 @@ public static String[] availableDevicesInfo() {
         final List<String> deviceInfoList = new ArrayList<>();
 
         for (final UsbDevice device : usbManager.getDeviceList().values()) {
-            final String deviceInfo = formatDeviceInfo(device);
-            deviceInfoList.add(deviceInfo);
+            try {
+                final String deviceInfo = formatDeviceInfo(device);
+                deviceInfoList.add(deviceInfo);
+            } catch (SecurityException e) {
+                // On some integrated controllers like the Siyi UNIRC7 the usb device is used for video output.
+                // This in turn causes a security exception when trying to access device info without permission.
+                // This could also happen if the user decides not to grant permission to access the device for a real
+                // case of a usb device being plugged in.
+                // We just eat the exception in these cases to prevent log spamming.
+            }
         }
 
         return deviceInfoList.toArray(new String[0]);
diff --git a/cmake/Coverage.cmake b/cmake/Coverage.cmake
new file mode 100644
index 000000000000..891314780aea
--- /dev/null
+++ b/cmake/Coverage.cmake
@@ -0,0 +1,30 @@
+# Code coverage configuration for QGroundControl
+# Enabled via: cmake -DQGC_ENABLE_COVERAGE=ON -DCMAKE_BUILD_TYPE=Debug
+
+if(NOT QGC_ENABLE_COVERAGE)
+    return()
+endif()
+
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(WARNING "Code coverage requires Debug build, but CMAKE_BUILD_TYPE is ${CMAKE_BUILD_TYPE}")
+    return()
+endif()
+
+message(STATUS "Code coverage instrumentation enabled")
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    message(STATUS "Using GCC coverage (gcov/lcov)")
+    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE --coverage -O0 -g)
+    target_link_options(${CMAKE_PROJECT_NAME} PRIVATE --coverage)
+
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    message(STATUS "Using Clang source-based coverage (llvm-cov)")
+    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -fprofile-instr-generate -fcoverage-mapping -O0 -g)
+    target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -fprofile-instr-generate)
+
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    message(WARNING "Code coverage not supported for MSVC. Use Visual Studio Enterprise or OpenCppCoverage.")
+
+else()
+    message(WARNING "Code coverage not supported for compiler: ${CMAKE_CXX_COMPILER_ID}")
+endif()
diff --git a/cmake/CustomOptions.cmake b/cmake/CustomOptions.cmake
index cef048c40eb3..789f7a2f64ce 100644
--- a/cmake/CustomOptions.cmake
+++ b/cmake/CustomOptions.cmake
@@ -1,101 +1,172 @@
+# ============================================================================
+# QGroundControl Build Configuration Options
+# All options can be overridden by custom builds via CustomOverrides.cmake
+# ============================================================================
+
 include(CMakeDependentOption)
-# The following options can be overriden by custom builds using the CustomOverrides.cmake file
-
-# App
-set(QGC_APP_NAME "QGroundControl" CACHE STRING "App Name")
-set(QGC_APP_COPYRIGHT "Copyright (c) 2025 QGroundControl. All rights reserved." CACHE STRING "Copyright")
-set(QGC_APP_DESCRIPTION "Open Source Ground Control App" CACHE STRING "Description")
-set(QGC_ORG_NAME "QGroundControl" CACHE STRING "Org Name")
-set(QGC_ORG_DOMAIN "qgroundcontrol.com" CACHE STRING "Domain")
-set(QGC_PACKAGE_NAME "org.mavlink.qgroundcontrol" CACHE STRING "Package Name")
-set(QGC_SETTINGS_VERSION "9" CACHE STRING "Settings Version") # If you need to make an incompatible changes to stored settings, bump this version number up by 1. This will caused store settings to be cleared on next boot.
-
-# Build
+
+# ============================================================================
+# Application Metadata
+# ============================================================================
+
+set(QGC_APP_NAME "QGroundControl" CACHE STRING "Application name")
+set(QGC_APP_COPYRIGHT "Copyright (c) 2025 QGroundControl. All rights reserved." CACHE STRING "Copyright notice")
+set(QGC_APP_DESCRIPTION "Open Source Ground Control App" CACHE STRING "Application description")
+set(QGC_ORG_NAME "QGroundControl" CACHE STRING "Organization name")
+set(QGC_ORG_DOMAIN "qgroundcontrol.com" CACHE STRING "Organization domain")
+set(QGC_PACKAGE_NAME "org.mavlink.qgroundcontrol" CACHE STRING "Package identifier")
+
+# Settings version - increment to clear stored settings on next boot after incompatible changes
+set(QGC_SETTINGS_VERSION "9" CACHE STRING "Settings schema version")
+
+# ============================================================================
+# Build Configuration
+# ============================================================================
+
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
-option(QGC_STABLE_BUILD "Stable Build" OFF)
-option(QGC_USE_CACHE "Use Build Caching" ON)
-cmake_dependent_option(QGC_BUILD_TESTING "Enable testing" ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
-cmake_dependent_option(QGC_DEBUG_QML "Build QGroundControl with QML debugging/profiling support." ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
-
-# Features
-option(QGC_UTM_ADAPTER "Enable UTM Adapter" OFF)
-option(QGC_VIEWER3D "Enable Viewer3D" ON) # Qt6Quick3D_FOUND
-# option(QGC_DISABLE_MAVLINK_INSPECTOR "Disable Mavlink Inspector" OFF) # This removes QtCharts which is GPL licensed
-
-# Comms
-option(QGC_ENABLE_BLUETOOTH "Enable Bluetooth Links" ON) # Qt6Bluetooth_FOUND
-option(QGC_ZEROCONF_ENABLED "Enable ZeroConf Compatibility" OFF)
-option(QGC_AIRLINK_DISABLED "Disable AIRLink" ON)
-option(QGC_NO_SERIAL_LINK "Disable Serial Links" OFF) # NOT IOS AND Qt6SerialPort_FOUND
-
-# Video
-option(QGC_ENABLE_UVC "Enable UVC Devices" ON) # Qt6Multimedia_FOUND
-option(QGC_ENABLE_GST_VIDEOSTREAMING "Enable GStreamer Video Backend" ON)
-cmake_dependent_option(QGC_CUSTOM_GST_PACKAGE "Enable Using QGC Provided Custom GStreamer Packages" OFF "QGC_ENABLE_GST_VIDEOSTREAMING" OFF)
-option(QGC_ENABLE_QT_VIDEOSTREAMING "Enable QtMultimedia Video Backend" OFF) # Qt6Multimedia_FOUND
-
-# Joystick
-# set(SDL_GAMECONTROLLERCONFIG "0300000009120000544f000011010000,OpenTX Radiomaster TX16S Joystick,leftx:a3,lefty:a2,rightx:a0,righty:a1,platform:Linux" CACHE STRING "Custom SDL Joystick Mappings")
-
-# MAVLink
-set(QGC_MAVLINK_GIT_REPO "https://github.com/mavlink/c_library_v2.git" CACHE STRING "URL to MAVLink Git Repo")
-set(QGC_MAVLINK_GIT_TAG "19f9955598af9a9181064619bd2e3c04bd2d848a" CACHE STRING "Tag of MAVLink Git Repo")
-
-# APM
-option(QGC_DISABLE_APM_MAVLINK "Disable APM Dialect" OFF)
-option(QGC_DISABLE_APM_PLUGIN "Disable APM Plugin" OFF)
-option(QGC_DISABLE_APM_PLUGIN_FACTORY "Disable APM Plugin Factory" OFF)
-
-# PX4
-option(QGC_DISABLE_PX4_PLUGIN "Disable PX4 Plugin" OFF)
-option(QGC_DISABLE_PX4_PLUGIN_FACTORY "Disable PX4 Plugin Factory" OFF)
-
-# Android
-set(QGC_QT_ANDROID_TARGET_SDK_VERSION "36" CACHE STRING "Android Target SDK Version")
-set(QGC_ANDROID_PACKAGE_NAME "${QGC_PACKAGE_NAME}" CACHE STRING "Android Package Name")
-set(QGC_ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/android" CACHE PATH "Android Package Path")
-set(QT_ANDROID_DEPLOYMENT_TYPE "" CACHE STRING "Forces Signing if Set to Release")
-option(QT_ANDROID_SIGN_APK "Enable Signing APK" OFF)
-option(QT_ANDROID_SIGN_AAB "Enable Signing AAB" OFF)
-option(QT_USE_TARGET_ANDROID_BUILD_DIR "Use Target Android Build Dir" OFF)
-set(QGC_QT_MINIMUM_VERSION "6.8.3" CACHE STRING "Minimum Supported Qt Version")
-set(QGC_QT_MAXIMUM_VERSION "6.8.3" CACHE STRING "Maximum Supported Qt Version")
-set(QGC_QT_ANDROID_MIN_SDK_VERSION "28" CACHE STRING "Android Min SDK Version")
-
-# MacOS
-set(QGC_MACOS_PLIST_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/MacOSXBundleInfo.plist.in" CACHE FILEPATH "MacOS PList Path")
-set(QGC_MACOS_BUNDLE_ID "${QGC_PACKAGE_NAME}" CACHE STRING "MacOS Bundle ID")
-set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.icns" CACHE FILEPATH "MacOS Icon Path")
-set(QGC_MACOS_ENTITLEMENTS_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.entitlements" CACHE FILEPATH "MacOS Entitlements Path")
-option(QGC_MACOS_UNIVERSAL_BUILD "Build MacOS Universal Build (arm64;x86_64)" ON)
-
-# Linux
-option(QGC_CREATE_APPIMAGE "Build an AppImage after build" ON)
-set(QGC_APPIMAGE_ICON_256_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/QGroundControl_256.png" CACHE FILEPATH "AppImage Icon 256x256 Path")
-set(QGC_APPIMAGE_ICON_SCALABLE_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/QGroundControl.svg" CACHE FILEPATH "AppImage Icon SVG Path")
-set(QGC_APPIMAGE_APPRUN_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/AppRun" CACHE FILEPATH "AppImage AppRun Path")
-set(QGC_APPIMAGE_DESKTOP_ENTRY_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/org.mavlink.qgroundcontrol.desktop.in" CACHE FILEPATH "AppImage Desktop Entry Path")
-set(QGC_APPIMAGE_METADATA_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/org.mavlink.qgroundcontrol.appdata.xml.in" CACHE FILEPATH "AppImage Metadata Path")
-set(QGC_APPIMAGE_APPDATA_DEVELOPER "qgroundcontrol" CACHE STRING "AppImage Metadata Developer")
-
-# Windows
-set(QGC_WINDOWS_INSTALL_HEADER_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/installheader.bmp" CACHE FILEPATH "Windows Install Header Path")
-set(QGC_WINDOWS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/WindowsQGC.ico" CACHE FILEPATH "Windows Icon Path")
-set(QGC_WINDOWS_RESOURCE_FILE_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundControl.rc" CACHE FILEPATH "Windows Resource File Path")
-
-# CPM
-set(QGC_CPM_SOURCE_CACHE "" CACHE PATH "Directory to Download CPM Dependencies, Overrides CPM_SOURCE_CACHE Env Variable")
-# set(CPM_USE_NAMED_CACHE_DIRECTORIES ON CACHE BOOL "Use additional directory of package name in cache on the most nested level.")
-
-# Qt
-set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml" CACHE PATH "Install path for QML")
-set(QML_IMPORT_PATH "${QT_QML_OUTPUT_DIRECTORY}" CACHE STRING "Extra QML Import Paths")
-option(QT_SILENCE_MISSING_DEPENDENCY_TARGET_WARNING "Silence Missing Dependency Warnings" OFF)
-option(QT_ENABLE_VERBOSE_DEPLOYMENT "Verbose Deployment" OFF)
-option(QT_DEBUG_FIND_PACKAGE "Print Used Search Paths When a Package is Not Found" ON)
-option(QT_QML_GENERATE_QMLLS_INI "https://doc.qt.io/qt-6/cmake-variable-qt-qml-generate-qmlls-ini.html" ON)
+option(QGC_STABLE_BUILD "Stable release build (disables daily build features)" OFF)
+option(QGC_USE_CACHE "Enable compiler caching (ccache/sccache)" ON)
+option(QGC_BUILD_INSTALLER "Build platform installers/packages" ON)
+
+# Debug-dependent options
+cmake_dependent_option(QGC_BUILD_TESTING "Enable unit tests" ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
+cmake_dependent_option(QGC_DEBUG_QML "Enable QML debugging/profiling" ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
+cmake_dependent_option(QGC_ENABLE_COVERAGE "Enable code coverage instrumentation" OFF "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
+
+# ============================================================================
+# Feature Flags
+# ============================================================================
+
+option(QGC_UTM_ADAPTER "Enable UTM (Unmanned Traffic Management) Adapter" OFF)
+option(QGC_VIEWER3D "Enable 3D Viewer (requires Qt Quick 3D)" ON)
+
+# MAVLink Inspector is disabled by default due to GPL licensing of QtCharts
+# option(QGC_DISABLE_MAVLINK_INSPECTOR "Disable MAVLink Inspector" OFF)
+
+# ============================================================================
+# Communication Options
+# ============================================================================
+
+option(QGC_ENABLE_BLUETOOTH "Enable Bluetooth communication links" ON)
+option(QGC_ZEROCONF_ENABLED "Enable ZeroConf/Bonjour discovery" OFF)
+option(QGC_AIRLINK_DISABLED "Disable AIRLink support" ON)
+option(QGC_NO_SERIAL_LINK "Disable serial port communication" OFF)
+
+# ============================================================================
+# Video Streaming Options
+# ============================================================================
+
+option(QGC_ENABLE_UVC "Enable UVC (USB Video Class) device support" ON)
+option(QGC_ENABLE_GST_VIDEOSTREAMING "Enable GStreamer video backend" ON)
+cmake_dependent_option(QGC_CUSTOM_GST_PACKAGE "Use QGC-provided GStreamer packages" OFF "QGC_ENABLE_GST_VIDEOSTREAMING" OFF)
+option(QGC_ENABLE_QT_VIDEOSTREAMING "Enable QtMultimedia video backend" OFF)
+
+# ============================================================================
+# Joystick/Input Configuration
+# ============================================================================
+
+# Example custom SDL game controller mapping:
+# set(SDL_GAMECONTROLLERCONFIG "0300000009120000544f000011010000,OpenTX Radiomaster TX16S,leftx:a3,lefty:a2,rightx:a0,righty:a1,platform:Linux" CACHE STRING "Custom SDL mappings")
+
+# ============================================================================
+# MAVLink Configuration
+# ============================================================================
+
+set(QGC_MAVLINK_GIT_REPO "https://github.com/mavlink/mavlink.git" CACHE STRING "MAVLink repository URL")
+set(QGC_MAVLINK_GIT_TAG "dd17c1a65de7b9ad8dd6e3491a8690c0d0b27ba1" CACHE STRING "MAVLink repository commit/tag")
+set(QGC_MAVLINK_DIALECT "all" CACHE STRING "MAVLink dialect")
+set(QGC_MAVLINK_VERSION "2.0" CACHE STRING "MAVLink protocol version")
+
+# ============================================================================
+# Autopilot Plugin Configuration
+# ============================================================================
+
+# ArduPilot (APM) Plugin
+option(QGC_DISABLE_APM_MAVLINK "Disable ArduPilot MAVLink dialect" OFF)
+option(QGC_DISABLE_APM_PLUGIN "Disable ArduPilot plugin" OFF)
+option(QGC_DISABLE_APM_PLUGIN_FACTORY "Disable ArduPilot plugin factory" OFF)
+
+# PX4 Plugin
+option(QGC_DISABLE_PX4_PLUGIN "Disable PX4 plugin" OFF)
+option(QGC_DISABLE_PX4_PLUGIN_FACTORY "Disable PX4 plugin factory" OFF)
+
+# ============================================================================
+# Platform-Specific Configuration
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Android Platform
+# ----------------------------------------------------------------------------
+set(QGC_QT_ANDROID_COMPILE_SDK_VERSION "35" CACHE STRING "Android compile SDK version")
+set(QGC_QT_ANDROID_TARGET_SDK_VERSION "35" CACHE STRING "Android target SDK version")
+set(QGC_QT_ANDROID_MIN_SDK_VERSION "28" CACHE STRING "Android minimum SDK version")
+set(QGC_ANDROID_PACKAGE_NAME "${QGC_PACKAGE_NAME}" CACHE STRING "Android package identifier")
+set(QGC_ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/android" CACHE PATH "Android package source directory")
+set(QT_ANDROID_DEPLOYMENT_TYPE "" CACHE STRING "Android deployment type (empty or Release)")
+option(QT_ANDROID_SIGN_APK "Enable APK signing" OFF)
+option(QT_ANDROID_SIGN_AAB "Enable AAB signing" OFF)
+option(QT_USE_TARGET_ANDROID_BUILD_DIR "Use target-specific Android build directory" OFF)
+
+# ----------------------------------------------------------------------------
+# macOS Platform
+# ----------------------------------------------------------------------------
+set(QGC_MACOS_PLIST_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/MacOSXBundleInfo.plist.in" CACHE FILEPATH "macOS Info.plist template path")
+set(QGC_MACOS_BUNDLE_ID "${QGC_PACKAGE_NAME}" CACHE STRING "macOS bundle identifier")
+set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.icns" CACHE FILEPATH "macOS application icon path")
+set(QGC_MACOS_ENTITLEMENTS_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.entitlements" CACHE FILEPATH "macOS entitlements file path")
+option(QGC_MACOS_UNIVERSAL_BUILD "Build macOS universal binary (x86_64h + arm64)" ON)
+
+# ----------------------------------------------------------------------------
+# Linux Platform
+# ----------------------------------------------------------------------------
+option(QGC_CREATE_APPIMAGE "Create AppImage package after build" ON)
+set(QGC_APPIMAGE_ICON_256_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/QGroundControl_256.png" CACHE FILEPATH "AppImage 256x256 icon path")
+set(QGC_APPIMAGE_ICON_SCALABLE_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/QGroundControl.svg" CACHE FILEPATH "AppImage SVG icon path")
+set(QGC_APPIMAGE_APPRUN_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/AppRun" CACHE FILEPATH "AppImage AppRun script path")
+set(QGC_APPIMAGE_DESKTOP_ENTRY_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/org.mavlink.qgroundcontrol.desktop.in" CACHE FILEPATH "AppImage desktop entry path")
+set(QGC_APPIMAGE_METADATA_PATH "${CMAKE_SOURCE_DIR}/deploy/linux/org.mavlink.qgroundcontrol.appdata.xml.in" CACHE FILEPATH "AppImage metadata path")
+set(QGC_APPIMAGE_APPDATA_DEVELOPER "qgroundcontrol" CACHE STRING "AppImage developer name")
+
+# ----------------------------------------------------------------------------
+# Windows Platform
+# ----------------------------------------------------------------------------
+set(QGC_WINDOWS_INSTALL_HEADER_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/installheader.bmp" CACHE FILEPATH "Windows installer header image")
+set(QGC_WINDOWS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/WindowsQGC.ico" CACHE FILEPATH "Windows application icon")
+set(QGC_WINDOWS_RESOURCE_FILE_PATH "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundControl.rc" CACHE FILEPATH "Windows resource file")
+
+# ============================================================================
+# Qt Configuration
+# ============================================================================
+
+set(QGC_QT_MINIMUM_VERSION "6.10.0" CACHE STRING "Minimum supported Qt version")
+set(QGC_QT_MAXIMUM_VERSION "6.10.1" CACHE STRING "Maximum supported Qt version")
+
+set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml" CACHE PATH "QML output directory")
+set(QML_IMPORT_PATH "${QT_QML_OUTPUT_DIRECTORY}" CACHE STRING "Additional QML import paths")
+
+option(QT_SILENCE_MISSING_DEPENDENCY_TARGET_WARNING "Silence missing dependency warnings" OFF)
+option(QT_ENABLE_VERBOSE_DEPLOYMENT "Enable verbose deployment output" OFF)
+option(QT_DEBUG_FIND_PACKAGE "Print search paths when package not found" ON)
+option(QT_QML_GENERATE_QMLLS_INI "Generate qmlls.ini for QML language server" ON)
+option(QGC_ENABLE_QMLLINT "Enable automatic QML linting during build" OFF)
+
+set(QGC_QT_DISABLE_DEPRECATED_UP_TO "0x061000" CACHE STRING "Disable Qt APIs deprecated before this version")
+set(QGC_QT_ENABLE_STRICT_MODE_UP_TO "0x061000" CACHE STRING "Enable strict Qt API mode up to this version")
+
+# Debug environment variables (uncomment to enable)
 # set(ENV{QT_DEBUG_PLUGINS} "1")
 # set(ENV{QML_IMPORT_TRACE} "1")
 
-# CMAKE
-# option(CMAKE_FIND_DEBUG_MODE "Print Used Search Paths When Finding a Package" OFF)
+# ============================================================================
+# CMake Package Manager (CPM)
+# ============================================================================
+
+# Uncomment to use named cache directories for better organization
+# set(CPM_USE_NAMED_CACHE_DIRECTORIES ON CACHE BOOL "Use package name subdirectories in CPM cache")
+
+# ============================================================================
+# CMake Configuration
+# ============================================================================
+
+# Uncomment for verbose package finding
+# option(CMAKE_FIND_DEBUG_MODE "Print search paths when finding packages" OFF)
diff --git a/cmake/Helpers.cmake b/cmake/Helpers.cmake
index 12433793e1bb..92b64621cf39 100644
--- a/cmake/Helpers.cmake
+++ b/cmake/Helpers.cmake
@@ -1,5 +1,23 @@
+# ----------------------------------------------------------------------------
+# QGroundControl CMake Helper Functions
+# ----------------------------------------------------------------------------
+
+if(QGC_HELPERS_INCLUDED)
+    return()
+endif()
+set(QGC_HELPERS_INCLUDED TRUE)
+
+# ----------------------------------------------------------------------------
+# qgc_set_qt_resource_alias
+# Sets Qt resource aliases for files based on their filenames
+# Args: List of resource files
+# ----------------------------------------------------------------------------
 function(qgc_set_qt_resource_alias)
     foreach(resource_file IN LISTS ARGN)
+        if(NOT EXISTS "${resource_file}")
+            message(WARNING "QGC: Resource file does not exist: ${resource_file}")
+            continue()
+        endif()
         get_filename_component(alias "${resource_file}" NAME)
         set_source_files_properties("${resource_file}"
             PROPERTIES
@@ -8,12 +26,17 @@ function(qgc_set_qt_resource_alias)
     endforeach()
 endfunction()
 
+# ----------------------------------------------------------------------------
+# qgc_config_caching
+# Configures compiler caching using ccache or sccache if available
+# ----------------------------------------------------------------------------
 function(qgc_config_caching)
     function(_qgc_verify_cache_tool _ok _path)
         execute_process(
             COMMAND "${_path}" --version
             RESULT_VARIABLE _res
-            OUTPUT_QUIET ERROR_QUIET
+            OUTPUT_QUIET
+            ERROR_QUIET
         )
         if(NOT _res EQUAL 0)
             set(${_ok} FALSE PARENT_SCOPE)
@@ -21,18 +44,20 @@ function(qgc_config_caching)
     endfunction()
 
     find_program(QGC_CACHE_PROGRAM
-                 NAMES ccache sccache
-                 VALIDATOR _qgc_verify_cache_tool)
+        NAMES ccache sccache
+        VALIDATOR _qgc_verify_cache_tool
+    )
+
     if(QGC_CACHE_PROGRAM)
         get_filename_component(_cache_tool "${QGC_CACHE_PROGRAM}" NAME_WE)
-        message(STATUS "QGC: using ${_cache_tool} (${QGC_CACHE_PROGRAM})")
+        message(STATUS "QGC: Using ${_cache_tool} (${QGC_CACHE_PROGRAM})")
         string(TOLOWER "${_cache_tool}" _cache_tool)
 
         if(_cache_tool STREQUAL "ccache")
             # set(ENV{CCACHE_CONFIGPATH} "${CMAKE_SOURCE_DIR}/tools/ccache.conf")
             # set(ENV{CCACHE_DIR} "${CMAKE_SOURCE_DIR}/.ccache")
             set(ENV{CCACHE_BASEDIR} "${CMAKE_SOURCE_DIR}")
-            set(ENV{CCACHE_COMPRESSLEVEL "5")
+            set(ENV{CCACHE_COMPRESSLEVEL} "5")
             set(ENV{CCACHE_SLOPPINESS} "pch_defines,time_macros,include_file_mtime,include_file_ctime")
             # set(ENV{CCACHE_NOHASHDIR} "true")
             if(APPLE)
@@ -55,59 +80,76 @@ function(qgc_config_caching)
             return()
         endif()
 
-        set(CMAKE_C_COMPILER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "C compiler launcher")
-        set(CMAKE_CXX_COMPILER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "CXX compiler launcher")
-        # set(CMAKE_C_LINKER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "C linker cache used")
-        # set(CMAKE_CXX_LINKER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "CXX linker cache used")
+        set(CMAKE_C_COMPILER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "C compiler launcher" FORCE)
+        set(CMAKE_CXX_COMPILER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "CXX compiler launcher" FORCE)
+        # Linker launchers not currently used but available if needed
+        # set(CMAKE_C_LINKER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "C linker cache")
+        # set(CMAKE_CXX_LINKER_LAUNCHER "${QGC_CACHE_PROGRAM}" CACHE STRING "CXX linker cache")
 
         if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             add_compile_options(-Xclang -fno-pch-timestamp)
         endif()
     else()
-        message(WARNING "QGC: no ccache/sccache found – building without a compiler cache")
+        message(WARNING "QGC: No ccache/sccache found - building without a compiler cache")
     endif()
 endfunction()
 
+# ----------------------------------------------------------------------------
+# qgc_set_linker
+# Attempts to use a faster linker (mold, lld, or gold) if available
+# Falls back to the system default linker
+# ----------------------------------------------------------------------------
 function(qgc_set_linker)
     include(CheckLinkerFlag)
 
+    # Try linkers in order of preference: mold > lld > gold
     foreach(_ld mold lld gold)
         set(_flag "LINKER:-fuse-ld=${_ld}")
         check_linker_flag(CXX "${_flag}" HAVE_LD_${_ld})
 
         if(HAVE_LD_${_ld})
             add_link_options("${_flag}")
-            set(QGC_LINKER "${_ld}")
-            message(STATUS "QGC: using ${_ld} linker (flag ${_flag})")
-            break()
+            set(QGC_LINKER "${_ld}" PARENT_SCOPE)
+            message(STATUS "QGC: Using ${_ld} linker")
+            return()
         endif()
     endforeach()
 
-    if(NOT DEFINED QGC_LINKER)
-        message(WARNING "QGC: no mold / lld / gold found – falling back to default linker")
-    endif()
+    message(STATUS "QGC: No alternative linker (mold/lld/gold) found - using system default")
 endfunction()
 
+# ----------------------------------------------------------------------------
+# qgc_enable_pie
+# Enables Position Independent Executables (PIE) for improved security
+# ----------------------------------------------------------------------------
 function(qgc_enable_pie)
     include(CheckPIESupported)
-    check_pie_supported(OUTPUT_VARIABLE _output)
+    check_pie_supported(OUTPUT_VARIABLE _output LANGUAGES C CXX)
+
     if(CMAKE_C_LINK_PIE_SUPPORTED)
-        set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-        message(STATUS "QGC: PIE is enabled")
+        set(CMAKE_POSITION_INDEPENDENT_CODE ON PARENT_SCOPE)
+        message(STATUS "QGC: PIE enabled")
     else()
-        message(WARNING "QGC: PIE is not supported at link time: ${_output}")
+        message(WARNING "QGC: PIE not supported - ${_output}")
     endif()
 endfunction()
 
+# ----------------------------------------------------------------------------
+# qgc_enable_ipo
+# Enables Interprocedural Optimization (IPO/LTO) for Release builds
+# ----------------------------------------------------------------------------
 function(qgc_enable_ipo)
     if(CMAKE_BUILD_TYPE STREQUAL "Release")
         include(CheckIPOSupported)
-        check_ipo_supported(RESULT _result OUTPUT _output)
+        check_ipo_supported(RESULT _result OUTPUT _output LANGUAGES C CXX)
+
         if(_result)
-            set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-            message(STATUS "QGC: LTO is enabled")
+            set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE PARENT_SCOPE)
+            message(STATUS "QGC: IPO/LTO enabled for Release build")
         else()
-            message(WARNING "QGC: IPO is not supported: ${_output}")
+            message(WARNING "QGC: IPO/LTO not supported - ${_output}")
         endif()
+    else()
+        message(STATUS "QGC: IPO/LTO disabled for ${CMAKE_BUILD_TYPE} build")
     endif()
 endfunction()
diff --git a/cmake/PrintSummary.cmake b/cmake/PrintSummary.cmake
index 02d0803dfdad..11680c03e716 100644
--- a/cmake/PrintSummary.cmake
+++ b/cmake/PrintSummary.cmake
@@ -1,11 +1,20 @@
+# ============================================================================
+# QGroundControl Build Configuration Summary
+# Prints a comprehensive summary of the build configuration
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Configuration Timestamp
 # ----------------------------------------------------------------------------
-# Print a timestamp for reproducibility
 string(TIMESTAMP QGC_CONFIGURE_TIME "%Y-%m-%d %H:%M:%S %Z")
-message(STATUS "QGroundControl configuration generated at ${QGC_CONFIGURE_TIME}")
+message(STATUS "")
+message(STATUS "==================================================================")
+message(STATUS "QGroundControl Configuration Summary")
+message(STATUS "Generated at: ${QGC_CONFIGURE_TIME}")
 message(STATUS "==================================================================")
 
 # ----------------------------------------------------------------------------
-# Macro for printing ON/OFF flags
+# Helper Macro for ON/OFF Options
 # ----------------------------------------------------------------------------
 macro(OptionOutput _label)
     if(${ARGN})
@@ -13,117 +22,121 @@ macro(OptionOutput _label)
     else()
         set(_val "OFF")
     endif()
-    message(STATUS "${_label}: ${_val}")
+    message(STATUS "  ${_label}: ${_val}")
 endmacro()
 
 # ----------------------------------------------------------------------------
-# Imported CMake variables
+# CMake System Information
 # ----------------------------------------------------------------------------
-message(STATUS "-- CMake System -----------------------------------------------------")
-message(STATUS "Install prefix:       ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "Generator:            ${CMAKE_GENERATOR} ${CMAKE_GENERATOR_PLATFORM} ${CMAKE_GENERATOR_TOOLSET}")
-message(STATUS "Build type:           ${CMAKE_BUILD_TYPE}")
-message(STATUS "Host system:          ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION}")
-message(STATUS "Target system:        ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}")
-message(STATUS "CMake version:        ${CMAKE_VERSION}")
-message(STATUS "Source directory:     ${CMAKE_SOURCE_DIR}")
-message(STATUS "Toolchain file:       ${CMAKE_TOOLCHAIN_FILE}")
-message(STATUS "Prefix path:          ${CMAKE_PREFIX_PATH}")
-message(STATUS "------------------------------------------------------------------")
+message(STATUS "")
+message(STATUS "CMake System:")
+message(STATUS "  CMake version:      ${CMAKE_VERSION}")
+message(STATUS "  Generator:          ${CMAKE_GENERATOR}")
+message(STATUS "  Build type:         ${CMAKE_BUILD_TYPE}")
+message(STATUS "  Source directory:   ${CMAKE_SOURCE_DIR}")
+message(STATUS "  Install prefix:     ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "  Host system:        ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION}")
+message(STATUS "  Target system:      ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}")
+if(CMAKE_TOOLCHAIN_FILE)
+    message(STATUS "  Toolchain file:     ${CMAKE_TOOLCHAIN_FILE}")
+endif()
+if(CMAKE_PREFIX_PATH)
+    message(STATUS "  Prefix path:        ${CMAKE_PREFIX_PATH}")
+endif()
 
-message(STATUS "-- Compiler & Linker -----------------------------------------------")
-message(STATUS "C++ compiler:         ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) v${CMAKE_CXX_COMPILER_VERSION}")
-message(STATUS "C++ standard:         C++${CMAKE_CXX_STANDARD}")
-message(STATUS "Compiler flags:       ${CMAKE_CXX_FLAGS}")
-message(STATUS "  Debug:              ${CMAKE_CXX_FLAGS_DEBUG}")
-message(STATUS "  Release:            ${CMAKE_CXX_FLAGS_RELEASE}")
-message(STATUS "Linker flags:         ${CMAKE_EXE_LINKER_FLAGS}")
-message(STATUS "  Debug:              ${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
-message(STATUS "  Release:            ${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
-message(STATUS "------------------------------------------------------------------")
+message(STATUS "")
+message(STATUS "Compiler & Linker:")
+message(STATUS "  C++ compiler:       ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
+message(STATUS "  C++ standard:       C++${CMAKE_CXX_STANDARD}")
+if(CMAKE_CXX_FLAGS)
+    message(STATUS "  Compiler flags:     ${CMAKE_CXX_FLAGS}")
+endif()
+if(CMAKE_EXE_LINKER_FLAGS)
+    message(STATUS "  Linker flags:       ${CMAKE_EXE_LINKER_FLAGS}")
+endif()
 
 # ----------------------------------------------------------------------------
-# App metadata
+# Application Metadata
 # ----------------------------------------------------------------------------
-message(STATUS "-- Application ------------------------------------------------------")
-message(STATUS "App Name:             ${QGC_APP_NAME}")
-message(STATUS "Description:          ${QGC_APP_DESCRIPTION}")
-message(STATUS "Copyright:            ${QGC_APP_COPYRIGHT}")
-message(STATUS "Organization:         ${QGC_ORG_NAME} (${QGC_ORG_DOMAIN})")
-message(STATUS "Package name:         ${QGC_PACKAGE_NAME}")
-message(STATUS "Settings version:     ${QGC_SETTINGS_VERSION}")
-message(STATUS "------------------------------------------------------------------")
+message(STATUS "")
+message(STATUS "Application:")
+message(STATUS "  Name:               ${QGC_APP_NAME}")
+message(STATUS "  Version:            ${QGC_APP_VERSION_STR}")
+message(STATUS "  Description:        ${QGC_APP_DESCRIPTION}")
+message(STATUS "  Organization:       ${QGC_ORG_NAME} (${QGC_ORG_DOMAIN})")
+message(STATUS "  Package name:       ${QGC_PACKAGE_NAME}")
+message(STATUS "  Settings version:   ${QGC_SETTINGS_VERSION}")
 
 # ----------------------------------------------------------------------------
-# Option flags
+# Build & Feature Flags
 # ----------------------------------------------------------------------------
-message(STATUS "-- Build & Feature Flags -------------------------------------------")
-OptionOutput("Build shared libraries"                 BUILD_SHARED_LIBS)
-OptionOutput("Stable build"                           QGC_STABLE_BUILD)
-OptionOutput("Use build caching"                      QGC_USE_CACHE)
-OptionOutput("Enable testing"                         QGC_BUILD_TESTING)
-OptionOutput("Enable QML debugging"                   QGC_DEBUG_QML)
-OptionOutput("Enable Herelink support"                QGC_ENABLE_HERELINK)
-OptionOutput("Enable UTM Adapter"                     QGC_UTM_ADAPTER)
-OptionOutput("Enable 3D Viewer"                       QGC_VIEWER3D)
-OptionOutput("Enable Bluetooth links"                 QGC_ENABLE_BLUETOOTH)
-OptionOutput("Enable ZeroConf compatibility"          QGC_ZEROCONF_ENABLED)
-OptionOutput("Disable AIRLink"                        QGC_AIRLINK_DISABLED)
-OptionOutput("Disable serial links"                   QGC_NO_SERIAL_LINK)
-OptionOutput("Enable UVC devices"                     QGC_ENABLE_UVC)
-OptionOutput("Enable GStreamer video"                 QGC_ENABLE_GST_VIDEOSTREAMING)
-OptionOutput("Enable Qt video backend"                QGC_ENABLE_QT_VIDEOSTREAMING)
-OptionOutput("Disable APM MAVLink dialect"            QGC_DISABLE_APM_MAVLINK)
-OptionOutput("Disable APM plugin"                     QGC_DISABLE_APM_PLUGIN)
-OptionOutput("Disable APM plugin factory"             QGC_DISABLE_APM_PLUGIN_FACTORY)
-OptionOutput("Disable PX4 plugin"                     QGC_DISABLE_PX4_PLUGIN)
-OptionOutput("Disable PX4 plugin factory"             QGC_DISABLE_PX4_PLUGIN_FACTORY)
-message(STATUS "------------------------------------------------------------------")
+message(STATUS "")
+message(STATUS "Build & Feature Flags:")
+OptionOutput("Stable build                          " QGC_STABLE_BUILD)
+OptionOutput("Use build caching                     " QGC_USE_CACHE)
+OptionOutput("Enable testing                        " QGC_BUILD_TESTING)
+OptionOutput("Enable QML debugging                  " QGC_DEBUG_QML)
+OptionOutput("Enable QML linting                    " QGC_ENABLE_QMLLINT)
+OptionOutput("Enable 3D Viewer                      " QGC_VIEWER3D)
+OptionOutput("Enable Bluetooth links                " QGC_ENABLE_BLUETOOTH)
+OptionOutput("Enable ZeroConf compatibility         " QGC_ZEROCONF_ENABLED)
+OptionOutput("Disable AIRLink                       " QGC_AIRLINK_DISABLED)
+OptionOutput("Disable serial links                  " QGC_NO_SERIAL_LINK)
+OptionOutput("Enable UVC devices                    " QGC_ENABLE_UVC)
+OptionOutput("Enable GStreamer video                " QGC_ENABLE_GST_VIDEOSTREAMING)
+OptionOutput("Enable Qt video backend               " QGC_ENABLE_QT_VIDEOSTREAMING)
+OptionOutput("Disable APM MAVLink dialect           " QGC_DISABLE_APM_MAVLINK)
+OptionOutput("Disable APM plugin                    " QGC_DISABLE_APM_PLUGIN)
+OptionOutput("Disable PX4 plugin                    " QGC_DISABLE_PX4_PLUGIN)
 
 # ----------------------------------------------------------------------------
-# Repository & dependency settings
+# External Dependencies
 # ----------------------------------------------------------------------------
-message(STATUS "-- External Dependencies -------------------------------------------")
-message(STATUS "MAVLink repo URL:     ${QGC_MAVLINK_GIT_REPO}")
-message(STATUS "MAVLink repo tag:     ${QGC_MAVLINK_GIT_TAG}")
-message(STATUS "CPM cache directory:  ${QGC_CPM_SOURCE_CACHE}")
-message(STATUS "QML output directory: ${QT_QML_OUTPUT_DIRECTORY}")
-message(STATUS "------------------------------------------------------------------")
+message(STATUS "")
+message(STATUS "External Dependencies:")
+message(STATUS "  MAVLink repo:       ${QGC_MAVLINK_GIT_REPO}")
+message(STATUS "  MAVLink tag:        ${QGC_MAVLINK_GIT_TAG}")
+message(STATUS "  CPM cache:          ${CPM_SOURCE_CACHE}")
+message(STATUS "  QML output dir:     ${QT_QML_OUTPUT_DIRECTORY}")
 
 # ----------------------------------------------------------------------------
-# Platform-specific settings
+# Platform-Specific Settings
 # ----------------------------------------------------------------------------
 if(ANDROID)
-  message(STATUS "-- Android ---------------------------------------------------------")
-  message(STATUS "Target SDK:           ${QGC_QT_ANDROID_TARGET_SDK_VERSION}")
-  message(STATUS "Package source dir:   ${QGC_ANDROID_PACKAGE_SOURCE_DIR}")
-  message(STATUS "APK signing:          ${QT_ANDROID_SIGN_APK} / AAB signing: ${QT_ANDROID_SIGN_AAB}")
-  message(STATUS "Use target build dir: ${QT_USE_TARGET_ANDROID_BUILD_DIR}")
-  message(STATUS "NDK host system:      ${ANDROID_NDK_HOST_SYSTEM_NAME}")
-  message(STATUS "SDK root:             ${ANDROID_SDK_ROOT}")
-  message(STATUS "Deployment type:      ${QT_ANDROID_DEPLOYMENT_TYPE}")
-  message(STATUS "------------------------------------------------------------------")
+  message(STATUS "")
+  message(STATUS "Android Platform:")
+  message(STATUS "  Target SDK:         ${QGC_QT_ANDROID_TARGET_SDK_VERSION}")
+  message(STATUS "  Min SDK:            ${QGC_QT_ANDROID_MIN_SDK_VERSION}")
+  message(STATUS "  Package:            ${QGC_ANDROID_PACKAGE_NAME}")
+  message(STATUS "  APK signing:        ${QT_ANDROID_SIGN_APK}")
+  message(STATUS "  AAB signing:        ${QT_ANDROID_SIGN_AAB}")
 endif()
 
 if(MACOS)
-  message(STATUS "-- macOS -----------------------------------------------------------")
-  message(STATUS "Bundle ID:            ${QGC_MACOS_BUNDLE_ID}")
-  message(STATUS "Info plist path:      ${QGC_MACOS_PLIST_PATH}")
-  message(STATUS "Icon directory:       ${QGC_MACOS_ICON_PATH}")
-  message(STATUS "Entitlements path:    ${QGC_MACOS_ENTITLEMENTS_PATH}")
-  message(STATUS "------------------------------------------------------------------")
+  message(STATUS "")
+  message(STATUS "macOS Platform:")
+  message(STATUS "  Bundle ID:          ${QGC_MACOS_BUNDLE_ID}")
+  message(STATUS "  Deployment target:  ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+  if(QGC_MACOS_UNIVERSAL_BUILD)
+    message(STATUS "  Architectures:      ${CMAKE_OSX_ARCHITECTURES}")
+  endif()
 endif()
 
-if(WIN32)
-  message(STATUS "-- Windows ---------------------------------------------------------")
-  message(STATUS "Install header bmp:   ${QGC_WINDOWS_INSTALL_HEADER_PATH}")
-  message(STATUS "Icon path:            ${QGC_WINDOWS_ICON_PATH}")
-  message(STATUS "RC resource file:     ${QGC_WINDOWS_RESOURCE_FILE_PATH}")
-  message(STATUS "------------------------------------------------------------------")
+if(WIN32 AND NOT ANDROID)
+  message(STATUS "")
+  message(STATUS "Windows Platform:")
+  message(STATUS "  Icon:               ${QGC_WINDOWS_ICON_PATH}")
+  message(STATUS "  Resource file:      ${QGC_WINDOWS_RESOURCE_FILE_PATH}")
 endif()
 
-if(LINUX)
-  message(STATUS "-- Linux -----------------------------------------------------------")
-  message(STATUS "AppImage icon path:   ${QGC_APPIMAGE_ICON_PATH}")
-  message(STATUS "------------------------------------------------------------------")
+if(LINUX AND NOT ANDROID)
+  message(STATUS "")
+  message(STATUS "Linux Platform:")
+  if(QGC_CREATE_APPIMAGE)
+    message(STATUS "  AppImage:           Enabled")
+  endif()
 endif()
+
+message(STATUS "")
+message(STATUS "==================================================================")
+message(STATUS "")
diff --git a/cmake/Toolchain.cmake b/cmake/Toolchain.cmake
index c47ebcc96f42..47281e700804 100644
--- a/cmake/Toolchain.cmake
+++ b/cmake/Toolchain.cmake
@@ -1,60 +1,104 @@
+# ----------------------------------------------------------------------------
+# QGroundControl Toolchain Configuration
+# Sets compiler, linker, and build tool settings
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# C++ Standard Requirements
+# ----------------------------------------------------------------------------
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+# ----------------------------------------------------------------------------
+# Qt-specific Automation
+# ----------------------------------------------------------------------------
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
+# ----------------------------------------------------------------------------
+# Build Configuration
+# ----------------------------------------------------------------------------
 set(CMAKE_COLOR_DIAGNOSTICS ON)
-# set(CMAKE_EXPORT_BUILD_DATABASE ON) # Causes Configuration Error?
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Conflict with CMAKE_UNITY_BUILD
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+# Unity builds can improve compile times but may cause issues
+# Enable with caution - conflicts with CMAKE_EXPORT_COMPILE_COMMANDS
+# set(CMAKE_EXPORT_BUILD_DATABASE ON)
 # set(CMAKE_UNITY_BUILD ON)
 # set(CMAKE_UNITY_BUILD_BATCH_SIZE 8)
 
+# ----------------------------------------------------------------------------
+# Security & Optimization Settings
+# ----------------------------------------------------------------------------
+
 qgc_enable_pie()
-qgc_enable_ipo()
+if(NOT LINUX)
+    qgc_enable_ipo()
+endif()
 
+# ----------------------------------------------------------------------------
+# Compiler & Linker Optimizations
+# ----------------------------------------------------------------------------
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    # Use faster alternative linkers on non-Apple platforms
     if(NOT APPLE)
         qgc_set_linker()
     endif()
-    add_link_options("$<$<CONFIG:Release>:-flto=thin>")
+
+    # Link-Time Optimization (LTO) for Release builds
+    # Thin LTO provides faster incremental builds (Clang-specific)
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        add_link_options("$<$<CONFIG:Release>:-flto=thin>")
+    else()
+        # GCC uses standard LTO (handled by qgc_enable_ipo above)
+    endif()
 elseif(MSVC)
+    # MSVC-specific optimizations
     add_link_options("$<$<CONFIG:Release>:/LTCG:INCREMENTAL>")
     set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug>:Embedded>")
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 endif()
 
+# ----------------------------------------------------------------------------
+# Install Configuration
+# ----------------------------------------------------------------------------
+
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     if(LINUX)
-        # set(ENV{DESTDIR} "${CMAKE_BINARY_DIR}/staging")
+        # Linux uses AppDir structure for AppImage packaging
         set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/AppDir/usr" CACHE PATH "Install path prefix for AppImage" FORCE)
     else()
+        # Other platforms use staging directory
         set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/staging" CACHE PATH "Install path prefix" FORCE)
     endif()
 endif()
 
+# ----------------------------------------------------------------------------
+# Cross-Compilation Configuration
+# ----------------------------------------------------------------------------
 if(CMAKE_CROSSCOMPILING)
-    if(NOT IS_DIRECTORY ${QT_HOST_PATH})
-        message(FATAL_ERROR "You need to set QT_HOST_PATH to cross compile Qt.")
+    if(NOT DEFINED QT_HOST_PATH OR QT_HOST_PATH STREQUAL "")
+        message(FATAL_ERROR "Cross-compilation requires QT_HOST_PATH to be defined and set to a valid Qt host installation path")
+    endif()
+
+    if(NOT IS_DIRECTORY "${QT_HOST_PATH}")
+        message(FATAL_ERROR "Cross-compilation QT_HOST_PATH is not a valid directory: ${QT_HOST_PATH}")
     endif()
 
     if(ANDROID)
+        # Android cross-compilation: search both target and host paths
         set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
         set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
         set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
     endif()
 endif()
 
+# ----------------------------------------------------------------------------
+# Platform Detection Helpers
+# ----------------------------------------------------------------------------
 if(APPLE AND NOT IOS)
     set(MACOS TRUE)
-
-    # if(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "arm64")
-    # if(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "x86_64")
-    # if("${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64;x86_64" OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES "x86_64;arm64")
-    #     set(QGC_MACOS_UNIVERSAL_BUILD ON)
-    # endif()
 endif()
diff --git a/cmake/find-modules/FindGStreamer.cmake b/cmake/find-modules/FindGStreamer.cmake
index 3feb56093ebf..af3a1c208231 100644
--- a/cmake/find-modules/FindGStreamer.cmake
+++ b/cmake/find-modules/FindGStreamer.cmake
@@ -1,3 +1,16 @@
+# ============================================================================
+# FindGStreamer.cmake
+# CMake find module for GStreamer multimedia framework
+#
+# Handles multiple platforms: Windows, Linux, macOS, Android, iOS
+# Supports both static and dynamic linking
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Default Configuration
+# ----------------------------------------------------------------------------
+
+# Set default version based on platform
 if(NOT DEFINED GStreamer_FIND_VERSION)
     if(LINUX)
         set(GStreamer_FIND_VERSION 1.20)
@@ -6,6 +19,7 @@ if(NOT DEFINED GStreamer_FIND_VERSION)
     endif()
 endif()
 
+# Determine GStreamer root directory from various environment variables
 if(NOT DEFINED GStreamer_ROOT_DIR)
     if(DEFINED GSTREAMER_ROOT)
         set(GStreamer_ROOT_DIR ${GSTREAMER_ROOT})
@@ -14,10 +28,11 @@ if(NOT DEFINED GStreamer_ROOT_DIR)
     endif()
 
     if(DEFINED GStreamer_ROOT_DIR AND NOT EXISTS "${GStreamer_ROOT_DIR}")
-        message(STATUS "The user provided GStreamer directory does not exist: ${GStreamer_ROOT_DIR}")
+        message(STATUS "GStreamer: User-provided directory does not exist: ${GStreamer_ROOT_DIR}")
     endif()
 endif()
 
+# Static vs dynamic linking preference
 if(NOT DEFINED GStreamer_USE_STATIC_LIBS)
     if(ANDROID OR IOS)
         set(GStreamer_USE_STATIC_LIBS ON)
@@ -26,6 +41,7 @@ if(NOT DEFINED GStreamer_USE_STATIC_LIBS)
     endif()
 endif()
 
+# Framework usage (macOS/iOS only)
 if(NOT DEFINED GStreamer_USE_FRAMEWORK)
     if(APPLE)
         set(GStreamer_USE_FRAMEWORK ON)
@@ -34,10 +50,15 @@ if(NOT DEFINED GStreamer_USE_FRAMEWORK)
     endif()
 endif()
 
-################################################################################
+# ============================================================================
+# Platform-Specific Configuration
+# ============================================================================
 
 set(PKG_CONFIG_ARGN)
 
+# ----------------------------------------------------------------------------
+# Windows Platform
+# ----------------------------------------------------------------------------
 if(WIN32)
     if(NOT DEFINED GStreamer_ROOT_DIR)
         if(DEFINED ENV{GSTREAMER_1_0_ROOT_X86_64} AND EXISTS "$ENV{GSTREAMER_1_0_ROOT_X86_64}")
@@ -71,6 +92,10 @@ if(WIN32)
         --define-variable=libdir=${GSTREAMER_LIB_PATH}
         --define-variable=includedir=${GSTREAMER_INCLUDE_PATH}
     )
+
+# ----------------------------------------------------------------------------
+# Linux Platform
+# ----------------------------------------------------------------------------
 elseif(LINUX)
     if(NOT DEFINED GStreamer_ROOT_DIR)
         if(EXISTS "/usr")
@@ -95,6 +120,10 @@ elseif(LINUX)
     set(GSTREAMER_INCLUDE_PATH "${GStreamer_ROOT_DIR}/include")
 
     set(ENV{PKG_CONFIG_PATH} "${GSTREAMER_LIB_PATH}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+
+# ----------------------------------------------------------------------------
+# Android Platform
+# ----------------------------------------------------------------------------
 elseif(ANDROID)
     if(QGC_CUSTOM_GST_PACKAGE)
         set(_gst_android_url "https://qgroundcontrol.s3.us-west-2.amazonaws.com/android-gstreamer/qgc-android-gstreamer-${GStreamer_FIND_VERSION}.tar.xz")
@@ -139,6 +168,21 @@ elseif(ANDROID)
         set(ENV{PKG_CONFIG_LIBDIR} "${GSTREAMER_LIB_PATH}/pkgconfig;${GSTREAMER_PLUGIN_PATH}/pkgconfig")
         list(APPEND PKG_CONFIG_ARGN --dont-define-prefix)
     elseif(CMAKE_HOST_UNIX)
+        if(CMAKE_HOST_APPLE)
+            # Try to find pkg-config in common Homebrew locations and in PATH
+            find_program(PKG_CONFIG_EXECUTABLE
+                NAMES pkg-config
+                PATHS /opt/homebrew/bin /usr/local/bin
+                NO_DEFAULT_PATH
+            )
+            if(NOT PKG_CONFIG_EXECUTABLE)
+                # Fallback to PATH search if not found in Homebrew locations
+                find_program(PKG_CONFIG_EXECUTABLE pkg-config)
+            endif()
+            if(NOT PKG_CONFIG_EXECUTABLE)
+                message(FATAL_ERROR "Could not find pkg-config. Please install pkg-config using tools/setup/install-dependencies-osx.sh.")
+            endif()
+        endif()
         set(ENV{PKG_CONFIG_LIBDIR} "${GSTREAMER_LIB_PATH}/pkgconfig:${GSTREAMER_PLUGIN_PATH}/pkgconfig")
     endif()
     list(APPEND PKG_CONFIG_ARGN
@@ -146,6 +190,10 @@ elseif(ANDROID)
         --define-variable=libdir=${GSTREAMER_LIB_PATH}
         --define-variable=includedir=${GSTREAMER_INCLUDE_PATH}
     )
+
+# ----------------------------------------------------------------------------
+# macOS Platform
+# ----------------------------------------------------------------------------
 elseif(MACOS)
     if(NOT DEFINED GStreamer_ROOT_DIR)
         if(EXISTS "/Library/Frameworks/GStreamer.framework")
@@ -179,8 +227,12 @@ elseif(MACOS)
         --define-variable=libdir=${GSTREAMER_LIB_PATH}
         --define-variable=includedir=${GSTREAMER_INCLUDE_PATH}
     )
+
+# ----------------------------------------------------------------------------
+# iOS Platform (Currently Unsupported)
+# ----------------------------------------------------------------------------
 elseif(IOS)
-    message(FATAL_ERROR "GStreamer for iOS is Currently Unsupported.")
+    message(FATAL_ERROR "GStreamer for iOS is currently unsupported")
 
     CPMAddPackage(
         NAME gstreamer
@@ -222,15 +274,20 @@ elseif(IOS)
     set(GSTREAMER_INCLUDE_PATH "${GSTREAMER_FRAMEWORK_PATH}/Headers")
 endif()
 
+# ----------------------------------------------------------------------------
+# Validation
+# ----------------------------------------------------------------------------
 if(NOT EXISTS "${GStreamer_ROOT_DIR}" OR NOT EXISTS "${GSTREAMER_LIB_PATH}" OR NOT EXISTS "${GSTREAMER_PLUGIN_PATH}" OR NOT EXISTS "${GSTREAMER_INCLUDE_PATH}")
-    message(FATAL_ERROR "Could not locate GStreamer - check installation or set environment/cmake variables")
+    message(FATAL_ERROR "GStreamer: Could not locate required directories - check installation or set GStreamer_ROOT_DIR")
 endif()
 
 if(GStreamer_USE_FRAMEWORK AND NOT EXISTS "${GSTREAMER_FRAMEWORK_PATH}")
-    message(FATAL_ERROR "Could not locate GStreamer - check installation or set environment/cmake variables")
+    message(FATAL_ERROR "GStreamer: Could not locate framework at ${GSTREAMER_FRAMEWORK_PATH}")
 endif()
 
-################################################################################
+# ============================================================================
+# Plugin & Dependency Configuration
+# ============================================================================
 
 if(GStreamer_USE_STATIC_LIBS)
     set(GSTREAMER_EXTRA_DEPS
@@ -291,7 +348,9 @@ if(ANDROID)
     )
 endif()
 
-################################################################################
+# ============================================================================
+# Package Discovery
+# ============================================================================
 
 if(GStreamer_USE_FRAMEWORK)
     list(APPEND CMAKE_FRAMEWORK_PATH "${GSTREAMER_FRAMEWORK_PATH}")
@@ -311,8 +370,11 @@ else()
 endif()
 set(GStreamer_VERSION "${PC_GSTREAMER_VERSION}")
 
-################################################################################
+# ============================================================================
+# Component Discovery
+# ============================================================================
 
+# Helper function to find individual GStreamer components
 function(find_gstreamer_component component pkgconfig_name)
     set(target GStreamer::${component})
 
@@ -340,8 +402,9 @@ function(find_gstreamer_component component pkgconfig_name)
     endif()
 endfunction()
 
-################################################################################
-
+# ----------------------------------------------------------------------------
+# Find Core Components (Always Required)
+# ----------------------------------------------------------------------------
 find_gstreamer_component(Core gstreamer-1.0)
 find_gstreamer_component(Base gstreamer-base-1.0)
 find_gstreamer_component(Video gstreamer-video-1.0)
@@ -349,8 +412,9 @@ find_gstreamer_component(Gl gstreamer-gl-1.0)
 find_gstreamer_component(GlPrototypes gstreamer-gl-prototypes-1.0)
 find_gstreamer_component(Rtsp gstreamer-rtsp-1.0)
 
-################################################################################
-
+# ----------------------------------------------------------------------------
+# Find Optional Components (Based on FIND_COMPONENTS)
+# ----------------------------------------------------------------------------
 if(GlEgl IN_LIST GStreamer_FIND_COMPONENTS)
     find_gstreamer_component(GlEgl gstreamer-gl-egl-1.0)
 endif()
@@ -363,7 +427,9 @@ if(GlX11 IN_LIST GStreamer_FIND_COMPONENTS)
     find_gstreamer_component(GlX11 gstreamer-gl-x11-1.0)
 endif()
 
-################################################################################
+# ============================================================================
+# Package Finalization
+# ============================================================================
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GStreamer
@@ -371,6 +437,9 @@ find_package_handle_standard_args(GStreamer
     HANDLE_COMPONENTS
 )
 
+# ----------------------------------------------------------------------------
+# Create Main GStreamer Target
+# ----------------------------------------------------------------------------
 if(GStreamer_FOUND AND NOT TARGET GStreamer::GStreamer)
     qt_add_library(GStreamer::GStreamer INTERFACE IMPORTED)
 
@@ -396,8 +465,10 @@ if(GStreamer_FOUND AND NOT TARGET GStreamer::GStreamer)
             endif()
             return()
         else()
-            message(FATAL_ERROR "Could not locate GStreamer - check installation or set environment/cmake variables")
+            message(FATAL_ERROR "GStreamer: Could not locate GStreamer.framework")
         endif()
+
+    # Android-specific link options
     elseif(ANDROID)
         target_link_options(GStreamer::GStreamer INTERFACE "-Wl,-Bsymbolic")
         if(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -423,8 +494,9 @@ if(GStreamer_FOUND AND NOT TARGET GStreamer::GStreamer)
         endif()
     endforeach()
 
-################################################################################
-
+# ----------------------------------------------------------------------------
+# Static Plugin Linking (Static Builds Only)
+# ----------------------------------------------------------------------------
     if(GStreamer_USE_STATIC_LIBS)
         qt_add_library(GStreamer::Plugins INTERFACE IMPORTED)
         target_link_directories(GStreamer::Plugins INTERFACE ${GSTREAMER_PLUGIN_PATH})
diff --git a/cmake/find-modules/_FindGStreamerMobile.cmake b/cmake/find-modules/_FindGStreamerMobile.cmake
index 80d83efdf1ac..90311b27428e 100644
--- a/cmake/find-modules/_FindGStreamerMobile.cmake
+++ b/cmake/find-modules/_FindGStreamerMobile.cmake
@@ -108,7 +108,7 @@ if(ANDROID_ABI MATCHES "^armeabi")
 elseif(ANDROID_ABI STREQUAL "x86")
     set(NEEDS_NOTEXT_FIX TRUE)
     set(NEEDS_BSYMBOLIC_FIX TRUE)
-# arm64: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-July/298734.html 
+# arm64: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-July/298734.html
 elseif(ANDROID_ABI STREQUAL "x86_64" OR ANDROID_ABI STREQUAL "arm64-v8a")
     set(NEEDS_BSYMBOLIC_FIX TRUE)
 endif()
diff --git a/cmake/install/CPack/CreateCPackArchive.cmake b/cmake/install/CPack/CreateCPackArchive.cmake
index 073d1cf1ee01..224b5160b574 100644
--- a/cmake/install/CPack/CreateCPackArchive.cmake
+++ b/cmake/install/CPack/CreateCPackArchive.cmake
@@ -1,5 +1,13 @@
+# ============================================================================
+# CreateCPackArchive.cmake
+# ZIP archive package generator for cross-platform distribution
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# Archive Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "ZIP")
 set(CPACK_BINARY_ZIP ON)
 
diff --git a/cmake/install/CPack/CreateCPackBundle.cmake b/cmake/install/CPack/CreateCPackBundle.cmake
index 3c1caa27f73e..de3c2f689b6f 100644
--- a/cmake/install/CPack/CreateCPackBundle.cmake
+++ b/cmake/install/CPack/CreateCPackBundle.cmake
@@ -1,14 +1,29 @@
+# ============================================================================
+# CreateCPackBundle.cmake
+# macOS application bundle package generator
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# Bundle Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "BUNDLE")
 set(CPACK_BINARY_BUNDLE ON)
 
 set(QGC_INSTALLER_SOURCE "${CMAKE_SOURCE_DIR}/deploy/macos")
 
+# ----------------------------------------------------------------------------
+# Bundle Configuration
+# ----------------------------------------------------------------------------
 set(CPACK_BUNDLE_NAME ${CMAKE_PROJECT_NAME})
 set(CPACK_BUNDLE_PLIST "${QGC_INSTALLER_SOURCE}/MacOSXBundleInfo.plist.in")
 set(CPACK_BUNDLE_ICON "${QGC_APP_ICON}")
 # set(CPACK_BUNDLE_STARTUP_COMMAND "")
+
+# ----------------------------------------------------------------------------
+# Code Signing Options
+# ----------------------------------------------------------------------------
 # set(CPACK_BUNDLE_APPLE_CERT_APP "")
 # set(CPACK_BUNDLE_APPLE_ENTITLEMENTS "")
 # set(CPACK_BUNDLE_APPLE_CODESIGN_FILES "")
diff --git a/cmake/install/CPack/CreateCPackCommon.cmake b/cmake/install/CPack/CreateCPackCommon.cmake
index db890e46b5b9..8bca881ff367 100644
--- a/cmake/install/CPack/CreateCPackCommon.cmake
+++ b/cmake/install/CPack/CreateCPackCommon.cmake
@@ -1,4 +1,11 @@
-# Variables common to all CPack Generators
+# ============================================================================
+# CreateCPackCommon.cmake
+# Common CPack configuration shared across all package generators
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Basic Package Information
+# ----------------------------------------------------------------------------
 set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
 set(CPACK_PACKAGE_VENDOR ${QGC_ORG_NAME})
 set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -9,14 +16,26 @@ set(CPACK_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
 # set(CPACK_PACKAGE_DESCRIPTION_FILE "")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_DESCRIPTION})
 set(CPACK_PACKAGE_HOMEPAGE_URL ${PROJECT_HOMEPAGE_URL})
+
+# ----------------------------------------------------------------------------
+# Package Files and Directories
+# ----------------------------------------------------------------------------
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_PROJECT_NAME})
 set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icons/qgroundcontrol.png")
 # set(CPACK_PACKAGE_CHECKSUM "")
 # set(CPACK_PROJECT_CONFIG_FILE "")
+
+# ----------------------------------------------------------------------------
+# Resource Files
+# ----------------------------------------------------------------------------
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/.github/COPYING.md")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
 # set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/desc/welcome.txt")
+
+# ----------------------------------------------------------------------------
+# Package Options
+# ----------------------------------------------------------------------------
 # set(CPACK_MONOLITHIC_INSTALL
 # set(CPACK_GENERATOR
 # set(CPACK_OUTPUT_CONFIG_FILE
@@ -25,14 +44,18 @@ set(CPACK_PACKAGE_EXECUTABLES ${CMAKE_PROJECT_NAME})
 set(CPACK_VERBATIM_VARIABLES ON)
 set(CPACK_THREADS -4)
 
-# Variables for Source Package Generators
+# ----------------------------------------------------------------------------
+# Source Package Configuration
+# ----------------------------------------------------------------------------
 # set(CPACK_SOURCE_PACKAGE_FILE_NAME
 # set(CPACK_SOURCE_STRIP_FILES
 # set(CPACK_SOURCE_GENERATOR
 # set(CPACK_SOURCE_OUTPUT_CONFIG_FILE
 # set(CPACK_SOURCE_IGNORE_FILES
 
-# Variables for Advanced Use
+# ----------------------------------------------------------------------------
+# Advanced Configuration Options
+# ----------------------------------------------------------------------------
 # set(CPACK_CMAKE_GENERATOR
 # set(CPACK_INSTALL_CMAKE_PROJECTS
 # set(CPACK_SYSTEM_NAME
diff --git a/cmake/install/CPack/CreateCPackDMG.cmake b/cmake/install/CPack/CreateCPackDMG.cmake
index bb84198c33a4..1a2057970818 100644
--- a/cmake/install/CPack/CreateCPackDMG.cmake
+++ b/cmake/install/CPack/CreateCPackDMG.cmake
@@ -1,10 +1,21 @@
+# ============================================================================
+# CreateCPackDMG.cmake
+# macOS DMG disk image package generator
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# DMG Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "DragNDrop")
 set(CPACK_BINARY_DRAGNDROP ON)
 
 set(QGC_INSTALLER_SOURCE "${CMAKE_SOURCE_DIR}/deploy/macos")
 
+# ----------------------------------------------------------------------------
+# DMG Options
+# ----------------------------------------------------------------------------
 # set(CPACK_DMG_VOLUME_NAME ${CPACK_PACKAGE_FILE_NAME})
 set(CPACK_DMG_FORMAT UDBZ)
 # set(CPACK_DMG_DS_STORE)
@@ -16,6 +27,10 @@ set(CPACK_DMG_FORMAT UDBZ)
 # set(CPACK_DMG_SLA_LANGUAGES "")
 # set(CPACK_DMG_<component>_FILE_NAME "")
 set(CPACK_DMG_FILESYSTEM APFS)
+
+# ----------------------------------------------------------------------------
+# macOS Disk Utility Commands
+# ----------------------------------------------------------------------------
 # set(CPACK_COMMAND_HDIUTIL "/usr/bin/sudo /usr/bin/hdiutil")
 # set(CPACK_COMMAND_SETFILE "")
 # set(CPACK_COMMAND_REZ "")
diff --git a/cmake/install/CPack/CreateCPackDeb.cmake b/cmake/install/CPack/CreateCPackDeb.cmake
index be816520101a..58e8d5eb2a66 100644
--- a/cmake/install/CPack/CreateCPackDeb.cmake
+++ b/cmake/install/CPack/CreateCPackDeb.cmake
@@ -1,10 +1,21 @@
+# ============================================================================
+# CreateCPackDeb.cmake
+# Debian/Ubuntu .deb package generator
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# DEB Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "DEB")
 set(CPACK_BINARY_DEB ON)
 
 set(QGC_INSTALLER_SOURCE "${CMAKE_SOURCE_DIR}/deploy/linux")
 
+# ----------------------------------------------------------------------------
+# Package Metadata
+# ----------------------------------------------------------------------------
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
 set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
@@ -21,6 +32,10 @@ set(CPACK_DEBIAN_ARCHIVE_TYPE xz)
 # set(CPACK_DEBIAN_COMPRESSION_TYPE
 # set(CPACK_DEBIAN_PACKAGE_PRIORITY
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
+
+# ----------------------------------------------------------------------------
+# Advanced DEB Options
+# ----------------------------------------------------------------------------
 # set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS 1)
 # set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS
 # set(CPACK_DEBIAN_PACKAGE_DEBUG
diff --git a/cmake/install/CPack/CreateCPackIFW.cmake b/cmake/install/CPack/CreateCPackIFW.cmake
index c0ef1086b712..d913a62f0003 100644
--- a/cmake/install/CPack/CreateCPackIFW.cmake
+++ b/cmake/install/CPack/CreateCPackIFW.cmake
@@ -1,18 +1,31 @@
+# ============================================================================
+# CreateCPackIFW.cmake
+# Qt Installer Framework (IFW) package generator for cross-platform installers
+# ============================================================================
+
 include(CreateCPackCommon)
 
-# Hints for Finding QtIFW
+# ----------------------------------------------------------------------------
+# Qt Installer Framework Detection
+# ----------------------------------------------------------------------------
+# Hints for finding QtIFW
 set(CPACK_IFW_ROOT "${Qt6_ROOT_DIR}/../../Tools/QtInstallerFramework/*")
 set(QTIFWDIR "${Qt6_ROOT_DIR}/../../Tools/QtInstallerFramework/*")
 
 include(CPackIFW)
 
+# ----------------------------------------------------------------------------
+# IFW Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "IFW")
 set(CPACK_BINARY_IFW ON)
 
-# Debug
+# Debug output
 set(CPACK_IFW_VERBOSE ON)
 
-# Package
+# ----------------------------------------------------------------------------
+# Package Appearance
+# ----------------------------------------------------------------------------
 set(CPACK_IFW_PACKAGE_TITLE "${QGC_INSTALLER_NAME}")
 set(CPACK_IFW_PACKAGE_PUBLISHER "${QGC_ORG_NAME}")
 set(CPACK_IFW_PRODUCT_URL "${CMAKE_PROJECT_HOMEPAGE_URL}")
@@ -28,6 +41,10 @@ set(CPACK_IFW_PACKAGE_WIZARD_STYLE "Modern")
 # set(CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST OFF)
 # set(CPACK_IFW_PACKAGE_TITLE_COLOR "#007A5C")
 # set(CPACK_IFW_PACKAGE_STYLE_SHEET "${INSTALLER_ROOT}/config/dev/style.qss")
+
+# ----------------------------------------------------------------------------
+# Platform-Specific Install Directories
+# ----------------------------------------------------------------------------
 if(${CMAKE_SYSTEM_NAME} MATCHES Linux)
     set(CPACK_IFW_TARGET_DIRECTORY "@HomeDir@/${CMAKE_PROJECT_NAME}")
     set(CPACK_IFW_ADMIN_TARGET_DIRECTORY "@HomeDir@/${CMAKE_PROJECT_NAME}")
diff --git a/cmake/install/CPack/CreateCPackNSIS.cmake b/cmake/install/CPack/CreateCPackNSIS.cmake
index 2e2844ccfaf5..2331832fe766 100644
--- a/cmake/install/CPack/CreateCPackNSIS.cmake
+++ b/cmake/install/CPack/CreateCPackNSIS.cmake
@@ -1,16 +1,31 @@
+# ============================================================================
+# CreateCPackNSIS.cmake
+# Windows NSIS installer package generator
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# NSIS Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "NSIS")
 set(CPACK_BINARY_NSIS ON)
 
 set(QGC_INSTALLER_SOURCE "${CMAKE_BINARY_DIR}/deploy/windows")
 
+# ----------------------------------------------------------------------------
+# Installer Appearance
+# ----------------------------------------------------------------------------
 set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
 set(CPACK_NSIS_MUI_ICON "${QGC_INSTALLER_SOURCE}/WindowsQGC.ico")
 set(CPACK_NSIS_MUI_UNIICON "${QGC_INSTALLER_SOURCE}/WindowsQGC.ico")
 # set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
 # set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "")
 # set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "")
+
+# ----------------------------------------------------------------------------
+# Install/Uninstall Commands
+# ----------------------------------------------------------------------------
 # set(CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS "")
 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
     CreateDirectory \"\$SMPROGRAMS\\${CMAKE_PROJECT_NAME}\"
@@ -24,6 +39,9 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
     Delete \"\$SMPROGRAMS\\${CMAKE_PROJECT_NAME}\\${CMAKE_PROJECT_NAME} (GPU Safe Mode).lnk\"
     RMDir /r /REBOOTOK \"\$SMPROGRAMS\\${CMAKE_PROJECT_NAME}\"
 ")
+# ----------------------------------------------------------------------------
+# Installer Options
+# ----------------------------------------------------------------------------
 set(CPACK_NSIS_COMPRESSOR "/SOLID /FINAL lzma")
 set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 set(CPACK_NSIS_MODIFY_PATH ON)
@@ -40,6 +58,10 @@ set(CPACK_NSIS_URL_INFO_ABOUT ${CPACK_PACKAGE_HOMEPAGE_URL})
 # set(CPACK_NSIS_MUI_FINISHPAGE_RUN "")
 # set(CPACK_NSIS_MENU_LINKS "")
 set(CPACK_NSIS_UNINSTALL_NAME "${CMAKE_PROJECT_NAME}-Uninstall")
+
+# ----------------------------------------------------------------------------
+# Installer UI Customization
+# ----------------------------------------------------------------------------
 # set(CPACK_NSIS_WELCOME_TITLE "")
 # set(CPACK_NSIS_WELCOME_TITLE_3LINES "")
 # set(CPACK_NSIS_FINISH_TITLE "")
diff --git a/cmake/install/CPack/CreateCPackProductBuild.cmake b/cmake/install/CPack/CreateCPackProductBuild.cmake
index 2b25244c1db6..266c08865368 100644
--- a/cmake/install/CPack/CreateCPackProductBuild.cmake
+++ b/cmake/install/CPack/CreateCPackProductBuild.cmake
@@ -1,10 +1,21 @@
+# ============================================================================
+# CreateCPackProductBuild.cmake
+# macOS .pkg installer package generator using productbuild
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# ProductBuild Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "PRODUCTBUILD")
 set(CPACK_BINARY_PRODUCTBUILD ON)
 
 set(QGC_INSTALLER_SOURCE "${CMAKE_SOURCE_DIR}/deploy/macos")
 
+# ----------------------------------------------------------------------------
+# Package Building Tools and Signing
+# ----------------------------------------------------------------------------
 # set(CPACK_COMMAND_PRODUCTBUILD)
 # set(CPACK_PRODUCTBUILD_IDENTIFIER)
 # set(CPACK_PRODUCTBUILD_IDENTITY_NAME)
@@ -20,6 +31,9 @@ set(QGC_INSTALLER_SOURCE "${CMAKE_SOURCE_DIR}/deploy/macos")
 # set(CPACK_PRODUCTBUILD_DOMAINS_USER)
 # set(CPACK_PRODUCTBUILD_DOMAINS_ROOT)
 
+# ----------------------------------------------------------------------------
+# Installer Background Images (Light and Dark Mode)
+# ----------------------------------------------------------------------------
 # set(CPACK_PRODUCTBUILD_BACKGROUND)
 # set(CPACK_PRODUCTBUILD_BACKGROUND_ALIGNMENT)
 # set(CPACK_PRODUCTBUILD_BACKGROUND_SCALING)
diff --git a/cmake/install/CPack/CreateCPackRPM.cmake b/cmake/install/CPack/CreateCPackRPM.cmake
index fa865c05022a..9c91900ff9e4 100644
--- a/cmake/install/CPack/CreateCPackRPM.cmake
+++ b/cmake/install/CPack/CreateCPackRPM.cmake
@@ -1,10 +1,21 @@
+# ============================================================================
+# CreateCPackRPM.cmake
+# Red Hat/Fedora/CentOS .rpm package generator
+# ============================================================================
+
 include(CreateCPackCommon)
 
+# ----------------------------------------------------------------------------
+# RPM Generator Configuration
+# ----------------------------------------------------------------------------
 list(APPEND CPACK_GENERATOR "RPM")
 set(CPACK_BINARY_RPM ON)
 
 set(QGC_INSTALLER_SOURCE "${CMAKE_SOURCE_DIR}/deploy/linux")
 
+# ----------------------------------------------------------------------------
+# Package Metadata
+# ----------------------------------------------------------------------------
 set(CPACK_RPM_COMPONENT_INSTALL ON)
 # CPACK_RPM_PACKAGE_SUMMARY
 # CPACK_RPM_PACKAGE_NAME
@@ -21,6 +32,10 @@ set(CPACK_RPM_PACKAGE_ARCHITECTURE "amd64")
 # CPACK_RPM_PACKAGE_URL
 set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
 set(CPACK_RPM_COMPRESSION_TYPE xz)
+
+# ----------------------------------------------------------------------------
+# RPM Dependencies and Requirements
+# ----------------------------------------------------------------------------
 # CPACK_RPM_PACKAGE_AUTOREQ
 # CPACK_RPM_PACKAGE_AUTOPROV
 # CPACK_RPM_PACKAGE_AUTOREQPROV
diff --git a/cmake/install/CreateAppImage.cmake b/cmake/install/CreateAppImage.cmake
index 54e205b8afa6..322c1851d04e 100644
--- a/cmake/install/CreateAppImage.cmake
+++ b/cmake/install/CreateAppImage.cmake
@@ -1,13 +1,21 @@
-# TODO: # go-appimage, updateinformation w/ GitHub Releases, signing
+# ============================================================================
+# CreateAppImage.cmake
+# Creates AppImage packages for Linux distribution
+# ============================================================================
+#
+# TODO: Implement go-appimage, update information with GitHub Releases, signing
+#
 
-message(STATUS "QGC: Creating AppImage")
+message(STATUS "QGC: Creating AppImage...")
 
 set(APPDIR_PATH "${CMAKE_BINARY_DIR}/AppDir")
 set(APPIMAGE_PATH "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${CMAKE_SYSTEM_PROCESSOR}.AppImage")
 
-#===========================================================================#
-# Download Tools
+# ============================================================================
+# Helper Functions
+# ============================================================================
 
+# Download and cache build tools
 function(download_tool VAR URL)
     cmake_path(GET URL FILENAME _name)
     set(_dest "${CMAKE_BINARY_DIR}/tools/${_name}")
@@ -24,14 +32,25 @@ function(download_tool VAR URL)
     set(${VAR}_PATH "${_dest}" PARENT_SCOPE)
 endfunction()
 
-download_tool(LINUXDEPLOY   https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
-download_tool(APPIMAGETOOL  https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
+# ============================================================================
+# Download Required Tools
+# ============================================================================
+
+message(STATUS "QGC: Downloading AppImage build tools...")
+
+download_tool(LINUXDEPLOY https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
+download_tool(APPIMAGETOOL https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
+
+# AppImageLint is only available for x86_64
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-    download_tool(APPIMAGELINT  https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
+    download_tool(APPIMAGELINT https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
 endif()
 
-#===========================================================================#
-# Bundle the runtime
+# ============================================================================
+# Bundle Runtime Dependencies
+# ============================================================================
+
+message(STATUS "QGC: Bundling runtime dependencies with linuxdeploy...")
 
 execute_process(
     COMMAND "${LINUXDEPLOY_PATH}"
@@ -44,27 +63,39 @@ execute_process(
     COMMAND_ERROR_IS_FATAL ANY
 )
 
-#===========================================================================#
-# Build the final AppImage
+# ============================================================================
+# Build Final AppImage
+# ============================================================================
+
+message(STATUS "QGC: Building AppImage package...")
 
 set(ENV{ARCH} ${CMAKE_SYSTEM_PROCESSOR})
 set(ENV{VERSION} ${CMAKE_PROJECT_VERSION})
+
 execute_process(
     COMMAND "${APPIMAGETOOL_PATH}" "${APPDIR_PATH}" "${APPIMAGE_PATH}"
     COMMAND_ECHO STDOUT
     COMMAND_ERROR_IS_FATAL ANY
 )
 
-#===========================================================================#
-# Lint
+message(STATUS "QGC: AppImage created successfully: ${APPIMAGE_PATH}")
+
+# ============================================================================
+# Validation & Linting
+# ============================================================================
 
 if(EXISTS "${APPIMAGELINT_PATH}")
+    message(STATUS "QGC: Running AppImage linter...")
     execute_process(
         COMMAND "${APPIMAGELINT_PATH}" "${APPIMAGE_PATH}"
         RESULT_VARIABLE LINT_RESULT
         COMMAND_ECHO STDOUT
     )
     if(NOT LINT_RESULT EQUAL 0)
-        message(WARNING "QGC: appimagelint reported problems; see log above")
+        message(WARNING "QGC: AppImageLint reported issues - see output above")
+    else()
+        message(STATUS "QGC: AppImage passed validation")
     endif()
+else()
+    message(STATUS "QGC: AppImageLint not available, skipping validation")
 endif()
diff --git a/cmake/install/CreateMacDMG.cmake b/cmake/install/CreateMacDMG.cmake
index b58fe9dc127d..13c1516be268 100644
--- a/cmake/install/CreateMacDMG.cmake
+++ b/cmake/install/CreateMacDMG.cmake
@@ -1,33 +1,37 @@
-# -- Variables ----------------------------------------
-# QGC_STAGING_BUNDLE_PATH => full path to MyApp.app
-
-# ---------------------------------------------------------------------------
-# 1. Grab or locate create-dmg
-# ---------------------------------------------------------------------------
-find_program(CREATE_DMG_PROGRAM create-dmg)
-if(NOT CREATE_DMG_PROGRAM)
-    message(STATUS "QGC: Downloading create-dmg")
-    CPMAddPackage(
-        NAME create-dmg
-        GITHUB_REPOSITORY create-dmg/create-dmg
-        GIT_TAG master
-        DOWNLOAD_ONLY
-    )
-    set(CREATE_DMG_PROGRAM "${create-dmg_SOURCE_DIR}/create-dmg")
-endif()
-
-# ---------------------------------------------------------------------------
-# 2. Build the DMG with a nice drag-and-drop layout
-# ---------------------------------------------------------------------------
+# ============================================================================
+# CreateMacDMG.cmake
+# Creates macOS DMG disk image for distribution
+# ============================================================================
+#
+# Required Variables (passed from Install.cmake):
+#   QGC_STAGING_BUNDLE_PATH => Full path to MyApp.app bundle
+#   CREATE_DMG_PROGRAM      => Full path to create-dmg program
+#
+
+message(STATUS "QGC: Creating macOS DMG disk image...")
+
+# ============================================================================
+# Prepare Package Directory
+# ============================================================================
+
 set(QGC_DMG_PATH "${CMAKE_BINARY_DIR}/package")
+
+# Clean and create package directory
 file(REMOVE_RECURSE "${QGC_DMG_PATH}")
 file(MAKE_DIRECTORY "${QGC_DMG_PATH}")
+
+# Copy the application bundle to package directory
 file(COPY "${QGC_STAGING_BUNDLE_PATH}" DESTINATION "${QGC_DMG_PATH}")
 
-cmake_path(GET QGC_STAGING_BUNDLE_PATH STEM QGC_TARGET_APP_NAME)
+# ============================================================================
+# Create DMG
+# ============================================================================
 
+cmake_path(GET QGC_STAGING_BUNDLE_PATH STEM QGC_TARGET_APP_NAME)
 set(QGC_DMG_NAME "${QGC_TARGET_APP_NAME}.dmg")
 
+message(STATUS "QGC: Building ${QGC_DMG_NAME}...")
+
 execute_process(
     COMMAND "${CREATE_DMG_PROGRAM}"
             --volname "${QGC_TARGET_APP_NAME}"
@@ -39,4 +43,4 @@ execute_process(
     COMMAND_ERROR_IS_FATAL ANY
 )
 
-message(STATUS "QGC: Created ${QGC_DMG_NAME}")
+message(STATUS "QGC: DMG created successfully: ${CMAKE_BINARY_DIR}/${QGC_DMG_NAME}")
diff --git a/cmake/install/CreateQGCInstaller.cmake b/cmake/install/CreateQGCInstaller.cmake
index 37b8563f632c..b3d94659d82e 100644
--- a/cmake/install/CreateQGCInstaller.cmake
+++ b/cmake/install/CreateQGCInstaller.cmake
@@ -1,12 +1,23 @@
-message(STATUS "Creating QGC Installer")
+# ============================================================================
+# CreateQGCInstaller.cmake
+# Generates installer packages using Qt Installer Framework
+# ============================================================================
+
+message(STATUS "QGC: Creating installer package")
 
 include(CMakePrintHelpers)
 
+# ----------------------------------------------------------------------------
+# Qt Installer Framework Detection
+# ----------------------------------------------------------------------------
 set(QT_INSTALLER_FRAMEWORK_DIR ${QT_ROOT_DIR}/../../Tools/QtInstallerFramework)
 find_program(QT_INSTALLER_FRAMEWORK binarycreator
     PATHS "${QT_INSTALLER_FRAMEWORK_ROOT}/*/bin"
 )
 
+# ----------------------------------------------------------------------------
+# Installer Source Directories
+# ----------------------------------------------------------------------------
 set(INSTALLER_SOURCE_DIR ${CMAKE_SOURCE_DIR}/deploy/installer)
 set(INSTALLER_SOURCE_CONFIG_DIR ${INSTALLER_SOURCE_DIR}/config)
 set(INSTALLER_SOURCE_PACKAGES_DIR ${INSTALLER_SOURCE_DIR}/packages)
@@ -15,6 +26,9 @@ set(INSTALLER_SOURCE_PACKAGES_QGC_DIR ${INSTALLER_SOURCE_PACKAGES_DIR}/org.mavli
 set(INSTALLER_SOURCE_PACKAGES_QGC_DATA_DIR ${INSTALLER_SOURCE_PACKAGES_QGC_DIR}/data)
 set(INSTALLER_SOURCE_PACKAGES_QGC_META_DIR ${INSTALLER_SOURCE_PACKAGES_QGC_DIR}/meta)
 
+# ----------------------------------------------------------------------------
+# Installer Output Directories
+# ----------------------------------------------------------------------------
 set(INSTALLER_OUTPUT_DIR ${CMAKE_BINARY_DIR}/installer)
 set(INSTALLER_OUTPUT_CONFIG_DIR ${INSTALLER_OUTPUT_DIR}/config)
 set(INSTALLER_OUTPUT_PACKAGES_DIR ${INSTALLER_OUTPUT_DIR}/packages)
@@ -23,6 +37,10 @@ set(INSTALLER_OUTPUT_PACKAGES_QGC_DIR ${INSTALLER_OUTPUT_PACKAGES_DIR}/org.mavli
 set(INSTALLER_OUTPUT_PACKAGES_QGC_DATA_DIR ${INSTALLER_OUTPUT_PACKAGES_QGC_DIR}/data)
 set(INSTALLER_OUTPUT_PACKAGES_QGC_META_DIR ${INSTALLER_OUTPUT_PACKAGES_QGC_DIR}/meta)
 
+# ----------------------------------------------------------------------------
+# Create Output Directory Structure
+# ----------------------------------------------------------------------------
+
 file(MAKE_DIRECTORY ${INSTALLER_OUTPUT_DIR})
 file(MAKE_DIRECTORY ${INSTALLER_OUTPUT_CONFIG_DIR})
 file(MAKE_DIRECTORY ${INSTALLER_OUTPUT_PACKAGES_DIR})
@@ -31,6 +49,9 @@ file(MAKE_DIRECTORY ${INSTALLER_OUTPUT_PACKAGES_QGC_DIR})
 file(MAKE_DIRECTORY ${INSTALLER_OUTPUT_PACKAGES_QGC_DATA_DIR})
 file(MAKE_DIRECTORY ${INSTALLER_OUTPUT_PACKAGES_QGC_META_DIR})
 
+# ----------------------------------------------------------------------------
+# Configure Installer Templates
+# ----------------------------------------------------------------------------
 configure_file(
     ${INSTALLER_SOURCE_CONFIG_DIR}/config.xml.in
     ${INSTALLER_OUTPUT_CONFIG_DIR}/config.xml
@@ -43,27 +64,23 @@ configure_file(
     @ONLY
 )
 
-# file(COPY ${QGC_INSTALLER_ROOT} DESTINATION ${QGC_INSTALLER_OUTPUT_DIR})
-
+# TODO: Copy additional resources when needed
 # file(COPY ${QGC_APP_ICON} DESTINATION ${QGC_INSTALLER_ROOT}/config/)
 # file(COPY ${CMAKE_SOURCE_DIR}/README.md DESTINATION ${QGC_INSTALLER_ROOT}/README.md)
 # file(COPY ${CMAKE_SOURCE_DIR}/.github/COPYING.md DESTINATION ${QGC_PACKAGE_ROOT}/meta/license.txt)
-
 # file(GLOB_RECURSE FILES_TO_INSTALL RELATIVE ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_PREFIX}/**)
 # file(COPY ${FILES_TO_INSTALL} DESTINATION ${QGC_PACKAGE_ROOT}/data/)
-# cmake_print_variables(QGC_INSTALLER_ROOT FILES_TO_INSTALL)
 
+# ----------------------------------------------------------------------------
+# Platform-Specific Installer Names
+# ----------------------------------------------------------------------------
 if(WIN32)
-    file(DOWNLOAD https://firmware.ardupilot.org/Tools/MissionPlanner/driver.msi
-        ${INSTALLER_SOURCE_PACKAGES_QGC_DATA_DIR}/driver.msi
-        SHOW_PROGRESS
-        STATUS DRIVER_DOWNLOAD_STATUS
-        TIMEOUT 60
-    )
-#   file(COPY ${CMAKE_SOURCE_DIR}/deploy/windows/driver.msi DESTINATION ${INSTALLER_SOURCE_PACKAGES_QGC_DATA_DIR}/driver.msi)
     set(QGC_INSTALLER_NAME ${CMAKE_PROJECT_NAME}-Installer-${CMAKE_SYSTEM_PROCESSOR}.exe)
-# endif()
+endif()
 
+# ----------------------------------------------------------------------------
+# Generate Installer
+# ----------------------------------------------------------------------------
 execute_process(
     COMMAND ${QT_INSTALLER_FRAMEWORK} --offline-only -c ${INSTALLER_OUTPUT_CONFIG_DIR}/config.xml -p ${INSTALLER_OUTPUT_PACKAGES_DIR} ${CMAKE_BINARY_DIR}/${QGC_INSTALLER_NAME}
 )
diff --git a/cmake/install/CreateWinInstaller.cmake b/cmake/install/CreateWinInstaller.cmake
index 4fac604722a4..38151821188e 100644
--- a/cmake/install/CreateWinInstaller.cmake
+++ b/cmake/install/CreateWinInstaller.cmake
@@ -1,24 +1,36 @@
+# ============================================================================
+# CreateWinInstaller.cmake
+# Windows NSIS installer creation using makensis
+# ============================================================================
+
 message(STATUS "QGC: Creating Windows NSIS Installer")
 
+# ----------------------------------------------------------------------------
+# Validate Required Variables
+# ----------------------------------------------------------------------------
+foreach(p IN ITEMS
+    QGC_WINDOWS_ICON_PATH
+    QGC_WINDOWS_INSTALL_HEADER_PATH
+    QGC_WINDOWS_INSTALLER_SCRIPT
+    QGC_WINDOWS_OUT
+    CMAKE_INSTALL_PREFIX)
+    if(NOT DEFINED ${p})
+        message(FATAL_ERROR "QGC: Missing required var: ${p}")
+    endif()
+endforeach()
+
+# ----------------------------------------------------------------------------
+# Convert Paths to Native Windows Format
+# ----------------------------------------------------------------------------
 file(TO_NATIVE_PATH "${QGC_WINDOWS_ICON_PATH}" QGC_INSTALLER_ICON)
 file(TO_NATIVE_PATH "${QGC_WINDOWS_INSTALL_HEADER_PATH}" QGC_INSTALLER_HEADER_BITMAP)
-file(TO_NATIVE_PATH "${QGC_WINDOWS_DRIVER_MSI}" QGC_INSTALLER_DRIVER_MSI)
 file(TO_NATIVE_PATH "${QGC_WINDOWS_INSTALLER_SCRIPT}" QGC_NSIS_INSTALLER_SCRIPT)
 file(TO_NATIVE_PATH "${QGC_WINDOWS_OUT}" QGC_INSTALLER_OUT)
+file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" QGC_PAYLOAD_DIR)
 
-set(QGC_NSIS_INSTALLER_PARAMETERS
-    /DDRIVER_MSI=${QGC_INSTALLER_DRIVER_MSI}
-    /DINSTALLER_ICON=${QGC_INSTALLER_ICON}
-    /DHEADER_BITMAP=${QGC_INSTALLER_HEADER_BITMAP}
-    /DAPPNAME=${CMAKE_PROJECT_NAME}
-    /DEXENAME=${CMAKE_PROJECT_NAME}
-    /DORGNAME=${QGC_ORG_NAME}
-    /DDESTDIR=${CMAKE_INSTALL_PREFIX}
-    /NOCD
-    "/XOutFile ${QGC_INSTALLER_OUT}"
-    ${QGC_NSIS_INSTALLER_SCRIPT}
-)
-
+# ----------------------------------------------------------------------------
+# Locate NSIS makensis Utility
+# ----------------------------------------------------------------------------
 set(_pf86 "ProgramFiles(x86)")
 set(_PF86 "PROGRAMFILES(x86)")
 find_program(QGC_NSIS_INSTALLER_CMD makensis
@@ -28,8 +40,41 @@ find_program(QGC_NSIS_INSTALLER_CMD makensis
     REQUIRED
 )
 
+# ----------------------------------------------------------------------------
+# Build NSIS Command Arguments
+# ----------------------------------------------------------------------------
+
+set(_nsis_args
+    /NOCD
+    /INPUTCHARSET UTF8
+    /V4
+    "/DAPPNAME=${CMAKE_PROJECT_NAME}"
+    "/DEXENAME=${CMAKE_PROJECT_NAME}"
+    "/DORGNAME=${QGC_ORG_NAME}"
+    "/DDESTDIR=${QGC_PAYLOAD_DIR}"
+)
+
+if(EXISTS "${QGC_INSTALLER_ICON}")
+    list(APPEND _nsis_args "/DINSTALLER_ICON=${QGC_INSTALLER_ICON}")
+endif()
+
+if(EXISTS "${QGC_INSTALLER_HEADER_BITMAP}")
+    list(APPEND _nsis_args "/DHEADER_BITMAP=${QGC_INSTALLER_HEADER_BITMAP}")
+endif()
+
+set(_APPVER "${CMAKE_PROJECT_VERSION}")
+if(_APPVER)
+    list(APPEND _nsis_args "/DAPPVERSION=${_APPVER}")
+endif()
+
+list(APPEND _nsis_args "/XOutFile ${QGC_INSTALLER_OUT}")
+
+# ----------------------------------------------------------------------------
+# Execute NSIS Installer Creation
+# ----------------------------------------------------------------------------
 execute_process(
-    COMMAND ${QGC_NSIS_INSTALLER_CMD} ${QGC_NSIS_INSTALLER_PARAMETERS}
+    COMMAND "${QGC_NSIS_INSTALLER_CMD}" ${_nsis_args} "${QGC_NSIS_INSTALLER_SCRIPT}"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     COMMAND_ECHO STDOUT
     COMMAND_ERROR_IS_FATAL ANY
 )
diff --git a/cmake/install/Install.cmake b/cmake/install/Install.cmake
index f0b3bbd8c333..3ca169a3787c 100644
--- a/cmake/install/Install.cmake
+++ b/cmake/install/Install.cmake
@@ -1,5 +1,16 @@
+# ============================================================================
+# QGroundControl Installation Configuration
+# Handles platform-specific installation and packaging
+# ============================================================================
+
 include(InstallRequiredSystemLibraries)
 
+# Note: Installer generation could be conditioned on Release builds
+# if(QGC_BUILD_INSTALLER AND CMAKE_INSTALL_CONFIG_NAME MATCHES "^[Rr]elease$")
+
+# ----------------------------------------------------------------------------
+# Main Target Installation
+# ----------------------------------------------------------------------------
 install(
     TARGETS ${CMAKE_PROJECT_NAME}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -8,18 +19,15 @@ install(
     BUNDLE  DESTINATION .
 )
 
+# ----------------------------------------------------------------------------
+# Qt Deployment Script Generation
+# ----------------------------------------------------------------------------
 set(deploy_tool_options_arg "")
+
 if(MACOS OR WIN32)
     list(APPEND deploy_tool_options_arg "-qmldir=${CMAKE_SOURCE_DIR}")
     if(MACOS)
-        # if(DEFINED ENV{QGC_MACOS_SIGNING_IDENTITY})
-        #     message(STATUS "QGC: Deploy Sign For Notarization")
-        #     list(APPEND deploy_tool_options_arg "-sign-for-notarization=\"$ENV{QGC_MACOS_SIGNING_IDENTITY}\"")
-        # else()
-        #     message(STATUS "QGC: Deploy AD-HOC Codesign")
-        #     list(APPEND deploy_tool_options_arg "-codesign=-")
-        # endif()
-        # list(APPEND deploy_tool_options_arg "-dmg" "-fs=APFS")
+        list(APPEND deploy_tool_options_arg "-appstore-compliant")
     endif()
 endif()
 
@@ -31,11 +39,25 @@ qt_generate_deploy_qml_app_script(
     DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
     DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
 )
+
 install(SCRIPT ${deploy_script})
+message(STATUS "QGC: Qt deployment script: ${deploy_script}")
+
+# ============================================================================
+# Platform-Specific Installation
+# ============================================================================
 
+# ----------------------------------------------------------------------------
+# Android Installation
+# ----------------------------------------------------------------------------
 if(ANDROID)
+    # Android deployment handled by Qt
     # get_target_property(QGC_ANDROID_DEPLOY_FILE ${CMAKE_PROJECT_NAME} QT_ANDROID_DEPLOYMENT_SETTINGS_FILE)
     # cmake_print_variables(QGC_ANDROID_DEPLOY_FILE)
+
+# ----------------------------------------------------------------------------
+# Linux Installation & AppImage Creation
+# ----------------------------------------------------------------------------
 elseif(LINUX)
     configure_file(
         "${QGC_APPIMAGE_DESKTOP_ENTRY_PATH}"
@@ -62,13 +84,14 @@ elseif(LINUX)
         @ONLY
     )
     install(
-        PROGRAMS "${CMAKE_BINARY_DIR}/${QGC_PACKAGE_NAME}.appdata.xml"
+        FILES "${CMAKE_BINARY_DIR}/${QGC_PACKAGE_NAME}.appdata.xml"
         DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo/"
     )
     install(
         FILES "${QGC_APPIMAGE_APPRUN_PATH}"
         DESTINATION "${CMAKE_BINARY_DIR}/"
     )
+    # Pass variables to AppImage creation script
     install(CODE "
         set(CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
         set(CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
@@ -76,13 +99,18 @@ elseif(LINUX)
         set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
     ")
     install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/install/CreateAppImage.cmake")
+
+# ----------------------------------------------------------------------------
+# Windows Installation & Installer Creation
+# ----------------------------------------------------------------------------
 elseif(WIN32)
+    # Pass variables to Windows installer creation script
     install(CODE "
         set(CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
+        set(CMAKE_PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
         set(QGC_ORG_NAME ${QGC_ORG_NAME})
         set(QGC_WINDOWS_ICON_PATH \"${QGC_WINDOWS_ICON_PATH}\")
         set(QGC_WINDOWS_INSTALL_HEADER_PATH \"${QGC_WINDOWS_INSTALL_HEADER_PATH}\")
-        set(QGC_WINDOWS_DRIVER_MSI \"${CMAKE_SOURCE_DIR}/deploy/windows/driver.msi\")
         if(CMAKE_CROSSCOMPILING)
             set(QGC_WINDOWS_OUT \"${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-installer-${CMAKE_HOST_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_PROCESSOR}.exe\")
         else()
@@ -91,29 +119,42 @@ elseif(WIN32)
         set(QGC_WINDOWS_INSTALLER_SCRIPT \"${CMAKE_SOURCE_DIR}/deploy/windows/nullsoft_installer.nsi\")
     ")
     install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/install/CreateWinInstaller.cmake")
-elseif(MACOS)
-    install(CODE "
-        set(QGC_STAGING_BUNDLE_PATH \"${CMAKE_BINARY_DIR}/staging/${CMAKE_PROJECT_NAME}.app\")
 
-        message(STATUS \"QGC: Signing Bundle - \${QGC_STAGING_BUNDLE_PATH}\")
-        execute_process(
-            COMMAND codesign --force --deep -s - \"\${QGC_STAGING_BUNDLE_PATH}\"
-            COMMAND_ERROR_IS_FATAL ANY
-        )
-    ")
-
-    # include(BundleUtilities)
-    # fixup_bundle(\"${QGC_STAGING_BUNDLE_PATH}\" \"\" \"${CMAKE_BINARY_DIR}\")
-    # verify_app(\"${QGC_STAGING_BUNDLE_PATH}\")
-    # verify_bundle_prerequisites(\"${QGC_STAGING_BUNDLE_PATH}\" _bundle_prereqs_result _bundle_prereqs_info)
-    # verify_bundle_symlinks(\"${QGC_STAGING_BUNDLE_PATH}\" _bundle_symlinks_result _bundle_symlinks_info)
+# ----------------------------------------------------------------------------
+# macOS Installation, Code Signing & DMG Creation
+# ----------------------------------------------------------------------------
+elseif(MACOS)
+    # Set bundle path for subsequent operations
+    install(CODE "set(QGC_STAGING_BUNDLE_PATH \"${CMAKE_BINARY_DIR}/staging/${CMAKE_PROJECT_NAME}.app\")")
 
-    # include(CreateCPackDMG)
+    # Code signing
+    if(QGC_MACOS_SIGN_WITH_IDENTITY)
+        message(STATUS "QGC: macOS bundle will be signed with developer identity")
+        install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/install/SignMacBundle.cmake")
+    else()
+        message(STATUS "QGC: macOS bundle will be signed with ad-hoc signature")
+        install(CODE "
+            message(STATUS \"QGC: Signing macOS bundle (ad-hoc)\")
+            execute_process(
+                COMMAND codesign --force --deep -s - \"\${QGC_STAGING_BUNDLE_PATH}\"
+                COMMAND_ERROR_IS_FATAL ANY
+            )
+        ")
+    endif()
 
-    # - or
+    # Find or fetch create-dmg tool
+    find_program(CREATE_DMG_PROGRAM create-dmg)
+    if(NOT CREATE_DMG_PROGRAM)
+        message(STATUS "QGC: Fetching create-dmg tool via CPM")
+        CPMAddPackage(
+            NAME create-dmg
+            GITHUB_REPOSITORY create-dmg/create-dmg
+            GIT_TAG master
+            DOWNLOAD_ONLY
+        )
+        set(CREATE_DMG_PROGRAM "${create-dmg_SOURCE_DIR}/create-dmg")
+    endif()
 
-    install(CODE "
-        include(${CMAKE_SOURCE_DIR}/cmake/modules/CPM.cmake)
-    ")
+    install(CODE "set(CREATE_DMG_PROGRAM \"${CREATE_DMG_PROGRAM}\")")
     install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/install/CreateMacDMG.cmake")
 endif()
diff --git a/cmake/install/SignMacBundle.cmake b/cmake/install/SignMacBundle.cmake
new file mode 100644
index 000000000000..922a5f9d8149
--- /dev/null
+++ b/cmake/install/SignMacBundle.cmake
@@ -0,0 +1,107 @@
+# ============================================================================
+# SignMacBundle.cmake
+# Code signing and notarization for macOS application bundles
+# ============================================================================
+
+message(STATUS "QGC: Signing Bundle using signing identity")
+
+# ----------------------------------------------------------------------------
+# Environment Variable Validation
+# ----------------------------------------------------------------------------
+if(NOT DEFINED ENV{QGC_MACOS_SIGNING_IDENTITY} OR "$ENV{QGC_MACOS_SIGNING_IDENTITY}" STREQUAL "")
+    message(FATAL_ERROR "QGC: QGC_MACOS_SIGNING_IDENTITY environment variable must be set to sign MacOS bundle")
+endif()
+if(NOT DEFINED ENV{QGC_MACOS_NOTARIZATION_USERNAME} OR "$ENV{QGC_MACOS_NOTARIZATION_USERNAME}" STREQUAL "")
+    message(FATAL_ERROR "QGC: QGC_MACOS_NOTARIZATION_USERNAME environment variable must be set to notarize MacOS bundle")
+endif()
+if(NOT DEFINED ENV{QGC_MACOS_NOTARIZATION_TEAM_ID} OR "$ENV{QGC_MACOS_NOTARIZATION_TEAM_ID}" STREQUAL "")
+    message(FATAL_ERROR "QGC: QGC_MACOS_NOTARIZATION_TEAM_ID environment variable must be set to notarize MacOS bundle")
+endif()
+if(NOT DEFINED ENV{QGC_MACOS_NOTARIZATION_PASSWORD} OR "$ENV{QGC_MACOS_NOTARIZATION_PASSWORD}" STREQUAL "")
+    message(FATAL_ERROR "QGC: QGC_MACOS_NOTARIZATION_PASSWORD environment variable must be set to notarize MacOS bundle")
+endif()
+
+# ----------------------------------------------------------------------------
+# Clean Up GStreamer Symlinks
+# ----------------------------------------------------------------------------
+file(REMOVE "${QGC_STAGING_BUNDLE_PATH}/Contents/Frameworks/GStreamer.framework/Commands")
+file(REMOVE "${QGC_STAGING_BUNDLE_PATH}/Contents/Frameworks/GStreamer.framework/Versions/1.0/Commands")
+
+# ----------------------------------------------------------------------------
+# Sign All Libraries and Executables
+# ----------------------------------------------------------------------------
+# Sign all dynamic libraries
+execute_process(
+    COMMAND find "${QGC_STAGING_BUNDLE_PATH}/Contents" -type f -name "*.dylib" -exec codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "{}" \\;
+    COMMAND_ERROR_IS_FATAL ANY
+)
+
+# Sign all shared objects
+execute_process(
+    COMMAND find "${QGC_STAGING_BUNDLE_PATH}/Contents" -type f -name "*.so" -exec codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "{}" \\;
+    COMMAND_ERROR_IS_FATAL ANY
+)
+
+# ----------------------------------------------------------------------------
+# Sign GStreamer Framework Components
+# ----------------------------------------------------------------------------
+execute_process(
+    COMMAND find "${QGC_STAGING_BUNDLE_PATH}/Contents/Frameworks/GStreamer.framework/Versions/1.0/libexec/gstreamer-1.0" -type f -name "*" -exec codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "{}" \\;
+    COMMAND_ERROR_IS_FATAL ANY
+)
+execute_process(
+    COMMAND codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "${QGC_STAGING_BUNDLE_PATH}/Contents/Frameworks/GStreamer.framework/Versions/1.0/lib/GStreamer"
+    COMMAND_ERROR_IS_FATAL ANY
+)
+execute_process(
+    COMMAND codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "${QGC_STAGING_BUNDLE_PATH}/Contents/Frameworks/GStreamer.framework/Versions/1.0/GStreamer"
+    COMMAND_ERROR_IS_FATAL ANY
+)
+
+# ----------------------------------------------------------------------------
+# Sign All Frameworks
+# ----------------------------------------------------------------------------
+file(GLOB FRAMEWORK_DIRS "${QGC_STAGING_BUNDLE_PATH}/Contents/Frameworks/*.framework")
+foreach(FRAMEWORK_DIR ${FRAMEWORK_DIRS})
+    if(EXISTS "${FRAMEWORK_DIR}/Versions/1.0")
+        execute_process(
+            COMMAND find "${FRAMEWORK_DIR}/Versions/1.0" -type f -exec codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "{}" \\;
+            COMMAND_ERROR_IS_FATAL ANY
+        )
+    endif()
+    if(EXISTS "${FRAMEWORK_DIR}/Versions/A")
+        execute_process(
+            COMMAND find "${FRAMEWORK_DIR}/Versions/A" -type f -exec codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "{}" \\;
+            COMMAND_ERROR_IS_FATAL ANY
+        )
+    endif()
+endforeach()
+
+# ----------------------------------------------------------------------------
+# Sign Main Application Bundle
+# ----------------------------------------------------------------------------
+execute_process(
+    COMMAND codesign --timestamp --options=runtime --force -s "$ENV{QGC_MACOS_SIGNING_IDENTITY}" "${QGC_STAGING_BUNDLE_PATH}"
+    COMMAND_ERROR_IS_FATAL ANY
+)
+
+# ============================================================================
+# Notarization Process
+# ============================================================================
+
+message(STATUS "QGC: Archiving Bundle for Notarization upload")
+file(REMOVE "qgc_notarization_upload.zip")
+execute_process(
+    COMMAND ditto -c -k --keepParent "${QGC_STAGING_BUNDLE_PATH}" qgc_notarization_upload.zip
+    COMMAND_ERROR_IS_FATAL ANY
+)
+message(STATUS "QGC: Notarizing app bundle. This may take a while...")
+execute_process(
+    COMMAND xcrun notarytool submit qgc_notarization_upload.zip --apple-id "$ENV{QGC_MACOS_NOTARIZATION_USERNAME}" --team-id "$ENV{QGC_MACOS_NOTARIZATION_TEAM_ID}" --password "$ENV{QGC_MACOS_NOTARIZATION_PASSWORD}" --wait
+    COMMAND_ERROR_IS_FATAL ANY
+)
+message(STATUS "QGC: Stapling notarization ticket to app bundle")
+execute_process(
+    COMMAND xcrun stapler staple "${QGC_STAGING_BUNDLE_PATH}"
+    COMMAND_ERROR_IS_FATAL ANY
+)
diff --git a/cmake/modules/CMakeGraphVizOptions.cmake b/cmake/modules/CMakeGraphVizOptions.cmake
index 2de998667403..48283f10e860 100644
--- a/cmake/modules/CMakeGraphVizOptions.cmake
+++ b/cmake/modules/CMakeGraphVizOptions.cmake
@@ -1,21 +1,31 @@
-# Basic appearance ------------------------------------------------
-set(GRAPHVIZ_GRAPH_NAME      "QGC-deps")          # title
-set(GRAPHVIZ_GRAPH_HEADER    "rankdir=LR;")       # dot header snippet
-set(GRAPHVIZ_NODE_PREFIX     "node")              # node IDs
+# ============================================================================
+# CMakeGraphVizOptions.cmake
+# Configuration for CMake's --graphviz dependency graph generation
+# Usage: cmake --graphviz=deps.dot . && dot -Tpng deps.dot -o deps.png
+# ============================================================================
 
-# What to show ----------------------------------------------------
-set(GRAPHVIZ_EXECUTABLES     TRUE)   # default TRUE
-set(GRAPHVIZ_SHARED_LIBS     TRUE)
-set(GRAPHVIZ_MODULE_LIBS     FALSE)
-set(GRAPHVIZ_INTERFACE_LIBS  FALSE)
-set(GRAPHVIZ_OBJECT_LIBS     FALSE)
-set(GRAPHVIZ_UNKNOWN_LIBS    FALSE)
-set(GRAPHVIZ_EXTERNAL_LIBS   FALSE)  # hide Qt/system libs
-set(GRAPHVIZ_CUSTOM_TARGETS  TRUE)   # include custom targets
-set(GRAPHVIZ_IGNORE_TARGETS  "test_.*;doc_.*")   # regex list
+# ----------------------------------------------------------------------------
+# Graph Appearance
+# ----------------------------------------------------------------------------
+set(GRAPHVIZ_GRAPH_NAME      "QGC-deps")          # Graph title
+set(GRAPHVIZ_GRAPH_HEADER    "rankdir=LR;")       # DOT header snippet (left-to-right)
+set(GRAPHVIZ_NODE_PREFIX     "node")              # Node ID prefix
 
-# File churn ------------------------------------------------------
-set(GRAPHVIZ_GENERATE_PER_TARGET   FALSE)  # only the master graph
-set(GRAPHVIZ_GENERATE_DEPENDERS    FALSE)
+# ----------------------------------------------------------------------------
+# What to Include in Graph
+# ----------------------------------------------------------------------------
+set(GRAPHVIZ_EXECUTABLES     TRUE)   # Show executables (default TRUE)
+set(GRAPHVIZ_SHARED_LIBS     TRUE)   # Show shared libraries
+set(GRAPHVIZ_MODULE_LIBS     FALSE)  # Hide module libraries
+set(GRAPHVIZ_INTERFACE_LIBS  FALSE)  # Hide interface libraries
+set(GRAPHVIZ_OBJECT_LIBS     FALSE)  # Hide object libraries
+set(GRAPHVIZ_UNKNOWN_LIBS    FALSE)  # Hide unknown libraries
+set(GRAPHVIZ_EXTERNAL_LIBS   FALSE)  # Hide external libraries (Qt/system libs)
+set(GRAPHVIZ_CUSTOM_TARGETS  TRUE)   # Show custom targets
+set(GRAPHVIZ_IGNORE_TARGETS  "test_.*;doc_.*")   # Regex list of targets to ignore
 
-# --graphviz=foo.dot
+# ----------------------------------------------------------------------------
+# Output File Generation
+# ----------------------------------------------------------------------------
+set(GRAPHVIZ_GENERATE_PER_TARGET   FALSE)  # Only generate master graph
+set(GRAPHVIZ_GENERATE_DEPENDERS    FALSE)  # Don't generate depender graphs
diff --git a/cmake/modules/Git.cmake b/cmake/modules/Git.cmake
index 2372fbf3b109..03f6e793f065 100644
--- a/cmake/modules/Git.cmake
+++ b/cmake/modules/Git.cmake
@@ -1,9 +1,20 @@
-find_package(Git)
+# ----------------------------------------------------------------------------
+# QGroundControl Git Configuration
+# Extracts version information and metadata from Git repository
+# ----------------------------------------------------------------------------
 
+find_package(Git REQUIRED)
+
+# Verify we're in a Git repository
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    message(WARNING "QGC: Not a Git repository. Version information may be incomplete.")
+endif()
+
+# Optionally update submodules during configuration
 if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     option(GIT_SUBMODULE "Check submodules during build" OFF)
     if(GIT_SUBMODULE)
-        message(STATUS "Submodule update")
+        message(STATUS "Updating Git submodules...")
         execute_process(
             COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
             WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -13,62 +24,118 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
             OUTPUT_STRIP_TRAILING_WHITESPACE
         )
         if(NOT GIT_SUBMODULE_RESULT EQUAL 0)
+            include(CMakePrintHelpers)
             cmake_print_variables(GIT_SUBMODULE_RESULT GIT_SUBMODULE_OUTPUT GIT_SUBMODULE_ERROR)
-            message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMODULE_RESULT}, please checkout submodules")
+            message(FATAL_ERROR "Git submodule update failed with code ${GIT_SUBMODULE_RESULT}")
         endif()
+        message(STATUS "Git submodules updated successfully")
     endif()
 endif()
 
 include(CMakePrintHelpers)
 
+# ----------------------------------------------------------------------------
+# Extract Git Branch
+# ----------------------------------------------------------------------------
+
 execute_process(
     COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref @
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE QGC_GIT_BRANCH
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
 )
+if(NOT QGC_GIT_BRANCH)
+    set(QGC_GIT_BRANCH "unknown")
+endif()
 # cmake_print_variables(QGC_GIT_BRANCH)
 
+# ----------------------------------------------------------------------------
+# Extract Git Commit Hash
+# ----------------------------------------------------------------------------
 execute_process(
     COMMAND ${GIT_EXECUTABLE} rev-parse --short @
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE QGC_GIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
 )
+if(NOT QGC_GIT_HASH)
+    set(QGC_GIT_HASH "0000000")
+endif()
 # cmake_print_variables(QGC_GIT_HASH)
 
+# ----------------------------------------------------------------------------
+# Extract Version String from Git Tags
+# ----------------------------------------------------------------------------
 execute_process(
     COMMAND ${GIT_EXECUTABLE} describe --always --tags
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE QGC_APP_VERSION_STR
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
 )
+if(NOT QGC_APP_VERSION_STR)
+    set(QGC_APP_VERSION_STR "v0.0.0")
+endif()
 # cmake_print_variables(QGC_APP_VERSION_STR)
 
+# ----------------------------------------------------------------------------
+# Extract Clean Version Tag
+# ----------------------------------------------------------------------------
 execute_process(
     COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=0
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE QGC_APP_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
 )
+if(NOT QGC_APP_VERSION)
+    set(QGC_APP_VERSION "v0.0.0")
+endif()
 # cmake_print_variables(QGC_APP_VERSION)
 
+# ----------------------------------------------------------------------------
+# Extract Commit Date for Version Timestamp
+# ----------------------------------------------------------------------------
+
+if(QGC_STABLE_BUILD)
+    set(QGC_APP_DATE_VERSION "${QGC_APP_VERSION}")
+else()
+    # Daily builds use date of last commit
+    set(QGC_APP_DATE_VERSION "")
+endif()
+
 execute_process(
-    COMMAND ${GIT_EXECUTABLE} log -1 --format=%aI ${QGC_APP_VERSION}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ${GIT_EXECUTABLE} log -1 --format=%aI ${QGC_APP_DATE_VERSION}
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     OUTPUT_VARIABLE QGC_APP_DATE
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
 )
+if(NOT QGC_APP_DATE)
+    string(TIMESTAMP QGC_APP_DATE "%Y-%m-%dT%H:%M:%S%z" UTC)
+endif()
 # cmake_print_variables(QGC_APP_DATE)
 
-string(FIND ${QGC_APP_VERSION} "v" QGC_APP_VERSION_VALID)
-if(QGC_APP_VERSION_VALID GREATER -1)
-    string(REPLACE "v" "" QGC_APP_VERSION ${QGC_APP_VERSION})
+# ----------------------------------------------------------------------------
+# Parse Version Components (Major.Minor.Patch)
+# ----------------------------------------------------------------------------
+# Strip 'v' prefix if present (e.g., v1.2.3 -> 1.2.3)
+string(REGEX REPLACE "^v" "" QGC_APP_VERSION_CLEAN "${QGC_APP_VERSION}")
+
+# Extract version components using regex
+if(QGC_APP_VERSION_CLEAN MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+    set(QGC_APP_VERSION "${QGC_APP_VERSION_CLEAN}")
+    set(QGC_APP_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    set(QGC_APP_VERSION_MINOR "${CMAKE_MATCH_2}")
+    set(QGC_APP_VERSION_PATCH "${CMAKE_MATCH_3}")
 else()
+    # Fallback if version doesn't match expected format
+    message(WARNING "QGC: Could not parse semantic version from Git tag: '${QGC_APP_VERSION_CLEAN}'. Using fallback 0.0.0")
     set(QGC_APP_VERSION "0.0.0")
+    set(QGC_APP_VERSION_MAJOR "0")
+    set(QGC_APP_VERSION_MINOR "0")
+    set(QGC_APP_VERSION_PATCH "0")
 endif()
-string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" QGC_APP_VERSION_MATCH ${QGC_APP_VERSION})
-set(QGC_APP_VERSION_MAJOR ${CMAKE_MATCH_1})
-set(QGC_APP_VERSION_MINOR ${CMAKE_MATCH_2})
-set(QGC_APP_VERSION_PATCH ${CMAKE_MATCH_3})
 # cmake_print_variables(QGC_APP_VERSION QGC_APP_VERSION_MAJOR QGC_APP_VERSION_MINOR QGC_APP_VERSION_PATCH)
diff --git a/cmake/modules/IWYU.cmake b/cmake/modules/IWYU.cmake
index 0f7fdff6dfdb..c1974a737161 100644
--- a/cmake/modules/IWYU.cmake
+++ b/cmake/modules/IWYU.cmake
@@ -1,6 +1,14 @@
+# ============================================================================
+# IWYU.cmake
+# Include-What-You-Use (IWYU) integration for header usage analysis
+# Helps identify unnecessary includes and suggest proper forward declarations
+# ============================================================================
+
+# IWYU only works with Clang
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     find_program(INCLUDE_WHAT_YOU_USE_PROGRAM include-what-you-use)
     if(INCLUDE_WHAT_YOU_USE_PROGRAM)
+        message(STATUS "QGC: Found include-what-you-use: ${INCLUDE_WHAT_YOU_USE_PROGRAM}")
         set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${INCLUDE_WHAT_YOU_USE_PROGRAM})
         set(CMAKE_C_INCLUDE_WHAT_YOU_USE ${INCLUDE_WHAT_YOU_USE_PROGRAM})
     endif()
diff --git a/cmake/modules/vulkan.cmake b/cmake/modules/vulkan.cmake
deleted file mode 100644
index 2624f3a3c738..000000000000
--- a/cmake/modules/vulkan.cmake
+++ /dev/null
@@ -1,105 +0,0 @@
-add_library(mbgl-vendor-vulkan-headers INTERFACE)
-
-target_include_directories(
-    mbgl-vendor-vulkan-headers SYSTEM
-    INTERFACE
-        ${CMAKE_CURRENT_LIST_DIR}/Vulkan-Headers/include/
-)
-
-set_target_properties(
-    mbgl-vendor-vulkan-headers
-    PROPERTIES
-        INTERFACE_MAPLIBRE_NAME "Vulkan-Headers"
-        INTERFACE_MAPLIBRE_URL "https://github.com/KhronosGroup/Vulkan-Headers.git"
-        INTERFACE_MAPLIBRE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/Vulkan-Headers/LICENSE.md
-)
-
-add_library(mbgl-vendor-VulkanMemoryAllocator INTERFACE)
-
-target_include_directories(
-    mbgl-vendor-VulkanMemoryAllocator SYSTEM
-    INTERFACE
-        ${CMAKE_CURRENT_LIST_DIR}/VulkanMemoryAllocator/include/
-)
-
-set_target_properties(
-    mbgl-vendor-VulkanMemoryAllocator
-    PROPERTIES
-        INTERFACE_MAPLIBRE_NAME "VulkanMemoryAllocator"
-        INTERFACE_MAPLIBRE_URL "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
-        INTERFACE_MAPLIBRE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/VulkanMemoryAllocator/LICENSE.txt
-)
-
-set(ENABLE_OPT OFF)
-set(ENABLE_HLSL OFF)
-set(ENABLE_GLSLANG_BINARIES OFF)
-set(GLSLANG_TESTS_DEFAULT OFF)
-set(ENABLE_PCH OFF)
-
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.25")
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/glslang SYSTEM)
-else()
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/glslang)
-endif()
-
-get_target_property(glslang_inc glslang INTERFACE_INCLUDE_DIRECTORIES)
-set_target_properties(glslang PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${glslang_inc})
-
-set_target_properties(
-    glslang
-    PROPERTIES
-        INTERFACE_MAPLIBRE_NAME "glslang"
-        INTERFACE_MAPLIBRE_URL "https://github.com/KhronosGroup/glslang.git"
-        INTERFACE_MAPLIBRE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/glslang/LICENSE.txt
-)
-
-set_target_properties(
-    SPIRV
-    PROPERTIES
-        INTERFACE_MAPLIBRE_NAME "SPIRV"
-        INTERFACE_MAPLIBRE_URL "https://github.com/KhronosGroup/glslang.git"
-        INTERFACE_MAPLIBRE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/glslang/LICENSE.txt
-)
-
-set_target_properties(
-    glslang-default-resource-limits
-    PROPERTIES
-        INTERFACE_MAPLIBRE_NAME "glslang-default-resource-limits"
-        INTERFACE_MAPLIBRE_URL "https://github.com/KhronosGroup/glslang.git"
-        INTERFACE_MAPLIBRE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/glslang/LICENSE.txt
-)
-
-export(TARGETS
-    mbgl-vendor-vulkan-headers
-    mbgl-vendor-VulkanMemoryAllocator
-    glslang
-    SPIRV
-    glslang-default-resource-limits
-    MachineIndependent
-    OSDependent
-    GenericCodeGen
-    
-    APPEND FILE MapboxCoreTargets.cmake
-)
-
-# TODO: Build Vulkan Headers
-# CPMAddPackage(
-#   NAME Vulkan-Headers
-#   GITHUB_REPOSITORY KhronosGroup/Vulkan-Headers
-#   GIT_TAG v1.3.269
-# )
-
-# # Vulkan-Headers defines a header target but not one for the module.
-# if(Vulkan-Headers_ADDED)
-#   add_library(Vulkan-Module)
-#   target_sources(Vulkan-Module
-#     PUBLIC FILE_SET CXX_MODULES
-#     BASE_DIRS "${Vulkan-Headers_SOURCE_DIR}/include"
-#     FILES "${Vulkan-Headers_SOURCE_DIR}/include/vulkan/vulkan.cppm"
-#   )
-#   target_compile_definitions(Vulkan-Module PUBLIC
-#     # Your options here, project-dependent:
-#     # https://github.com/KhronosGroup/Vulkan-Hpp#configuration-options
-#   )
-#   target_link_libraries(Vulkan-Module PUBLIC Vulkan-Headers)
-# endif()
diff --git a/cmake/platform/Android.cmake b/cmake/platform/Android.cmake
index f531d839caba..79eb0d2c94fb 100644
--- a/cmake/platform/Android.cmake
+++ b/cmake/platform/Android.cmake
@@ -1,43 +1,62 @@
+# ----------------------------------------------------------------------------
+# QGroundControl Android Platform Configuration
+# ----------------------------------------------------------------------------
+
 if(NOT ANDROID)
-    message(FATAL_ERROR "Invalid Platform")
-    return()
+    message(FATAL_ERROR "QGC: Invalid Platform: Android.cmake included but platform is not Android")
 endif()
 
-if(${Qt6_VERSION} VERSION_EQUAL 6.8.3)
-    if(NOT ${CMAKE_ANDROID_NDK_VERSION} VERSION_EQUAL 26.1 AND NOT ${CMAKE_ANDROID_NDK_VERSION} VERSION_EQUAL 27.2)
-        message(FATAL_ERROR "Invalid NDK Version: ${CMAKE_ANDROID_NDK_VERSION}, Use Version 26B of 27C instead.")
+# ----------------------------------------------------------------------------
+# Android NDK Version Validation
+# ----------------------------------------------------------------------------
+if(Qt6_VERSION VERSION_EQUAL "6.10.1")
+    if(NOT CMAKE_ANDROID_NDK_VERSION VERSION_EQUAL "27.2")
+        message(FATAL_ERROR "QGC: Invalid NDK Version: ${CMAKE_ANDROID_NDK_VERSION}. Qt 6.10.1 requires NDK 27.2")
     endif()
 endif()
 
-# Generation of android version numbers must be consistent release to release such that they are always increasing
-if(${CMAKE_PROJECT_VERSION_MAJOR} GREATER 9)
-    message(FATAL_ERROR "Major version larger than 1 digit: ${CMAKE_PROJECT_VERSION_MAJOR}")
+# ----------------------------------------------------------------------------
+# Android Version Number Validation
+# ----------------------------------------------------------------------------
+
+# Generation of Android version numbers must be consistent release to release
+# to ensure they are always increasing for Google Play Store
+if(CMAKE_PROJECT_VERSION_MAJOR GREATER 9)
+    message(FATAL_ERROR "QGC: Major version must be single digit (0-9), got: ${CMAKE_PROJECT_VERSION_MAJOR}")
 endif()
-if(${CMAKE_PROJECT_VERSION_MINOR} GREATER 9)
-    message(FATAL_ERROR "Minor version larger than 1 digit: ${CMAKE_PROJECT_VERSION_MINOR}")
+if(CMAKE_PROJECT_VERSION_MINOR GREATER 9)
+    message(FATAL_ERROR "QGC: Minor version must be single digit (0-9), got: ${CMAKE_PROJECT_VERSION_MINOR}")
 endif()
-if(${CMAKE_PROJECT_VERSION_PATCH} GREATER 99)
-    message(FATAL_ERROR "Patch version larger than 2 digits: ${CMAKE_PROJECT_VERSION_PATCH}")
+if(CMAKE_PROJECT_VERSION_PATCH GREATER 99)
+    message(FATAL_ERROR "QGC: Patch version must be two digits (0-99), got: ${CMAKE_PROJECT_VERSION_PATCH}")
 endif()
 
-# Bitness for android version number is 66/34 instead of 64/32 in because of a required version number bump screw-up ages ago
+# ----------------------------------------------------------------------------
+# Android ABI to Bitness Code Mapping
+# ----------------------------------------------------------------------------
+# NOTE: Bitness codes are 66/34 instead of 64/32 due to a historical
+# version number bump requirement from an earlier Android release
 set(ANDROID_BITNESS_CODE)
-if(${CMAKE_ANDROID_ARCH_ABI} STREQUAL "armeabi-v7a" OR ${CMAKE_ANDROID_ARCH_ABI} STREQUAL "x86")
+if(CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a" OR CMAKE_ANDROID_ARCH_ABI STREQUAL "x86")
     set(ANDROID_BITNESS_CODE 34)
-elseif(${CMAKE_ANDROID_ARCH_ABI} STREQUAL "arm64-v8a" OR ${CMAKE_ANDROID_ARCH_ABI} STREQUAL "x86_64")
+elseif(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a" OR CMAKE_ANDROID_ARCH_ABI STREQUAL "x86_64")
     set(ANDROID_BITNESS_CODE 66)
 else()
-    message(FATAL_ERROR "Unsupported Android ABI: ${CMAKE_ANDROID_ARCH_ABI}")
+    message(FATAL_ERROR "QGC: Unsupported Android ABI: ${CMAKE_ANDROID_ARCH_ABI}. Supported: armeabi-v7a, arm64-v8a, x86, x86_64")
 endif()
 
+# ----------------------------------------------------------------------------
+# Android Version Code Generation
+# ----------------------------------------------------------------------------
+# Zero-pad patch version if less than 10
 set(ANDROID_PATCH_VERSION ${CMAKE_PROJECT_VERSION_PATCH})
-if(${CMAKE_PROJECT_VERSION_PATCH} LESS 10)
+if(CMAKE_PROJECT_VERSION_PATCH LESS 10)
     set(ANDROID_PATCH_VERSION "0${CMAKE_PROJECT_VERSION_PATCH}")
 endif()
 
 # Version code format: BBMIPPDDD (B=Bitness, M=Major, I=Minor, P=Patch, D=Dev) - Dev not currently supported and always 000
 set(ANDROID_VERSION_CODE "${ANDROID_BITNESS_CODE}${CMAKE_PROJECT_VERSION_MAJOR}${CMAKE_PROJECT_VERSION_MINOR}${ANDROID_PATCH_VERSION}000")
-message(STATUS "Android version code: ${ANDROID_VERSION_CODE}")
+message(STATUS "QGC: Android version code: ${ANDROID_VERSION_CODE}")
 
 set_target_properties(${CMAKE_PROJECT_NAME}
     PROPERTIES
@@ -45,13 +64,13 @@ set_target_properties(${CMAKE_PROJECT_NAME}
         # QT_ANDROID_SDK_BUILD_TOOLS_REVISION
         QT_ANDROID_MIN_SDK_VERSION ${QGC_QT_ANDROID_MIN_SDK_VERSION}
         QT_ANDROID_TARGET_SDK_VERSION ${QGC_QT_ANDROID_TARGET_SDK_VERSION}
-        # QT_ANDROID_COMPILE_SDK_VERSION
+        QT_ANDROID_COMPILE_SDK_VERSION ${QGC_QT_ANDROID_COMPILE_SDK_VERSION}
         QT_ANDROID_PACKAGE_NAME "${QGC_ANDROID_PACKAGE_NAME}"
         QT_ANDROID_PACKAGE_SOURCE_DIR "${QGC_ANDROID_PACKAGE_SOURCE_DIR}"
         QT_ANDROID_VERSION_NAME "${CMAKE_PROJECT_VERSION}"
         QT_ANDROID_VERSION_CODE ${ANDROID_VERSION_CODE}
-        # QT_ANDROID_APP_NAME
-        # QT_ANDROID_APP_ICON
+        QT_ANDROID_APP_NAME "${CMAKE_PROJECT_NAME}"
+        QT_ANDROID_APP_ICON "@drawable/icon"
         # QT_QML_IMPORT_PATH
         QT_QML_ROOT_PATH "${CMAKE_SOURCE_DIR}"
         # QT_ANDROID_SYSTEM_LIBS_PREFIX
@@ -63,9 +82,68 @@ set_target_properties(${CMAKE_PROJECT_NAME}
 
 list(APPEND QT_ANDROID_MULTI_ABI_FORWARD_VARS QGC_STABLE_BUILD QT_HOST_PATH)
 
+# ----------------------------------------------------------------------------
+# Android OpenSSL Libraries
+# ----------------------------------------------------------------------------
 CPMAddPackage(
     NAME android_openssl
     URL https://github.com/KDAB/android_openssl/archive/refs/heads/master.zip
 )
-include(${android_openssl_SOURCE_DIR}/android_openssl.cmake)
-add_android_openssl_libraries(${CMAKE_PROJECT_NAME})
+
+if(android_openssl_ADDED)
+    include(${android_openssl_SOURCE_DIR}/android_openssl.cmake)
+    add_android_openssl_libraries(${CMAKE_PROJECT_NAME})
+    message(STATUS "QGC: Android OpenSSL libraries added")
+else()
+    message(WARNING "QGC: Failed to add Android OpenSSL libraries")
+endif()
+
+# ----------------------------------------------------------------------------
+# Android Permissions
+# ----------------------------------------------------------------------------
+
+if(QGC_ENABLE_BLUETOOTH)
+    qt_add_android_permission(${CMAKE_PROJECT_NAME}
+        NAME android.permission.BLUETOOTH_SCAN
+        ATTRIBUTES
+            minSdkVersion 31
+            usesPermissionFlags neverForLocation
+    )
+    qt_add_android_permission(${CMAKE_PROJECT_NAME}
+        NAME android.permission.BLUETOOTH_CONNECT
+        ATTRIBUTES
+            minSdkVersion 31
+            usesPermissionFlags neverForLocation
+    )
+endif()
+
+if(NOT QGC_NO_SERIAL_LINK)
+    qt_add_android_permission(${CMAKE_PROJECT_NAME}
+        NAME android.permission.USB_PERMISSION
+    )
+endif()
+
+# Need MulticastLock to receive broadcast UDP packets
+qt_add_android_permission(${CMAKE_PROJECT_NAME}
+    NAME android.permission.CHANGE_WIFI_MULTICAST_STATE
+)
+
+# Needed to keep working while 'asleep'
+qt_add_android_permission(${CMAKE_PROJECT_NAME}
+    NAME android.permission.WAKE_LOCK
+)
+
+# Needed for read/write to SD Card Path in AppSettings
+qt_add_android_permission(${CMAKE_PROJECT_NAME}
+    NAME android.permission.WRITE_EXTERNAL_STORAGE
+)
+qt_add_android_permission(${CMAKE_PROJECT_NAME}
+    NAME android.permission.READ_EXTERNAL_STORAGE
+    ATTRIBUTES
+        maxSdkVersion 33
+)
+qt_add_android_permission(${CMAKE_PROJECT_NAME}
+    NAME android.permission.MANAGE_EXTERNAL_STORAGE
+)
+
+message(STATUS "QGC: Android platform configuration applied")
diff --git a/cmake/platform/Apple.cmake b/cmake/platform/Apple.cmake
index 8660dfea9eaf..8346fa093290 100644
--- a/cmake/platform/Apple.cmake
+++ b/cmake/platform/Apple.cmake
@@ -1,6 +1,9 @@
+# ----------------------------------------------------------------------------
+# QGroundControl Apple Platform Configuration (macOS and iOS)
+# ----------------------------------------------------------------------------
+
 if(NOT APPLE)
-    message(FATAL_ERROR "QGC: Invalid Platform")
-    return()
+    message(FATAL_ERROR "QGC: Invalid Platform: Apple.cmake included but platform is not Apple")
 endif()
 
 if(CMAKE_GENERATOR STREQUAL "Xcode")
@@ -16,6 +19,9 @@ if(CMAKE_GENERATOR STREQUAL "Xcode")
     set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${QGC_MACOS_ENTITLEMENTS_PATH}")
 endif()
 
+# ----------------------------------------------------------------------------
+# macOS/iOS Bundle Configuration
+# ----------------------------------------------------------------------------
 cmake_path(GET QGC_MACOS_ICON_PATH FILENAME MACOSX_BUNDLE_ICON_FILE)
 
 set_target_properties(${CMAKE_PROJECT_NAME}
@@ -32,7 +38,11 @@ set_target_properties(${CMAKE_PROJECT_NAME}
         MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}"
 )
 
+# ----------------------------------------------------------------------------
+# Platform-Specific Configuration
+# ----------------------------------------------------------------------------
 if(MACOS)
+    # macOS-specific configuration
     set(app_icon_macos "${QGC_MACOS_ICON_PATH}")
     set_source_files_properties(${app_icon_macos} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
@@ -44,7 +54,10 @@ if(MACOS)
             "${app_entitlements_macos}"
             "${app_icon_macos}"
     )
+
+    message(STATUS "QGC: macOS platform configuration applied")
 elseif(IOS)
+    # iOS-specific configuration
     enable_language(OBJC)
 
     set(QT_IOS_LAUNCH_SCREEN "${CMAKE_SOURCE_DIR}/deploy/ios/QGCLaunchScreen.xib")
@@ -70,6 +83,9 @@ elseif(IOS)
             XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS "YES"
     )
 
+    # Add FFmpeg libraries for iOS if needed
     # set(QT_NO_FFMPEG_XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY ON)
     qt_add_ios_ffmpeg_libraries(${CMAKE_PROJECT_NAME})
+
+    message(STATUS "QGC: iOS platform configuration applied")
 endif()
diff --git a/cmake/platform/Linux.cmake b/cmake/platform/Linux.cmake
index 0a66e137d81f..b41cf3dfbc4a 100644
--- a/cmake/platform/Linux.cmake
+++ b/cmake/platform/Linux.cmake
@@ -1,4 +1,37 @@
+# ----------------------------------------------------------------------------
+# QGroundControl Linux Platform Configuration
+# ----------------------------------------------------------------------------
+
 if(NOT LINUX)
-    message(FATAL_ERROR "Invalid Platform")
-    return()
+    message(FATAL_ERROR "QGC: Invalid Platform: Linux.cmake included but platform is not Linux")
 endif()
+
+# ----------------------------------------------------------------------------
+# Linux-Specific Compiler Flags
+# ----------------------------------------------------------------------------
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    # Enable additional warnings for better code quality
+    # target_compile_options(${CMAKE_PROJECT_NAME}
+    #     PRIVATE
+    #         -Wall
+    #         -Wextra
+    #         -Wpedantic
+    #         $<$<CONFIG:Release>:-O3>
+    # )
+endif()
+
+# ----------------------------------------------------------------------------
+# Linux-Specific Definitions
+# ----------------------------------------------------------------------------
+target_compile_definitions(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        _GNU_SOURCE
+)
+
+# ----------------------------------------------------------------------------
+# Linux Desktop Integration
+# ----------------------------------------------------------------------------
+# Desktop entry and icon files are handled by the install scripts
+# See cmake/install/CreateAppImage.cmake for AppImage-specific configuration
+
+message(STATUS "QGC: Linux platform configuration applied")
diff --git a/cmake/platform/Windows.cmake b/cmake/platform/Windows.cmake
index b386f4d94e43..c6d3e7554e92 100644
--- a/cmake/platform/Windows.cmake
+++ b/cmake/platform/Windows.cmake
@@ -1,27 +1,57 @@
+# ----------------------------------------------------------------------------
+# QGroundControl Windows Platform Configuration
+# ----------------------------------------------------------------------------
+
 if(NOT WIN32)
-    message(FATAL_ERROR "Invalid Platform")
-    return()
+    message(FATAL_ERROR "QGC: Invalid Platform: Windows.cmake included but platform is not Windows")
 endif()
 
-# CPMAddPackage(
-#     NAME windows_drivers
-#     URL https://firmware.ardupilot.org/Tools/MissionPlanner/driver.msi
-# )
-# ${windows_drivers_SOURCE_DIR}/driver.msi
-
-set_target_properties(${CMAKE_PROJECT_NAME}
-    PROPERTIES
-        WIN32_EXECUTABLE TRUE
-        # QT_TARGET_WINDOWS_RC_FILE "${QGC_WINDOWS_RESOURCE_FILE_PATH}"
-        QT_TARGET_COMPANY_NAME "${QGC_ORG_NAME}"
-        QT_TARGET_DESCRIPTION "${CMAKE_PROJECT_DESCRIPTION}"
-        QT_TARGET_VERSION "${CMAKE_PROJECT_VERSION}"
-        QT_TARGET_COPYRIGHT "${QGC_APP_COPYRIGHT}"
-        QT_TARGET_PRODUCT_NAME "${CMAKE_PROJECT_NAME}"
-        # QT_TARGET_COMMENTS: RC Comments
-        # QT_TARGET_ORIGINAL_FILENAME: RC Original FileName
-        # QT_TARGET_TRADEMARKS: RC LegalTrademarks
-        # QT_TARGET_INTERNALNAME: RC InternalName
-        QT_TARGET_RC_ICONS "${QGC_WINDOWS_ICON_PATH}"
+# ----------------------------------------------------------------------------
+# Windows-Specific Definitions
+# ----------------------------------------------------------------------------
+target_compile_definitions(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        _USE_MATH_DEFINES    # Enable M_PI and other math constants
+        NOMINMAX             # Prevent min/max macro conflicts
+        WIN32_LEAN_AND_MEAN  # Reduce Windows.h bloat
 )
-target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE _USE_MATH_DEFINES NOMINMAX WIN32_LEAN_AND_MEAN)
+
+# ----------------------------------------------------------------------------
+# Windows Executable Configuration
+# ----------------------------------------------------------------------------
+set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
+
+if(COMMAND _qt_internal_generate_win32_rc_file)
+    set_target_properties(${CMAKE_PROJECT_NAME}
+        PROPERTIES
+            QT_TARGET_COMPANY_NAME "${QGC_ORG_NAME}"
+            QT_TARGET_DESCRIPTION "${CMAKE_PROJECT_DESCRIPTION}"
+            QT_TARGET_VERSION "${CMAKE_PROJECT_VERSION}"
+            QT_TARGET_COPYRIGHT "${QGC_APP_COPYRIGHT}"
+            QT_TARGET_PRODUCT_NAME "${CMAKE_PROJECT_NAME}"
+            # QT_TARGET_COMMENTS: ${QGC_QT_TARGET_COMMENTS}
+            # QT_TARGET_ORIGINAL_FILENAME: ${QGC_QT_TARGET_ORIGINAL_FILENAME}
+            # QT_TARGET_TRADEMARKS: ${QGC_QT_TARGET_TRADEMARKS}
+            # QT_TARGET_INTERNALNAME: ${QGC_QT_TARGET_INTERNALNAME}
+            QT_TARGET_RC_ICONS "${QGC_WINDOWS_ICON_PATH}"
+    )
+    _qt_internal_generate_win32_rc_file(${CMAKE_PROJECT_NAME})
+elseif(EXISTS "${QGC_WINDOWS_RESOURCE_FILE_PATH}")
+    target_sources(${CMAKE_PROJECT_NAME} PRIVATE "${QGC_WINDOWS_RESOURCE_FILE_PATH}")
+    set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES QT_TARGET_WINDOWS_RC_FILE "${QGC_WINDOWS_RESOURCE_FILE_PATH}")
+elseif(EXISTS "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundControl.rc.in")
+    configure_file(
+        "${CMAKE_SOURCE_DIR}/deploy/windows/QGroundControl.rc.in"
+        "${CMAKE_BINARY_DIR}/QGroundControl.rc"
+        @ONLY
+    )
+    target_sources(${CMAKE_PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/QGroundControl.rc")
+else()
+    message(WARNING "QGC: No Windows resource file found")
+endif()
+
+if(MSVC)
+    # qt_add_win_app_sdk(${CMAKE_PROJECT_NAME} PRIVATE)
+endif()
+
+message(STATUS "QGC: Windows platform configuration applied")
diff --git a/codecov.yml b/codecov.yml
index 28eb813be3bf..cef4e70c46ed 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,10 +1,51 @@
 codecov:
+  require_ci_to_pass: yes
   notify:
-    require_ci_to_pass: yes
+    after_n_builds: 2  # Wait for at least 2 builds (Debug + Release)
+    wait_for_ci: yes
 
 coverage:
+  precision: 2
+  round: down
+  range: "30...90"
+
   status:
     project:
       default:
-        target: 10%
+        target: 30%
+        threshold: 2%
+        base: auto
+        if_ci_failed: error
+    patch:
+      default:
+        target: 40%
         threshold: 5%
+        base: auto
+        if_ci_failed: error
+
+comment:
+  layout: "reach,diff,flags,tree,footer"
+  behavior: default
+  require_changes: no
+  require_base: no
+  require_head: yes
+
+ignore:
+  - "test/**/*"
+  - "tools/**/*"
+  - "deploy/**/*"
+  - "custom/**/*"
+  - "libs/**/*"
+  - "*.qml"
+  - "*.js"
+  - "android/**/*"
+
+flags:
+  debug:
+    paths:
+      - src/
+    carryforward: true
+  release:
+    paths:
+      - src/
+    carryforward: true
diff --git a/custom-example/CMakeLists.txt b/custom-example/CMakeLists.txt
index 67ed26473c92..3076a4013806 100644
--- a/custom-example/CMakeLists.txt
+++ b/custom-example/CMakeLists.txt
@@ -1,23 +1,74 @@
+# ============================================================================
+# QGroundControl Custom Plugin Example
+# Template for building custom QGroundControl plugins
+# ============================================================================
+
 message(STATUS "QGC: Adding Custom Plugin")
 
+# ============================================================================
+# Custom Android Package Template
+# ============================================================================
+
+if(ANDROID)
+    set(CUSTOM_ANDROID_DIR "${CMAKE_SOURCE_DIR}/custom/android")
+    if(EXISTS "${CUSTOM_ANDROID_DIR}")
+        file(GLOB CUSTOM_ANDROID_FILES "${CUSTOM_ANDROID_DIR}/*")
+        if(CUSTOM_ANDROID_FILES)
+            message(STATUS "QGC: Custom Android package template found. Overlaying custom files...")
+            set(DEFAULT_ANDROID_DIR "${CMAKE_SOURCE_DIR}/android")
+            set(FINAL_ANDROID_DIR "${CMAKE_BINARY_DIR}/custom/android")
+
+            # Copy default Android template
+            file(COPY "${DEFAULT_ANDROID_DIR}/." DESTINATION "${FINAL_ANDROID_DIR}")
+
+            # Overlay custom Android files
+            file(COPY "${CUSTOM_ANDROID_DIR}/." DESTINATION "${FINAL_ANDROID_DIR}")
+
+            # Track changes to Android directories
+            set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
+                "${DEFAULT_ANDROID_DIR}/"
+                "${CUSTOM_ANDROID_DIR}/"
+            )
+
+            set(QGC_ANDROID_PACKAGE_SOURCE_DIR "${FINAL_ANDROID_DIR}" CACHE PATH "Path to a custom Android package template" FORCE)
+            message(STATUS "QGC: Android package template path will be set to: ${QGC_ANDROID_PACKAGE_SOURCE_DIR}")
+        else()
+            message(STATUS "QGC: Custom Android package template empty. Using default.")
+        endif()
+    else()
+        message(STATUS "QGC: No custom Android package template found. Using default.")
+    endif()
+endif()
+
+# ============================================================================
+# Custom Resources and Import Paths
+# ============================================================================
+
+# Add custom Qt resources
 list(APPEND CUSTOM_RESOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/custom.qrc
 )
 set(QGC_RESOURCES ${QGC_RESOURCES} ${CUSTOM_RESOURCES} CACHE STRING "Paths to .qrc Resources" FORCE)
 
+# Add custom QML import path
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/res" CACHE STRING "Extra qml import paths" FORCE)
 
+# ============================================================================
+# Custom QML Module
+# ============================================================================
+
 qt_add_library(CustomModule STATIC)
 
-set_source_files_properties(res/Custom/Widgets/CustomArtificialHorizon.qml PROPERTIES QT_RESOURCE_ALIAS CustomArtificialHorizon.qml)
+# Set resource aliases for custom widgets
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomArtificialHorizon.qml PROPERTIES QT_RESOURCE_ALIAS CustomArtificialHorizon.qml)
 qgc_set_qt_resource_alias(
-    res/Custom/Widgets/CustomAttitudeWidget.qml
-    res/Custom/Widgets/CustomIconButton.qml
-    res/Custom/Widgets/CustomOnOffSwitch.qml
-    res/Custom/Widgets/CustomQuickButton.qml
-    res/Custom/Widgets/CustomSignalStrength.qml
-    res/Custom/Widgets/CustomToolBarButton.qml
-    res/Custom/Widgets/CustomVehicleButton.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomAttitudeWidget.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomIconButton.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomOnOffSwitch.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomQuickButton.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomSignalStrength.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomToolBarButton.qml
+    ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomVehicleButton.qml
 )
 
 qt_add_qml_module(CustomModule
@@ -25,17 +76,21 @@ qt_add_qml_module(CustomModule
     VERSION 1.0
     RESOURCE_PREFIX /qml
     QML_FILES
-        res/Custom/Widgets/CustomArtificialHorizon.qml
-        res/Custom/Widgets/CustomAttitudeWidget.qml
-        res/Custom/Widgets/CustomIconButton.qml
-        res/Custom/Widgets/CustomOnOffSwitch.qml
-        res/Custom/Widgets/CustomQuickButton.qml
-        res/Custom/Widgets/CustomSignalStrength.qml
-        res/Custom/Widgets/CustomToolBarButton.qml
-        res/Custom/Widgets/CustomVehicleButton.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomArtificialHorizon.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomAttitudeWidget.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomIconButton.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomOnOffSwitch.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomQuickButton.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomSignalStrength.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomToolBarButton.qml
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/Custom/Widgets/CustomVehicleButton.qml
     NO_PLUGIN
 )
 
+# ============================================================================
+# Custom Plugin Sources
+# ============================================================================
+
 set(CUSTOM_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/CustomPlugin.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/src/CustomPlugin.h
@@ -48,11 +103,17 @@ set(CUSTOM_SOURCES
     CACHE INTERNAL "" FORCE
 )
 
+# ============================================================================
+# Custom Build Configuration
+# ============================================================================
+
+# Custom libraries to link
 set(CUSTOM_LIBRARIES
     CustomModule
     CACHE INTERNAL "" FORCE
 )
 
+# Custom include directories
 set(CUSTOM_INCLUDE_DIRECTORIES
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/src/AutoPilotPlugin
@@ -60,6 +121,7 @@ set(CUSTOM_INCLUDE_DIRECTORIES
     CACHE INTERNAL "" FORCE
 )
 
+# Custom compiler definitions
 set(CUSTOM_DEFINITIONS
     QGC_CUSTOM_BUILD
     CUSTOMHEADER="CustomPlugin.h"
@@ -67,6 +129,7 @@ set(CUSTOM_DEFINITIONS
     CACHE INTERNAL "" FORCE
 )
 
+# Custom Qt components required
 set(CUSTOM_QT_COMPONENTS
     Core
     CACHE INTERNAL "" FORCE
diff --git a/custom-example/README.jpg b/custom-example/README.jpg
index ea4f0c77a8c1..19a4418b15da 100644
Binary files a/custom-example/README.jpg and b/custom-example/README.jpg differ
diff --git a/custom-example/cmake/CustomOverrides.cmake b/custom-example/cmake/CustomOverrides.cmake
index fa40101b2aa9..821c850da55f 100644
--- a/custom-example/cmake/CustomOverrides.cmake
+++ b/custom-example/cmake/CustomOverrides.cmake
@@ -1,25 +1,45 @@
+# ============================================================================
+# Custom Build Configuration Overrides
+# Template for customizing QGroundControl branding and feature set
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Application Branding
+# ----------------------------------------------------------------------------
 set(QGC_APP_NAME "Custom-QGroundControl" CACHE STRING "App Name" FORCE)
 
+# ----------------------------------------------------------------------------
+# Custom Icons and Graphics
+# ----------------------------------------------------------------------------
+
+# macOS Icon
 if(EXISTS "${CMAKE_SOURCE_DIR}/custom/res/icons/custom_qgroundcontrol.icns")
     set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/custom/res/icons/custom_qgroundcontrol.icns" CACHE FILEPATH "MacOS Icon Path" FORCE)
 endif()
 
+# Linux AppImage Icon
 if(EXISTS "${CMAKE_SOURCE_DIR}/custom/res/icons/custom_qgroundcontrol.svg")
     set(QGC_APPIMAGE_ICON_SCALABLE_PATH "${CMAKE_SOURCE_DIR}/custom/res/icons/custom_qgroundcontrol.svg" CACHE FILEPATH "AppImage Icon SVG Path" FORCE)
 endif()
 
-if(EXISTS ${CMAKE_SOURCE_DIR}/custom/deploy/windows/installheader.bmp)
+# Windows Installer Header
+if(EXISTS "${CMAKE_SOURCE_DIR}/custom/deploy/windows/installheader.bmp")
     set(QGC_WINDOWS_INSTALL_HEADER_PATH "${CMAKE_SOURCE_DIR}/custom/deploy/windows/installheader.bmp" CACHE FILEPATH "Windows Install Header Path" FORCE)
 endif()
 
-if(EXISTS ${CMAKE_SOURCE_DIR}/custom/deploy/windows/WindowsQGC.ico)
+# Windows Application Icon
+if(EXISTS "${CMAKE_SOURCE_DIR}/custom/deploy/windows/WindowsQGC.ico")
     set(QGC_WINDOWS_ICON_PATH "${CMAKE_SOURCE_DIR}/custom/deploy/windows/WindowsQGC.ico" CACHE FILEPATH "Windows Icon Path" FORCE)
 endif()
 
+# ----------------------------------------------------------------------------
+# Feature Set Customization
+# ----------------------------------------------------------------------------
+
 # Build a single flight stack by disabling APM support
 set(QGC_DISABLE_APM_MAVLINK ON CACHE BOOL "Disable APM Dialect" FORCE)
 set(QGC_DISABLE_APM_PLUGIN ON CACHE BOOL "Disable APM Plugin" FORCE)
 set(QGC_DISABLE_APM_PLUGIN_FACTORY ON CACHE BOOL "Disable APM Plugin Factory" FORCE)
 
-# We implement our own PX4 plugin factory
+# Implement custom PX4 plugin factory
 set(QGC_DISABLE_PX4_PLUGIN_FACTORY ON CACHE BOOL "Disable PX4 Plugin Factory" FORCE)
diff --git a/custom-example/custom.qrc b/custom-example/custom.qrc
index cee01559079d..618dcad169f7 100644
--- a/custom-example/custom.qrc
+++ b/custom-example/custom.qrc
@@ -18,16 +18,6 @@
     <qresource prefix="/Custom/qmlimages">
         <file alias="PaperPlane.svg">res/Images/CustomVehicleIcon.svg</file>
     </qresource>
-    <qresource prefix="/Custom/Widgets">
-        <file alias="Custom/Widgets/CustomArtificialHorizon.qml">res/Custom/Widgets/CustomArtificialHorizon.qml</file>
-        <file alias="Custom/Widgets/CustomAttitudeWidget.qml">res/Custom/Widgets/CustomAttitudeWidget.qml</file>
-        <file alias="Custom/Widgets/CustomIconButton.qml">res/Custom/Widgets/CustomIconButton.qml</file>
-        <file alias="Custom/Widgets/CustomOnOffSwitch.qml">res/Custom/Widgets/CustomOnOffSwitch.qml</file>
-        <file alias="Custom/Widgets/CustomQuickButton.qml">res/Custom/Widgets/CustomQuickButton.qml</file>
-        <file alias="Custom/Widgets/CustomSignalStrength.qml">res/Custom/Widgets/CustomSignalStrength.qml</file>
-        <file alias="Custom/Widgets/CustomToolBarButton.qml">res/Custom/Widgets/CustomToolBarButton.qml</file>
-        <file alias="Custom/Widgets/CustomVehicleButton.qml">res/Custom/Widgets/CustomVehicleButton.qml</file>
-    </qresource>
     <qresource prefix="/Custom/qml">
         <file alias="QGroundControl/FlightDisplay/CustomGuidedActionsController.qml">src/CustomGuidedActionsController.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlyViewCustomLayer.qml">src/FlyViewCustomLayer.qml</file>
diff --git a/custom-example/src/CustomPlugin.cc b/custom-example/src/CustomPlugin.cc
index c5ef29a1615c..be2ee1b1ae21 100644
--- a/custom-example/src/CustomPlugin.cc
+++ b/custom-example/src/CustomPlugin.cc
@@ -19,7 +19,7 @@
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlFile>
 
-QGC_LOGGING_CATEGORY(CustomLog, "gcs.custom.customplugin")
+QGC_LOGGING_CATEGORY(CustomLog, "Custom.CustomPlugin")
 
 Q_APPLICATION_STATIC(CustomPlugin, _customPluginInstance);
 
@@ -94,23 +94,23 @@ bool CustomPlugin::overrideSettingsGroupVisibility(const QString &name)
     return true;
 }
 
-bool CustomPlugin::adjustSettingMetaData(const QString& settingsGroup, FactMetaData& metaData)
+void CustomPlugin::adjustSettingMetaData(const QString& settingsGroup, FactMetaData& metaData, bool &visible)
 {
-    const bool parentResult = QGCCorePlugin::adjustSettingMetaData(settingsGroup, metaData);
+    QGCCorePlugin::adjustSettingMetaData(settingsGroup, metaData, visible);
 
     if (settingsGroup == AppSettings::settingsGroup) {
         // This tells QGC than when you are creating Plans while not connected to a vehicle
         // the specific firmware/vehicle the plan is for.
         if (metaData.name() == AppSettings::offlineEditingFirmwareClassName) {
             metaData.setRawDefaultValue(QGCMAVLink::FirmwareClassPX4);
-            return false;
+            visible = false;
+            return;
         } else if (metaData.name() == AppSettings::offlineEditingVehicleClassName) {
             metaData.setRawDefaultValue(QGCMAVLink::VehicleClassMultiRotor);
-            return false;
+            visible = false;
+            return;
         }
     }
-
-    return parentResult;
 }
 
 void CustomPlugin::paletteOverride(const QString &colorName, QGCPalette::PaletteColorInfo_t& colorInfo)
@@ -276,7 +276,7 @@ void CustomPlugin::paletteOverride(const QString &colorName, QGCPalette::Palette
 QQmlApplicationEngine* CustomPlugin::createQmlApplicationEngine(QObject* parent)
 {
     _qmlEngine = QGCCorePlugin::createQmlApplicationEngine(parent);
-    _qmlEngine->addImportPath("qrc:/Custom/Widgets");
+    _qmlEngine->addImportPath("qrc:/qml/Custom/Widgets");
     // TODO: Investigate _qmlEngine->setExtraSelectors({"custom"})
 
     _selector = new CustomOverrideInterceptor();
diff --git a/custom-example/src/CustomPlugin.h b/custom-example/src/CustomPlugin.h
index cafb3a042cdf..ab821e9f8fa2 100644
--- a/custom-example/src/CustomPlugin.h
+++ b/custom-example/src/CustomPlugin.h
@@ -49,10 +49,6 @@ class CustomOptions : public QGCOptions
 
     // Overrides from QGCOptions
 
-    /// Normal QGC needs to work with an ESP8266 WiFi thing which is remarkably crappy. This in turns causes PX4 Pro calibration to fail
-    /// quite often. There is a warning in regular QGC about this. Overriding the and returning true means that your custom vehicle has
-    /// a reliable WiFi connection so don't show that warning.
-    bool wifiReliableForCalibration() const final { return true; }
     /// Firmware upgrade page is only shown in Advanced Mode.
     bool showFirmwareUpgrade() const final { return _plugin->showAdvancedUI(); }
     QGCFlyViewOptions *flyViewOptions() const final { return _flyViewOptions; }
@@ -81,7 +77,7 @@ class CustomPlugin : public QGCCorePlugin
     QString brandImageOutdoor() const final { return QStringLiteral("/custom/img/dronecode-black.svg"); }
     bool overrideSettingsGroupVisibility(const QString &name) final;
     /// This allows you to override/hide QGC Application settings
-    bool adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData) final;
+    void adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData, bool &visible) final;
     /// This modifies QGC colors palette to match possible custom corporate branding
     void paletteOverride(const QString &colorName, QGCPalette::PaletteColorInfo_t &colorInfo) final;
     /// We override this so we can get access to QQmlApplicationEngine and use it to register our qml module
diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
index 7d7021c0f13a..e4831f3b81e4 100644
--- a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
+++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.cc
@@ -16,7 +16,7 @@ CustomFirmwarePlugin::CustomFirmwarePlugin()
 {
     for (auto &mode: _flightModeList) {
         //-- Narrow the flight mode options to only these
-        if ((mode.mode_name != _holdFlightMode) && (mode.mode_name != _rtlFlightMode) && (mode.mode_name != _missionFlightMode)) {
+        if ((mode.mode_name != pauseFlightMode()) && (mode.mode_name != rtlFlightMode()) && (mode.mode_name != missionFlightMode())) {
             // No other flight modes can be set
             mode.canBeSet = false;
         }
diff --git a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.h b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.h
index fbd9c0605449..83a412d8c299 100644
--- a/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.h
+++ b/custom-example/src/FirmwarePlugin/CustomFirmwarePlugin.h
@@ -12,7 +12,6 @@
 #include "PX4FirmwarePlugin.h"
 
 class AutoPilotPlugin;
-class CustomCameraManager;
 class Vehicle;
 
 class CustomFirmwarePlugin : public PX4FirmwarePlugin
diff --git a/deploy/docker/Dockerfile-build-android b/deploy/docker/Dockerfile-build-android
index 48bb5b1a7e97..7057a6771e6c 100644
--- a/deploy/docker/Dockerfile-build-android
+++ b/deploy/docker/Dockerfile-build-android
@@ -27,7 +27,7 @@ RUN mkdir -p $ANDROID_SDK_ROOT/cmdline-tools/latest && \
     $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" "platforms;android-35" "build-tools;35.0.0" "ndk;26.1.10909125"
 
 # Qt setup and environment variables
-ENV QT_VERSION="6.8.3"
+ENV QT_VERSION="6.10.1"
 ENV QT_PATH="/opt/Qt"
 ENV QT_HOST="linux"
 ENV QT_HOST_ARCH="gcc_64"
diff --git a/deploy/docker/Dockerfile-build-ubuntu b/deploy/docker/Dockerfile-build-ubuntu
index da79df8b22ee..3558ec1063a1 100644
--- a/deploy/docker/Dockerfile-build-ubuntu
+++ b/deploy/docker/Dockerfile-build-ubuntu
@@ -38,7 +38,7 @@ RUN chmod +x /tmp/qt/*.sh && \
     /tmp/qt/install-qt-debian.sh && \
     rm -rf /tmp/qt   # keep the image slim
 
-ENV QT_ROOT_DIR=/opt/Qt/6.8.3/gcc_64
+ENV QT_ROOT_DIR=/opt/Qt/6.10.1/gcc_64
 ENV PATH=$QT_ROOT_DIR/bin:$PATH
 
 # ---------- Git safe directory (avoids “detected dubious ownership”) ----------
diff --git a/deploy/installer/packages/org.mavlink.qgroundcontrol/data/driver.msi b/deploy/installer/packages/org.mavlink.qgroundcontrol/data/driver.msi
deleted file mode 100644
index 7d89feef635c..000000000000
Binary files a/deploy/installer/packages/org.mavlink.qgroundcontrol/data/driver.msi and /dev/null differ
diff --git a/deploy/installer/packages/org.mavlink.qgroundcontrol/meta/installscript.js b/deploy/installer/packages/org.mavlink.qgroundcontrol/meta/installscript.js
index d200491f6da8..76152b20f52e 100644
--- a/deploy/installer/packages/org.mavlink.qgroundcontrol/meta/installscript.js
+++ b/deploy/installer/packages/org.mavlink.qgroundcontrol/meta/installscript.js
@@ -12,8 +12,6 @@ Component.prototype.createOperations = function()
     }
 
     if (systemInfo.productType === "windows") {
-        component.addElevatedOperation("Execute", "msiexec", ["/i", "@TargetDir@/driver.msi", "/qn"]);
-
         component.addOperation("CreateShortcut", "@TargetDir@/bin/qgroundcontrol.exe", "@StartMenuDir@/QGroundControl.lnk");
         component.addOperation("CreateShortcut", "@TargetDir@/bin/qgroundcontrol.exe", "@DesktopDir@/QGroundControl.lnk");
     }
diff --git a/deploy/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/deploy/ios/Images.xcassets/AppIcon.appiconset/Contents.json
index 001862ca607d..c0ecf32e5c0e 100644
--- a/deploy/ios/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/deploy/ios/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -113,4 +113,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
\ No newline at end of file
+}
diff --git a/deploy/ios/Images.xcassets/Contents.json b/deploy/ios/Images.xcassets/Contents.json
index da4a164c9186..2d92bd53fdb2 100644
--- a/deploy/ios/Images.xcassets/Contents.json
+++ b/deploy/ios/Images.xcassets/Contents.json
@@ -3,4 +3,4 @@
     "version" : 1,
     "author" : "xcode"
   }
-}
\ No newline at end of file
+}
diff --git a/deploy/ios/Info.plist.app.in b/deploy/ios/Info.plist.app.in
index c6b7804db84c..01d07915eba3 100644
--- a/deploy/ios/Info.plist.app.in
+++ b/deploy/ios/Info.plist.app.in
@@ -47,4 +47,3 @@
     <string>Qt Multimedia Example</string>
 </dict>
 </plist>
-
diff --git a/deploy/ios/iOSForAppStore-Info-Source.plist b/deploy/ios/iOSForAppStore-Info-Source.plist
index a4733d71c976..1374c48e30ed 100644
--- a/deploy/ios/iOSForAppStore-Info-Source.plist
+++ b/deploy/ios/iOSForAppStore-Info-Source.plist
@@ -51,7 +51,7 @@
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Ground Station Location</string>
     <key>NSBluetoothPeripheralUsageDescription</key>
-    <string>QGroundControl would like to use bluetooth.</string>    
+    <string>QGroundControl would like to use bluetooth.</string>
 	<key>UIRequiresFullScreen</key>
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>
diff --git a/deploy/linux/appimagecraft.yml b/deploy/linux/appimagecraft.yml
index 72429ca25f20..b8b2c5397ba3 100644
--- a/deploy/linux/appimagecraft.yml
+++ b/deploy/linux/appimagecraft.yml
@@ -8,7 +8,7 @@ build:
   cmake:
     source_dir: src/
     extra_variables:
-     - Qt6_ROOT=/home/runner/work/_temp/Qt/6.8.3/gcc_64
+      - Qt6_ROOT=/home/runner/work/_temp/Qt/6.10.1/gcc_64
   environment:
     BUILD_TYPE: Release
 
diff --git a/deploy/vagrant/.vagrantconfig.yml b/deploy/vagrant/.vagrantconfig.yml
index b8f881a44736..ed7ecd7541bb 100644
--- a/deploy/vagrant/.vagrantconfig.yml
+++ b/deploy/vagrant/.vagrantconfig.yml
@@ -3,10 +3,10 @@ configs:
         'qt_deps_unpack_parent_dir': '/home/vagrant'
 
         'qt_deps_unpack_dir': '/home/vagrant/Qt'
-        'qt_deps_bin_unpack_dir': '/home/vagrant/Qt/6.8.3/gcc_64/bin'
-        'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/6.8.3/gcc_64/lib'
-        'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/6.8.3/gcc_64/plugins'
-        'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/6.8.3/gcc_64/qml'
+        'qt_deps_bin_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/bin'
+        'qt_deps_lib_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/lib'
+        'qt_deps_plugins_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/plugins'
+        'qt_deps_qml_unpack_dir': '/home/vagrant/Qt/6.10.1/gcc_64/qml'
 
         'project_root_dir': '/vagrant'
 
diff --git a/deploy/vagrant/Vagrantfile b/deploy/vagrant/Vagrantfile
index f4904ef35078..68eb3f24a54d 100644
--- a/deploy/vagrant/Vagrantfile
+++ b/deploy/vagrant/Vagrantfile
@@ -91,10 +91,10 @@ Vagrant.configure(2) do |config|
      apt-get install -y patchelf
 
      dir="%{qt_deps_unpack_dir}"
-     version="6.8.3"
+     version="6.10.1"
      host="linux"
      target="desktop"
-     modules="qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors"
+     modules="qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml"
      su - vagrant -c "rm -rf ${dir}"
      su - vagrant -c "mkdir -p ${dir}"
      su - vagrant -c "python3 -m aqt install-qt -O ${dir} ${host} ${target} ${version} -m ${modules}"
diff --git a/deploy/windows/QGroundControl.rc b/deploy/windows/QGroundControl.rc
index 083429a40636..e9f8e24a88b6 100644
--- a/deploy/windows/QGroundControl.rc
+++ b/deploy/windows/QGroundControl.rc
@@ -1 +1 @@
-IDI_ICON1    ICON    DISCARDABLE     "./WindowsQGC.ico"
+IDI_ICON1    ICON    DISCARDABLE     "./WindowsQGC.ico"
diff --git a/deploy/windows/QGroundControl.rc.in b/deploy/windows/QGroundControl.rc.in
index 0d9a95a72b00..b0ca503e42b6 100644
--- a/deploy/windows/QGroundControl.rc.in
+++ b/deploy/windows/QGroundControl.rc.in
@@ -1,32 +1,32 @@
-#include "winver.h"
-
-IDI_ICON1 ICON "@QGC_WINDOWS_ICON_PATH@"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
- PRODUCTVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
- FILEFLAGS 0x0L
- FILEFLAGSMASK 0x3fL
- FILEOS 0x00040004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName", "@QGC_ORG_NAME@"
-            VALUE "FileDescription", "@CMAKE_PROJECT_NAME@"
-            VALUE "FileVersion", "@CMAKE_PROJECT_VERSION@"
-            VALUE "LegalCopyright", "@QGC_APP_COPYRIGHT@"
-            VALUE "InternalName", "@CMAKE_PROJECT_NAME@"
-            VALUE "OriginalFilename", "@CMAKE_PROJECT_NAME@.exe"
-            VALUE "ProductName", "@CMAKE_PROJECT_NAME@"
-            VALUE "ProductVersion", "@CMAKE_PROJECT_VERSION@"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
+#include "winver.h"
+
+IDI_ICON1 ICON "@QGC_WINDOWS_ICON_PATH@"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
+ PRODUCTVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
+ FILEFLAGS 0x0L
+ FILEFLAGSMASK 0x3fL
+ FILEOS 0x00040004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "@QGC_ORG_NAME@"
+            VALUE "FileDescription", "@CMAKE_PROJECT_NAME@"
+            VALUE "FileVersion", "@CMAKE_PROJECT_VERSION@"
+            VALUE "LegalCopyright", "@QGC_APP_COPYRIGHT@"
+            VALUE "InternalName", "@CMAKE_PROJECT_NAME@"
+            VALUE "OriginalFilename", "@CMAKE_PROJECT_NAME@.exe"
+            VALUE "ProductName", "@CMAKE_PROJECT_NAME@"
+            VALUE "ProductVersion", "@CMAKE_PROJECT_VERSION@"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
diff --git a/deploy/windows/driver-msi-README.md b/deploy/windows/driver-msi-README.md
deleted file mode 100644
index 3c90adbbaf4d..000000000000
--- a/deploy/windows/driver-msi-README.md
+++ /dev/null
@@ -1 +0,0 @@
-The driver.msi file is pulled from https://firmware.ardupilot.org/Tools/MissionPlanner/driver.msi
\ No newline at end of file
diff --git a/deploy/windows/driver.msi b/deploy/windows/driver.msi
deleted file mode 100644
index 7d89feef635c..000000000000
Binary files a/deploy/windows/driver.msi and /dev/null differ
diff --git a/deploy/windows/nullsoft_installer.nsi b/deploy/windows/nullsoft_installer.nsi
index 71a45c42b5cb..275f3fef489f 100644
--- a/deploy/windows/nullsoft_installer.nsi
+++ b/deploy/windows/nullsoft_installer.nsi
@@ -1,163 +1,160 @@
-!include "MUI2.nsh"
-!include LogicLib.nsh
-!include Win\COM.nsh
-!include Win\Propkey.nsh
-!include "FileFunc.nsh"
-
-!macro DemoteShortCut target
-    !insertmacro ComHlpr_CreateInProcInstance ${CLSID_ShellLink} ${IID_IShellLink} r0 ""
-    ${If} $0 <> 0
-            ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
-            ${If} $1 P<> 0
-                    ${IPersistFile::Load} $1 '("${target}",1)'
-                    ${IUnknown::Release} $1 ""
-            ${EndIf}
-            ${IUnknown::QueryInterface} $0 '("${IID_IPropertyStore}",.r1)'
-            ${If} $1 P<> 0
-                    System::Call '*${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_StartPinOption})p.r2'
-                    System::Call '*${SYSSTRUCT_PROPVARIANT}(${VT_UI4},,&i4 ${APPUSERMODEL_STARTPINOPTION_NOPINONINSTALL})p.r3'
-                    ${IPropertyStore::SetValue} $1 '($2,$3)'
-
-                    ; Reuse the PROPERTYKEY & PROPVARIANT buffers to set another property
-                    System::Call '*$2${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_ExcludeFromShowInNewInstall})'
-                    System::Call '*$3${SYSSTRUCT_PROPVARIANT}(${VT_BOOL},,&i2 ${VARIANT_TRUE})'
-                    ${IPropertyStore::SetValue} $1 '($2,$3)'
-
-                    System::Free $2
-                    System::Free $3
-                    ${IPropertyStore::Commit} $1 ""
-                    ${IUnknown::Release} $1 ""
-            ${EndIf}
-            ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
-            ${If} $1 P<> 0
-                    ${IPersistFile::Save} $1 '("${target}",1)'
-                    ${IUnknown::Release} $1 ""
-            ${EndIf}
-            ${IUnknown::Release} $0 ""
-    ${EndIf}
-!macroend
-
-Name "${APPNAME}"
-Var StartMenuFolder
-
-InstallDir "$PROGRAMFILES64\${APPNAME}"
-
-SetCompressor /SOLID /FINAL lzma
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${HEADER_BITMAP}";
-!define MUI_ICON "${INSTALLER_ICON}";
-!define MUI_UNICON "${INSTALLER_ICON}";
-
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-Section
-  DetailPrint "Checking for 32 bit uninstaller"
-  SetRegView 32
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString"
-  StrCmp $R0 "" check64BitUninstall doUninstall
-
-check64BitUninstall:
-  DetailPrint "Checking for 64 bit  uninstaller"
-  SetRegView 64
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString"
-  StrCmp $R0 "" doInstall
-
-doUninstall:
-  DetailPrint "Uninstalling previous version..."
-  ExecWait "$R0 /S -LEAVE_DATA=1 _?=$INSTDIR"
-  IntCmp $0 0 doInstall
-
-  MessageBox MB_OK|MB_ICONEXCLAMATION \
-        "Could not remove a previously installed ${APPNAME} version.$\n$\nPlease remove it before continuing."
-  Abort
-
-doInstall:
-  SetRegView 64
-  SetOutPath $INSTDIR
-  File /r /x ${EXENAME}.pdb /x ${EXENAME}.lib /x ${EXENAME}.exp ${DESTDIR}\*.*
-
-  ; Driver location is http://firmware.ardupilot.org/Tools/MissionPlanner/driver.msi
-  ; Whenever this driver is updated in the repo QGCCURRENTDRIVERVERSION must be bumped by 1
-  File ${DRIVER_MSI}
-
-  WriteUninstaller $INSTDIR\${EXENAME}-Uninstall.exe
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
-  WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\${EXENAME}-Uninstall.exe$\""
-  WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpCount" 5
-  WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpType" 1
-  WriteRegExpandStr HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpFolder" "%LOCALAPPDATA%\QGCCrashDumps"
-
-  ; QGC stores its own driver version key to prevent installation if already up to date
-  ; This prevents running the driver install a second time which will start up in repair mode which is confusing
-  !define QGCDRIVERVERSIONKEY "SOFTWARE\QGroundControlUAVDrivers"
-  !define QGCCURRENTDRIVERVERSION 3
-
-  ; If the drivers are already installed the key "HKCU/SOFTWARE\MichaelOborne\driver\installed" will be present and set to 1
-  SetRegView 64
-  !define DRIVERKEY "SOFTWARE\MichaelOborne\driver"
-  ReadRegDWORD $0 HKCU "${DRIVERKEY}" "installed"
-  IntCmp $0 1 driversInstalled driversNotInstalled driversNotInstalled
-
-driversInstalled:
-  DetailPrint "UAV Drivers already installed. Checking version..."
-  ; Check if the installed drivers are out of date.
-  ; Missing key also indicates out of date driver install.
-  ReadRegDWORD $0 HKCU "${QGCDRIVERVERSIONKEY}" "version"
-  IntCmp $0 ${QGCCURRENTDRIVERVERSION} done driversOutOfDate done
-
-driversOutOfDate:
-  DetailPrint "UAV Drivers out of date."
-  goto installDrivers
-
-driversNotInstalled:
-  DetailPrint "UAV Drivers not installed."
-  ; Delete abandoned possibly out of date version key
-  DeleteRegKey HKCU "SOFTWARE\QGroundControlUAVDrivers"
-
-installDrivers:
-  DetailPrint "Installing UAV Drivers..."
-  ExecWait '"msiexec" /i "driver.msi"'
-  ; Set current driver version value
-  WriteRegDWORD HKCU "${QGCDRIVERVERSIONKEY}" "version" ${QGCCURRENTDRIVERVERSION}
-  goto done
-
-done:
-  SetRegView lastused
-SectionEnd
-
-Section "Uninstall"
-  SetRegView 64
-  ${GetParameters} $R0
-  ${GetOptions} $R0 "-LEAVE_DATA=" $R1
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
-  SetShellVarContext all
-  RMDir /r /REBOOTOK $INSTDIR
-  RMDir /r /REBOOTOK "$SMPROGRAMS\$StartMenuFolder\"
-  SetShellVarContext current
-  ${If} $R1 != 1
-    RMDir /r /REBOOTOK "$APPDATA\${ORGNAME}\"
-  ${Endif}
-  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
-  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe"
-  ; NOTE: We specifically do not delete the driver version key since we need it to persist around uninstalls
-SectionEnd
-
-Section "create Start Menu Shortcuts"
-  SetRegView 64
-  SetShellVarContext all
-  CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" "$INSTDIR\bin\${EXENAME}.exe" "" "$INSTDIR\bin\${EXENAME}.exe" 0
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Compatibility Mode).lnk" "$INSTDIR\bin\${EXENAME}.exe" "-desktop" "$INSTDIR\bin\${EXENAME}.exe" 0
-  !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Compatibility Mode).lnk"
-  CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Safe Mode).lnk" "$INSTDIR\bin\${EXENAME}.exe" "-swrast" "$INSTDIR\bin\${EXENAME}.exe" 0
-  !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Safe Mode).lnk"
-SectionEnd
-
+!include "MUI2.nsh"
+!include "LogicLib.nsh"
+!include "Win\COM.nsh"
+!include "Win\Propkey.nsh"
+!include "FileFunc.nsh"
+
+RequestExecutionLevel admin
+
+!macro DemoteShortCut target
+    !insertmacro ComHlpr_CreateInProcInstance ${CLSID_ShellLink} ${IID_IShellLink} r0 ""
+    ${If} $0 <> 0
+        ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+        ${If} $1 P<> 0
+            ${IPersistFile::Load} $1 '("${target}",1)'
+            ${IUnknown::Release} $1 ""
+        ${EndIf}
+        ${IUnknown::QueryInterface} $0 '("${IID_IPropertyStore}",.r1)'
+        ${If} $1 P<> 0
+            System::Call '*${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_StartPinOption})p.r2'
+            System::Call '*${SYSSTRUCT_PROPVARIANT}(${VT_UI4},,&i4 ${APPUSERMODEL_STARTPINOPTION_NOPINONINSTALL})p.r3'
+            ${IPropertyStore::SetValue} $1 '($2,$3)'
+
+            System::Call '*$2${SYSSTRUCT_PROPERTYKEY}(${PKEY_AppUserModel_ExcludeFromShowInNewInstall})'
+            System::Call '*$3${SYSSTRUCT_PROPVARIANT}(${VT_BOOL},,&i2 ${VARIANT_TRUE})'
+            ${IPropertyStore::SetValue} $1 '($2,$3)'
+
+            System::Free $2
+            System::Free $3
+            ${IPropertyStore::Commit} $1 ""
+            ${IUnknown::Release} $1 ""
+        ${EndIf}
+        ${IUnknown::QueryInterface} $0 '("${IID_IPersistFile}",.r1)'
+        ${If} $1 P<> 0
+            ${IPersistFile::Save} $1 '("${target}",1)'
+            ${IUnknown::Release} $1 ""
+        ${EndIf}
+        ${IUnknown::Release} $0 ""
+    ${EndIf}
+!macroend
+
+Name "${APPNAME}"
+Var StartMenuFolder
+
+InstallDir "$PROGRAMFILES64\${APPNAME}"
+SetCompressor /SOLID /FINAL lzma
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "${HEADER_BITMAP}"
+!define MUI_ICON "${INSTALLER_ICON}"
+!define MUI_UNICON "${INSTALLER_ICON}"
+
+!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Install" SecMain
+    SectionIn RO
+    DetailPrint "Checking for 64 bit uninstaller"
+    SetRegView 64
+    ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString"
+    StrCmp $R0 "" doInstall checkUninstaller
+
+checkUninstaller:
+    ; Remove quotes from uninstaller path to check if file exists
+    StrCpy $R1 $R0 "" 1  ; Skip first quote
+    StrLen $R2 $R1
+    IntOp $R2 $R2 - 1    ; Remove last quote
+    StrCpy $R1 $R1 $R2
+
+    DetailPrint "Checking if uninstaller exists: $R1"
+    IfFileExists "$R1" doUninstall cleanupOrphanedRegistry
+
+cleanupOrphanedRegistry:
+    DetailPrint "Previous uninstaller not found, cleaning up orphaned registry keys..."
+    SetRegView 64
+    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe"
+    Goto doInstall
+
+doUninstall:
+    DetailPrint "Uninstalling previous version..."
+    ClearErrors
+    ExecWait "$R0 /S -LEAVE_DATA=1 _?=$INSTDIR"
+    ${If} ${Errors}
+        MessageBox MB_OK|MB_ICONEXCLAMATION "Failed to start previous uninstaller."
+        Abort
+    ${EndIf}
+    IntCmp $0 0 doInstall
+    MessageBox MB_OK|MB_ICONEXCLAMATION "Could not remove a previously installed ${APPNAME} version.$\n$\nPlease remove it before continuing."
+    Abort
+
+doInstall:
+    SetRegView 64
+    SetOutPath $INSTDIR
+    ; Install payload
+    File /r /x ${EXENAME}.pdb /x ${EXENAME}.lib /x ${EXENAME}.exp ${DESTDIR}\*.*
+
+    ; Create uninstaller and ARP data
+    WriteUninstaller "$INSTDIR\${EXENAME}-Uninstall.exe"
+    WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName"    "${APPNAME}"
+    WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\${EXENAME}-Uninstall.exe$\""
+    WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon"     "$INSTDIR\bin\${EXENAME}.exe"
+    WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$INSTDIR"
+    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
+    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1
+    !ifdef ORGNAME
+        WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${ORGNAME}"
+    !endif
+    !ifdef APPVERSION
+        WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${APPVERSION}"
+    !endif
+
+    ; WER dumps for crash triage
+    WriteRegDWORD    HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpCount" 5
+    WriteRegDWORD    HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpType" 1
+    WriteRegExpandStr HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpFolder" "%LOCALAPPDATA%\QGCCrashDumps"
+
+done:
+    SetRegView lastused
+SectionEnd
+
+Section "Uninstall"
+    SetRegView 64
+    ${GetParameters} $R0
+    ${GetOptions} $R0 "-LEAVE_DATA=" $R1
+    !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+
+    ; Remove files and shortcuts
+    SetShellVarContext all
+    RMDir /r /REBOOTOK "$INSTDIR"
+    RMDir /r /REBOOTOK "$SMPROGRAMS\$StartMenuFolder\"
+    SetShellVarContext current
+
+    ${If} $R1 != 1
+        RMDir /r /REBOOTOK "$APPDATA\${ORGNAME}\"
+    ${EndIf}
+
+    ; Remove ARP + WER
+    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe"
+SectionEnd
+
+Section "Create Start Menu Shortcuts"
+    SetRegView 64
+    SetShellVarContext all
+    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" "$INSTDIR\bin\${EXENAME}.exe" "" "$INSTDIR\bin\${EXENAME}.exe" 0
+        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Compatibility Mode).lnk" "$INSTDIR\bin\${EXENAME}.exe" "-desktop" "$INSTDIR\bin\${EXENAME}.exe" 0
+        !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Compatibility Mode).lnk"
+        CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Safe Mode).lnk" "$INSTDIR\bin\${EXENAME}.exe" "-swrast" "$INSTDIR\bin\${EXENAME}.exe" 0
+        !insertmacro DemoteShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME} (GPU Safe Mode).lnk"
+    !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
diff --git a/docs/.vitepress/config.mjs b/docs/.vitepress/config.mjs
index 5e340471ee71..f45ee74f24be 100644
--- a/docs/.vitepress/config.mjs
+++ b/docs/.vitepress/config.mjs
@@ -3,7 +3,7 @@ import { defineConfig } from "vitepress";
 
 // https://vitepress.dev/reference/site-config
 export default defineConfig({
-  title: "QGC Guide (master)",
+  title: "QGC Guide",
   description:
     "How to use and develop QGroundControl for PX4 or ArduPilot powered vehicles.",
   ignoreDeadLinks: true, // Do this for stable, where we don't yet have all translations
diff --git a/docs/.vitepress/theme/style.css b/docs/.vitepress/theme/style.css
index 1bd56ff29161..7a3c337f2aa5 100644
--- a/docs/.vitepress/theme/style.css
+++ b/docs/.vitepress/theme/style.css
@@ -8,7 +8,7 @@
  *
  * Each colors have exact same color scale system with 3 levels of solid
  * colors with different brightness, and 1 soft color.
- * 
+ *
  * - `XXX-1`: The most solid color used mainly for colored text. It must
  *   satisfy the contrast ratio against when used on top of `XXX-soft`.
  *
diff --git a/docs/en/qgc-dev-guide/contribute/pull_requests.md b/docs/en/qgc-dev-guide/contribute/pull_requests.md
index fe120dcf7dca..e4bb4b9f2456 100644
--- a/docs/en/qgc-dev-guide/contribute/pull_requests.md
+++ b/docs/en/qgc-dev-guide/contribute/pull_requests.md
@@ -1,3 +1,16 @@
 # Pull Requests
 
 All pull requests go through the QGC CI build system which builds release and debug version. Builds will fail if there are compiler warnings. Also unit tests are run against supported OS debug builds.
+
+## Automatic Release Note Generation
+
+Releases notes are generated from the following GitHub labels qhich should be set on Pull Requests as appropriate:
+
+* "RN: MAJOR FEATURE"
+* "RN: MINOR FEATURE"
+* "RN: IMPROVEMENT"
+* "RN: REFACTORING"
+* "RN: BUGFIX"
+* "RN: NEW BOARD SUPPORT"
+
+There are also a set of the above labels which end in "- CUSTOM BUILD" which indicate the changes is associated with the custom build architecture.
diff --git a/docs/en/qgc-dev-guide/contribute/unit_tests.md b/docs/en/qgc-dev-guide/contribute/unit_tests.md
index b76a38e17eec..b126b7a383c3 100644
--- a/docs/en/qgc-dev-guide/contribute/unit_tests.md
+++ b/docs/en/qgc-dev-guide/contribute/unit_tests.md
@@ -2,7 +2,7 @@
 
 _QGroundControl_ (QGC) contains a set of unit tests that must pass before a pull request will be accepted. The addition of new complex subsystems to QGC should include a corresponding new unit test to test it.
 
-The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/src/qgcunittest/UnitTestList.cc).
+The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/test/UnitTestList.cc).
 
 To run unit tests:
 
diff --git a/docs/en/qgc-dev-guide/custom_build/fork_repo.md b/docs/en/qgc-dev-guide/custom_build/fork_repo.md
index 22a4cddef91d..d36348dff658 100644
--- a/docs/en/qgc-dev-guide/custom_build/fork_repo.md
+++ b/docs/en/qgc-dev-guide/custom_build/fork_repo.md
@@ -4,7 +4,7 @@
 * Copy the `custom_example` directory to a new `custom` directory at the root of the repo.
 * Tweak the source in `custom` directory as needed.
 
-You can also rename the `custom_example` directory to `custom` but that can lead to merge problems when you bring your fork up to date with newer upstream version of regular QGC.
+You can also rename the `custom-example` directory to `custom` but that can lead to merge problems when you bring your fork up to date with newer upstream version of regular QGC.
 
 
 ## Modifying Mainline QGC Source Code
diff --git a/docs/en/qgc-dev-guide/custom_build/mavlink.md b/docs/en/qgc-dev-guide/custom_build/mavlink.md
index 2c38063b59c2..f64ed354253e 100644
--- a/docs/en/qgc-dev-guide/custom_build/mavlink.md
+++ b/docs/en/qgc-dev-guide/custom_build/mavlink.md
@@ -19,4 +19,4 @@ To modify the version of MAVLink used by QGC:
   Just add to [/qgroundcontrol/cmake/CustomOptions.cmake](../../../../cmake/CustomOptions.cmake):
   ```cmake
   set(CPM_mavlink_SOURCE "/path/to/your/custom/mavlink")
-  ```
\ No newline at end of file
+  ```
diff --git a/docs/en/qgc-dev-guide/custom_build/resource_override.md b/docs/en/qgc-dev-guide/custom_build/resource_override.md
index 572c1ad03026..097776f34d54 100644
--- a/docs/en/qgc-dev-guide/custom_build/resource_override.md
+++ b/docs/en/qgc-dev-guide/custom_build/resource_override.md
@@ -11,4 +11,4 @@ By overriding a resource you can replace it with your own version of it. This co
 
 Resource overrides work by using `QQmlEngine::addUrlInterceptor` to intercept requests for resources and re-route the request to available custom resources instead of the normal resource. Look at [custom_example/CustomPlugin.cc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CustomPlugin.cc) for how it's done and replicate that in your own custom build source.
 
-Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
\ No newline at end of file
+Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
diff --git a/docs/en/qgc-dev-guide/custom_build/toolbar.md b/docs/en/qgc-dev-guide/custom_build/toolbar.md
index 662cb8db4ae9..e4dae8b2607c 100644
--- a/docs/en/qgc-dev-guide/custom_build/toolbar.md
+++ b/docs/en/qgc-dev-guide/custom_build/toolbar.md
@@ -30,10 +30,6 @@ These provide information to the user which is not associated with a vehicle. Fo
 
 These are indicators which are associated with information about the vehicle. They are only available when a vehicle is connected. To manipulate the list of vehicle indicators you override `FirmwarePlugin::toolIndicators`.
 
-#### Vehicle Mode Indicators
-
-These are indicators which are associated with information about the vehicle. They require additional UI provided by the Fly View to complete their actions. An example is Arming and Disarming. They are only available when a vehicle is connected. To manipulate the list of vehicle mode indicators you override `FirmwarePlugin::modeIndicators`.
-
 ### Modifying the toolbar UI itself
 
 This is accomplished by using resource overrides on the qml files associated with the toolbar. This provides a high level of customization but also a higher level of complexity. The primary ui for the toolbar is in `MainToolBar.qml`. The main window code in `MainRootWindow.qml` interacts with the toolbar to show different indicator sections based on current view as well as whether the mode indicators show or not also based on current view.
diff --git a/docs/en/qgc-dev-guide/getting_started/index.md b/docs/en/qgc-dev-guide/getting_started/index.md
index f30fa5d05d1b..fba801e7b888 100644
--- a/docs/en/qgc-dev-guide/getting_started/index.md
+++ b/docs/en/qgc-dev-guide/getting_started/index.md
@@ -1,5 +1,5 @@
 ---
-qt_version: 6.8.3
+qt_version: 6.10.1
 ---
 
 # Getting Started with Source and Builds
@@ -47,9 +47,9 @@ We support Linux builds using a container found on the source tree of the reposi
 ### Native Builds
 
 _QGroundControl_ builds are supported for macOS, Linux, Windows, and Android. Creating a version of QGC for iOS is theoretically possible but is no longer supported as a standard build.
-_QGroundControl_ uses [Qt](http://www.qt.io) as its cross-platform support library. 
+_QGroundControl_ uses [Qt](http://www.qt.io) as its cross-platform support library.
 
-The required version of Qt is {{ $frontmatter.qt_version }} **(only)**. 
+The required version of Qt is {{ $frontmatter.qt_version }} **(only)**.
 
   ::: warning
   **Do not use any other version of Qt!**
@@ -70,7 +70,7 @@ To install Qt:
      - Set the downloaded file to executable using: `chmod +x`.
      - You may also need to install libxcb-cursor0
 
-1. On the _Installation Folder_ page select "Custom Installation"    
+1. On the _Installation Folder_ page select "Custom Installation"  
 
 1. On the _Select Components_ page:
 
@@ -88,10 +88,9 @@ To install Qt:
    - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
    - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
    - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
-   - **Mac** `sh qgroundcontrol/tools/setup/macos-dependencies.sh`
-   - **Android** [Setup](https://doc.qt.io/qt-6/android-getting-started.html). JDK17 is required for the latest updated versions. NDK Version: 25.1.8937393
-       You can confirm it is being used by reviewing the project setting: **Projects > Manage Kits > Devices > Android (tab) > Android Settings > _JDK location_**.
-	Note: Visit here for more detailed configurations [android.yml](.github/workflows/android.yml)
+   - **Mac** `sh qgroundcontrol/tools/setup/install-dependencies-osx.sh`
+   - **Windows** `qgroundcontrol/tools/setup/install-depedencies-windows.ps1`
+   - **Android** Installing dependencies for android is quite involved. You are better off using Qt documentation for android setup instructions. Search for "Qt 6.10 android" on the internet to find the correct "Gettting Started with Qt for Android" page. Read it full and carefully! An example of what you are looking for is [here](https://doc.qt.io/qt-6/android-getting-started.html).
 
 1. Install Optional/OS-Specific Functionality
 
@@ -137,11 +136,18 @@ Example commands to build a default QGC and run it afterwards:
 1. Configure:
 
    ```sh
-   ~/Qt/6.8.3/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+   ~/Qt/{{ $frontmatter.qt_version }}/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
    ```
 
    Change the directory for qt-cmake to match your install location for Qt and the kit you want to use.
 
+   **Mac**: To Sign/Notarize/Staple the QGC app bundle, add `-DQGC_MACOS_SIGN_WITH_IDENTITY=ON` to the configure command line. During the `install` phase the following environment variables will need to be available:
+
+   * `QGC_MACOS_SIGNING_IDENTITY` - Signing identity for your Developer ID certificate which must be in the keychain
+   * `QGC_MACOS_NOTARIZATION_USERNAME` - Username for your Apple Developer Account
+   * `QGC_MACOS_NOTARIZATION_PASSWORD` - App specific password for Notarization from your Apple Developer Account
+   * `QGC_MACOS_NOTARIZATION_TEAM_ID` - Apple Developer Account Team ID
+
 1. Build
 
    ```sh
diff --git a/docs/en/qgc-user-guide/fly_view/camera_tools.md b/docs/en/qgc-user-guide/fly_view/camera_tools.md
index 69dc11226735..a1cd5980e3c4 100644
--- a/docs/en/qgc-user-guide/fly_view/camera_tools.md
+++ b/docs/en/qgc-user-guide/fly_view/camera_tools.md
@@ -26,4 +26,4 @@ Most of the settings that are displayed depend on the camera (they are defined i
 The video page is used to enable/disable video streaming.
 When enabled, you can start/stop the video stream, enable a grid overlay, change how the image fits the screen, and record the video locally with QGC.
 
-![Instrument Page - Video Stream](../../../assets/fly/instrument_page_video_stream.jpg)
\ No newline at end of file
+![Instrument Page - Video Stream](../../../assets/fly/instrument_page_video_stream.jpg)
diff --git a/docs/en/qgc-user-guide/fly_view/fly_tools.md b/docs/en/qgc-user-guide/fly_view/fly_tools.md
index d3c298f4d673..292d05ee1ea3 100644
--- a/docs/en/qgc-user-guide/fly_view/fly_tools.md
+++ b/docs/en/qgc-user-guide/fly_view/fly_tools.md
@@ -55,4 +55,4 @@ You can change altitude while flying, except when in a mission:
 1. Press the **Actions** button on the _Fly Tools_
 1. Select the _Change Altitude_ button
 2. Select the new altitude from the vertical slider
-3. Confirm the action
\ No newline at end of file
+3. Confirm the action
diff --git a/docs/en/qgc-user-guide/fly_view/fly_view_toolbar.md b/docs/en/qgc-user-guide/fly_view/fly_view_toolbar.md
index 35568c04e9b3..50457b484cbe 100644
--- a/docs/en/qgc-user-guide/fly_view/fly_view_toolbar.md
+++ b/docs/en/qgc-user-guide/fly_view/fly_view_toolbar.md
@@ -55,7 +55,7 @@ The Vehicle Messages indicator dropdown shows you messages which come from the v
 
 ## GPS
 
-The GPS indicator shows you the satellite count and the HDOP in the toolbar icon. The dropdown shows you additional GPS status. The expanded page give you access to RTK settings. 
+The GPS indicator shows you the satellite count and the HDOP in the toolbar icon. The dropdown shows you additional GPS status. The expanded page give you access to RTK settings.
 
 ## Battery
 
@@ -73,6 +73,6 @@ There are other indicators which only show in certain situations:
 
 * Telemetry RSSI
 * RC RSSI
-* Gimbal
+* Gimbal - Only displayed if the vehicle supports the [Mavlink Gimbal Protocol](https://mavlink.io/en/services/gimbal_v2.html)
 * VTOL transitions
 * Select from multiple connected vehicles
diff --git a/docs/en/qgc-user-guide/fly_view/hud.md b/docs/en/qgc-user-guide/fly_view/hud.md
index b367c54d8ecf..feb14f251f40 100644
--- a/docs/en/qgc-user-guide/fly_view/hud.md
+++ b/docs/en/qgc-user-guide/fly_view/hud.md
@@ -118,7 +118,7 @@ The Vehicle Messages Indicator dropdown shows you messages which come from the v
 
 ![Vehicle state - ready to fly green/ready background](../../../assets/fly/toolbar/gps_indicator.png)
 
-The GPS Indicator shows you the satellite count and the HDOP in the toolbar icon. The dropdown shows you additional GPS status. The expanded page give you access to RTK settings. 
+The GPS Indicator shows you the satellite count and the HDOP in the toolbar icon. The dropdown shows you additional GPS status. The expanded page give you access to RTK settings.
 ### Battery Indicator
 
 ![Vehicle state - ready to fly green/ready background](../../../assets/fly/toolbar/battery_indicator.png)
diff --git a/docs/en/qgc-user-guide/fly_view/instrument_panel.md b/docs/en/qgc-user-guide/fly_view/instrument_panel.md
index b7b70ead3729..b0b52575b26a 100644
--- a/docs/en/qgc-user-guide/fly_view/instrument_panel.md
+++ b/docs/en/qgc-user-guide/fly_view/instrument_panel.md
@@ -29,4 +29,4 @@ By default this is the vehicle, but you can use the selector to choose a particu
 
 The selection list on the top right is used to select a particular telemetry value for the vehicle or sensor.
 
-![Instrument Panel - value options](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
\ No newline at end of file
+![Instrument Panel - value options](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
diff --git a/docs/en/qgc-user-guide/getting_started/download_and_install.md b/docs/en/qgc-user-guide/getting_started/download_and_install.md
index ba5e3959d9d5..e87dd2077cfe 100644
--- a/docs/en/qgc-user-guide/getting_started/download_and_install.md
+++ b/docs/en/qgc-user-guide/getting_started/download_and_install.md
@@ -16,7 +16,7 @@ For the best experience and compatibility, we recommend you the newest version o
 
 ## Windows {#windows}
 
-_QGroundControl_ can be installed on 64 bit versions of Windows 10 (1809 or later) or Windows 11:
+Supported versions: Windows 10 (1809 or later), Windows 11:
 
 1. Download [QGroundControl-installer.exe](https://d176tv9ibo4jno.cloudfront.net/latest/QGroundControl-installer.exe).
 1. Double click the executable to launch the installer.
@@ -27,9 +27,9 @@ Use the first shortcut unless you experience startup or video rendering issues.
 For more information see [Troubleshooting QGC Setup > Windows: UI Rendering/Video Driver Issues](../troubleshooting/qgc_setup.md#opengl_troubleshooting).
 :::
 
-## Mac OS X {#macOS}
+## Mac OS {#macOS}
 
-_QGroundControl_ can be installed on macOS 12 (Monterey) or later:
+Supported versions: macOS 12 (Monterey) or later:
 
 <!-- match version using https://docs.qgroundcontrol.com/master/en/qgc-dev-guide/getting_started/#native-builds -->
 <!-- usually based on Qt macOS dependency -->
@@ -38,12 +38,12 @@ _QGroundControl_ can be installed on macOS 12 (Monterey) or later:
 1. Double-click the .dmg file to mount it, then drag the _QGroundControl_ application to your _Application_ folder.
 
 ::: info
-QGroundControl continues to not be signed. You will not to allow permission for it to install based on you macOS version.
+QGroundControl continues to not be signed. You will not to allow permission for it to install based on your macOS version.
 :::
 
 ## Ubuntu Linux {#ubuntu}
 
-_QGroundControl_ can be installed/run on Ubuntu LTS 22.04 (and later):
+Supported versions: Ubuntu 22.04, 24.04:
 
 Ubuntu comes with a serial modem manager that interferes with any robotics related use of a serial port (or USB serial).
 Before installing _QGroundControl_ you should remove the modem manager and grant yourself permissions to access the serial port.
@@ -97,7 +97,7 @@ Either double-click the AppImage in your file manager or launch it from a termin
 
 ## Android {#android}
 
-_QGroundControl_ can be installed/run on Android 9 or later:
+Supported versions: Android 9 to 15 (arm 32/64):
 
 - [Android 32/64 bit APK](https://qgroundcontrol.s3-us-west-2.amazonaws.com/latest/QGroundControl.apk)
 
diff --git a/docs/en/qgc-user-guide/index.md b/docs/en/qgc-user-guide/index.md
index 23cf76ec2502..4216df80bc2f 100644
--- a/docs/en/qgc-user-guide/index.md
+++ b/docs/en/qgc-user-guide/index.md
@@ -1,6 +1,6 @@
 # QGroundControl Guide (Daily Builds)
 
-[![Discuss](https://img.shields.io/badge/discuss-px4-ff69b4.svg)](http://discuss.px4.io/c/qgroundcontrol/qgroundcontrol-usage) 
+[![Discuss](https://img.shields.io/badge/discuss-px4-ff69b4.svg)](http://discuss.px4.io/c/qgroundcontrol/qgroundcontrol-usage)
 [![Discuss](https://img.shields.io/badge/discuss-ardupilot-ff69b4.svg)](http://discuss.ardupilot.org/c/ground-control-software/qgroundcontrol)
 
 _QGroundControl_ provides full flight control and vehicle setup for PX4 or ArduPilot powered vehicles.
diff --git a/docs/en/qgc-user-guide/releases/daily_build_new_features.md b/docs/en/qgc-user-guide/releases/daily_build_new_features.md
index abd9ddd0395d..415ca8d8dfae 100644
--- a/docs/en/qgc-user-guide/releases/daily_build_new_features.md
+++ b/docs/en/qgc-user-guide/releases/daily_build_new_features.md
@@ -39,5 +39,5 @@ There is also a [Change Log](https://github.com/mavlink/qgroundcontrol/blob/mast
 * Developer changes
   * Build system fully converted to cmake
     * qmake no longer supported
-  * Source updated to use Qt 6.8.3
-  * GStreamer support updated to 1.22
\ No newline at end of file
+  * Source updated to use Qt 6.10.1
+  * GStreamer support updated to 1.22
diff --git a/docs/en/qgc-user-guide/releases/daily_builds.md b/docs/en/qgc-user-guide/releases/daily_builds.md
index c189b2025f30..ad7601c3f176 100644
--- a/docs/en/qgc-user-guide/releases/daily_builds.md
+++ b/docs/en/qgc-user-guide/releases/daily_builds.md
@@ -9,7 +9,9 @@ Use at your own risk.
 
 These can be downloaded from the links below (install as described in [Download and Install](../getting_started/download_and_install.md)):
 
-- [Windows](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer.exe)
+- Windows
+	- [x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-AMD64.exe)
+	- [Arm_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-ARM64.exe)
 - [OS X](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl.dmg)
 - Linux - (See installation instructions below)
   - [Linux x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-x86_64.AppImage)
diff --git a/docs/en/qgc-user-guide/viewer_3d/viewer_3d.md b/docs/en/qgc-user-guide/viewer_3d/viewer_3d.md
index af04540116b3..d6b33e9d8699 100644
--- a/docs/en/qgc-user-guide/viewer_3d/viewer_3d.md
+++ b/docs/en/qgc-user-guide/viewer_3d/viewer_3d.md
@@ -1,6 +1,6 @@
 # 3D View
 
-The 3D View is used to visualize and monitor the vehicle, the environment, and the planned mission in 3D. Most of the capabilities available in the [Fly View](../fly_view/fly_view.md)  is also available in the 3D View. 
+The 3D View is used to visualize and monitor the vehicle, the environment, and the planned mission in 3D. Most of the capabilities available in the [Fly View](../fly_view/fly_view.md)  is also available in the 3D View.
 
 You can use it to:
 - To import and display the 3D map for any region of interest downloaded from the OpenStreetMap website (.osm file).
@@ -16,7 +16,7 @@ You can use it to:
 ![3D View](../../../assets/viewer_3d/viewer_3d_overview.jpg)
 
 # UI Overview
-The screenshot above shows the main elements of the 3D View. 
+The screenshot above shows the main elements of the 3D View.
 
 <font color="red">**Enabling the 3D View:** </font>The 3D View is disabled by default. To enable it, go to **Application Settings** ->**Fly View** tab, and under the **3D View** settings group, toggle the **Enabled** switch as shown below:
 
@@ -44,7 +44,5 @@ The following properties can be modified in the 3D View settings group:
 
 - **Enabled**: To enable or disable the 3D View.
 - **3D Map File**: The path to the .osm file of a region of interest to be visualized in the QGC. The .osm file can be uploaded by clicking on the **Select File** button. To clear the 3D View from the previously loaded .osm file, you can click on the **Clear** button.
-- **Average Building Level Height**: This parameter determines the height of each storey of the buildings, as in .osm file sometimes the height of the buildings is specified in terms of the level/storey. 
+- **Average Building Level Height**: This parameter determines the height of each storey of the buildings, as in .osm file sometimes the height of the buildings is specified in terms of the level/storey.
 - **Vehicle Altitude Bias**: This refers to the bias in the altitude of vehicles and their missions with respect to the ground level. It is helpful in cases where the estimated altitude of the vehicle by its flight control is biased, as the relative altitude is currently used in the 3D View.
-
-
diff --git a/docs/ko/qgc-dev-guide/contribute/pull_requests.md b/docs/ko/qgc-dev-guide/contribute/pull_requests.md
index fe120dcf7dca..b5891b9fcea6 100644
--- a/docs/ko/qgc-dev-guide/contribute/pull_requests.md
+++ b/docs/ko/qgc-dev-guide/contribute/pull_requests.md
@@ -1,3 +1,16 @@
 # Pull Requests
 
 All pull requests go through the QGC CI build system which builds release and debug version. Builds will fail if there are compiler warnings. Also unit tests are run against supported OS debug builds.
+
+## Automatic Release Note Generation
+
+Releases notes are generated from the following GitHub labels qhich should be set on Pull Requests as appropriate:
+
+- "RN: MAJOR FEATURE"
+- "RN: MINOR FEATURE"
+- "RN: IMPROVEMENT"
+- "RN: REFACTORING"
+- "RN: BUGFIX"
+- "RN: NEW BOARD SUPPORT"
+
+There are also a set of the above labels which end in "- CUSTOM BUILD" which indicate the changes is associated with the custom build architecture.
diff --git a/docs/ko/qgc-dev-guide/contribute/unit_tests.md b/docs/ko/qgc-dev-guide/contribute/unit_tests.md
index 023595d60160..f77eac271297 100644
--- a/docs/ko/qgc-dev-guide/contribute/unit_tests.md
+++ b/docs/ko/qgc-dev-guide/contribute/unit_tests.md
@@ -2,7 +2,7 @@
 
 _QGroundControl_ (QGC) contains a set of unit tests that must pass before a pull request will be accepted. The addition of new complex subsystems to QGC should include a corresponding new unit test to test it.
 
-The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/src/qgcunittest/UnitTestList.cc).
+The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/test/UnitTestList.cc).
 
 To run unit tests:
 
diff --git a/docs/ko/qgc-dev-guide/custom_build/mavlink.md b/docs/ko/qgc-dev-guide/custom_build/mavlink.md
index bbdb3addd0ee..cf4cb272acb7 100644
--- a/docs/ko/qgc-dev-guide/custom_build/mavlink.md
+++ b/docs/ko/qgc-dev-guide/custom_build/mavlink.md
@@ -20,4 +20,4 @@ To modify the version of MAVLink used by QGC:
     Just add to [/qgroundcontrol/cmake/CustomOptions.cmake](../../../../cmake/CustomOptions.cmake):
   ```cmake
   set(CPM_mavlink_SOURCE "/path/to/your/custom/mavlink")
-  ```
\ No newline at end of file
+  ```
diff --git a/docs/ko/qgc-dev-guide/custom_build/resource_override.md b/docs/ko/qgc-dev-guide/custom_build/resource_override.md
index 7667557aac28..897c3a6c5b3f 100644
--- a/docs/ko/qgc-dev-guide/custom_build/resource_override.md
+++ b/docs/ko/qgc-dev-guide/custom_build/resource_override.md
@@ -11,4 +11,4 @@ By overriding a resource you can replace it with your own version of it. This co
 
 Resource overrides work by using `QQmlEngine::addUrlInterceptor` to intercept requests for resources and re-route the request to available custom resources instead of the normal resource. Look at [custom_example/CustomPlugin.cc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CustomPlugin.cc) for how it's done and replicate that in your own custom build source.
 
-Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
\ No newline at end of file
+Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
diff --git a/docs/ko/qgc-dev-guide/custom_build/toolbar.md b/docs/ko/qgc-dev-guide/custom_build/toolbar.md
index 662cb8db4ae9..e4dae8b2607c 100644
--- a/docs/ko/qgc-dev-guide/custom_build/toolbar.md
+++ b/docs/ko/qgc-dev-guide/custom_build/toolbar.md
@@ -30,10 +30,6 @@ These provide information to the user which is not associated with a vehicle. Fo
 
 These are indicators which are associated with information about the vehicle. They are only available when a vehicle is connected. To manipulate the list of vehicle indicators you override `FirmwarePlugin::toolIndicators`.
 
-#### Vehicle Mode Indicators
-
-These are indicators which are associated with information about the vehicle. They require additional UI provided by the Fly View to complete their actions. An example is Arming and Disarming. They are only available when a vehicle is connected. To manipulate the list of vehicle mode indicators you override `FirmwarePlugin::modeIndicators`.
-
 ### Modifying the toolbar UI itself
 
 This is accomplished by using resource overrides on the qml files associated with the toolbar. This provides a high level of customization but also a higher level of complexity. The primary ui for the toolbar is in `MainToolBar.qml`. The main window code in `MainRootWindow.qml` interacts with the toolbar to show different indicator sections based on current view as well as whether the mode indicators show or not also based on current view.
diff --git a/docs/ko/qgc-dev-guide/getting_started/index.md b/docs/ko/qgc-dev-guide/getting_started/index.md
index 7262c1a5c986..fd7ff25f7e9f 100644
--- a/docs/ko/qgc-dev-guide/getting_started/index.md
+++ b/docs/ko/qgc-dev-guide/getting_started/index.md
@@ -1,5 +1,5 @@
 ---
-qt_version: 6.8.3
+qt_version: 6.10.0
 ---
 
 # Getting Started with Source and Builds
@@ -21,15 +21,15 @@ To get the source files:
 
 1. Clone the repo (or your fork) including submodules:
 
-  ```sh
-  git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
-  ```
+   ```sh
+   git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
+   ```
 
 2. Update submodules (required each time you pull new source code):
 
-  ```sh
-  git submodule update --recursive
-  ```
+   ```sh
+   git submodule update --recursive
+   ```
 
 :::tip
 Github source-code zip files cannot be used because these do not contain the appropriate submodule source code.
@@ -66,15 +66,15 @@ You **must install Qt as described below** instead of using pre-built packages f
 To install Qt:
 
 1. Download and run the [Qt Online Installer](https://www.qt.io/download-qt-installer-oss)
-  - **Ubuntu:**
-    - Set the downloaded file to executable using: `chmod +x`.
-    - You may also need to install libxcb-cursor0
+   - **Ubuntu:**
+     - Set the downloaded file to executable using: `chmod +x`.
+     - You may also need to install libxcb-cursor0
 
 2. On the _Installation Folder_ page select "Custom Installation"
 
 3. On the _Select Components_ page:
 
-  - I you don't see _Qt {{ $frontmatter.qt_version }}_ listed check the _Archive_ checkbox and click _Filter_.
+   - I you don't see _Qt {{ $frontmatter.qt_version }}_ listed check the _Archive_ checkbox and click _Filter_.
 
 - Under Qt -> _Qt {{ $frontmatter.qt_version }}_ select:
   - **Windows**: MSVC 2022 _arch_ - where _arch_ is the architecture of your machine
@@ -86,22 +86,21 @@ To install Qt:
 
 1. Install Additional Packages (Platform Specific)
 
-  - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
-  - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
-  - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
-  - **Mac** `sh qgroundcontrol/tools/setup/macos-dependencies.sh`
-  - **Android** [Setup](https://doc.qt.io/qt-6/android-getting-started.html). JDK17 is required for the latest updated versions. NDK Version: 25.1.8937393
-    You can confirm it is being used by reviewing the project setting: **Projects > Manage Kits > Devices > Android (tab) > Android Settings > _JDK location_**.
-    Note: Visit here for more detailed configurations [android.yml](.github/workflows/android.yml)
+   - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
+   - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
+   - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
+   - **Mac** `sh qgroundcontrol/tools/setup/install-dependencies-osx.sh`
+   - **Windows** `qgroundcontrol/tools/setup/install-depedencies-windows.ps1`
+   - **Android** Installing dependencies for android is quite involved. You are better off using Qt documentation for android setup instructions. Search for "Qt 6.10 android" on the internet to find the correct "Gettting Started with Qt for Android" page. Read it full and carefully! An example of what you are looking for is [here](https://doc.qt.io/qt-6/android-getting-started.html).
 
 2. Install Optional/OS-Specific Functionality
 
-  ::: info
-  Optional features that are dependent on the operating system and user-installed libraries are linked/described below.
-  These features can be forcibly enabled/disabled by specifying additional values to qmake.
-  :::
+   ::: info
+   Optional features that are dependent on the operating system and user-installed libraries are linked/described below.
+   These features can be forcibly enabled/disabled by specifying additional values to qmake.
+   :::
 
-  - **Video Streaming/Gstreamer:** - see [Video Streaming](https://github.com/mavlink/qgroundcontrol/blob/master/src/VideoManager/VideoReceiver/GStreamer/README.md)
+   - **Video Streaming/Gstreamer:** - see [Video Streaming](https://github.com/mavlink/qgroundcontrol/blob/master/src/VideoManager/VideoReceiver/GStreamer/README.md)
 
 #### Install Visual Studio (Windows Only) {#vs}
 
@@ -123,7 +122,7 @@ Visual Studio is ONLY used to get the compiler. Building _QGroundControl_ is don
 
 3. Build using the "hammer" (or "play") icons or the menus:
 
-  ![QtCreator Build Button](../../../assets/dev_getting_started/qt_creator_build_qgc.png)
+   ![QtCreator Build Button](../../../assets/dev_getting_started/qt_creator_build_qgc.png)
 
 #### Build using CMake on CLI {#cmake}
 
@@ -131,29 +130,36 @@ Example commands to build a default QGC and run it afterwards:
 
 1. Make sure you cloned the repository and updated the submodules before, see chapter _Source Code_ above and switch into the repository folder:
 
-  ```sh
-  cd qgroundcontrol
-  ```
+   ```sh
+   cd qgroundcontrol
+   ```
 
 2. Configure:
 
-  ```sh
-  ~/Qt/6.8.3/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
-  ```
+   ```sh
+   ~/Qt/{{ $frontmatter.qt_version }}/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+   ```
 
-  Change the directory for qt-cmake to match your install location for Qt and the kit you want to use.
+   Change the directory for qt-cmake to match your install location for Qt and the kit you want to use.
+
+   **Mac**: To Sign/Notarize/Staple the QGC app bundle, add `-DQGC_MACOS_SIGN_WITH_IDENTITY=ON` to the configure command line. During the `install` phase the following environment variables will need to be available:
+
+   - `QGC_MACOS_SIGNING_IDENTITY` - Signing identity for your Developer ID certificate which must be in the keychain
+   - `QGC_MACOS_NOTARIZATION_USERNAME` - Username for your Apple Developer Account
+   - `QGC_MACOS_NOTARIZATION_PASSWORD` - App specific password for Notarization from your Apple Developer Account
+   - `QGC_MACOS_NOTARIZATION_TEAM_ID` - Apple Developer Account Team ID
 
 3. Build
 
-  ```sh
-  cmake --build build --config Debug
-  ```
+   ```sh
+   cmake --build build --config Debug
+   ```
 
 4. Run the QGroundcontrol binary that was just built:
 
-  ```sh
-  ./build/Debug/QGroundControl
-  ```
+   ```sh
+   ./build/Debug/QGroundControl
+   ```
 
 ### Vagrant
 
diff --git a/docs/ko/qgc-user-guide/fly_view/camera_tools.md b/docs/ko/qgc-user-guide/fly_view/camera_tools.md
index 69dc11226735..a1cd5980e3c4 100644
--- a/docs/ko/qgc-user-guide/fly_view/camera_tools.md
+++ b/docs/ko/qgc-user-guide/fly_view/camera_tools.md
@@ -26,4 +26,4 @@ Most of the settings that are displayed depend on the camera (they are defined i
 The video page is used to enable/disable video streaming.
 When enabled, you can start/stop the video stream, enable a grid overlay, change how the image fits the screen, and record the video locally with QGC.
 
-![Instrument Page - Video Stream](../../../assets/fly/instrument_page_video_stream.jpg)
\ No newline at end of file
+![Instrument Page - Video Stream](../../../assets/fly/instrument_page_video_stream.jpg)
diff --git a/docs/ko/qgc-user-guide/fly_view/fly_tools.md b/docs/ko/qgc-user-guide/fly_view/fly_tools.md
index c1c8d2aba11f..dff94728e21a 100644
--- a/docs/ko/qgc-user-guide/fly_view/fly_tools.md
+++ b/docs/ko/qgc-user-guide/fly_view/fly_tools.md
@@ -57,4 +57,4 @@ You can change altitude while flying, except when in a mission:
 1. Press the **Actions** button on the _Fly Tools_
 2. Select the _Change Altitude_ button
 3. Select the new altitude from the vertical slider
-4. Confirm the action
\ No newline at end of file
+4. Confirm the action
diff --git a/docs/ko/qgc-user-guide/fly_view/fly_view_toolbar.md b/docs/ko/qgc-user-guide/fly_view/fly_view_toolbar.md
index 1895c883cfde..d4a3ea9ed6d4 100644
--- a/docs/ko/qgc-user-guide/fly_view/fly_view_toolbar.md
+++ b/docs/ko/qgc-user-guide/fly_view/fly_view_toolbar.md
@@ -73,6 +73,6 @@ There are other indicators which only show in certain situations:
 
 - Telemetry RSSI
 - RC RSSI
-- Gimbal
+- Gimbal - Only displayed if the vehicle supports the [Mavlink Gimbal Protocol](https://mavlink.io/en/services/gimbal_v2.html)
 - VTOL transitions
 - Select from multiple connected vehicles
diff --git a/docs/ko/qgc-user-guide/fly_view/hud.md b/docs/ko/qgc-user-guide/fly_view/hud.md
index cc6ac3bae629..6ec8c28be747 100644
--- a/docs/ko/qgc-user-guide/fly_view/hud.md
+++ b/docs/ko/qgc-user-guide/fly_view/hud.md
@@ -309,13 +309,13 @@ To start a mission from landed:
 
 2. Select the _Start Mission_ action from the dialog.
 
-  ![Start mission action](../../../assets/fly/start_mission_action.jpg)
+   ![Start mission action](../../../assets/fly/start_mission_action.jpg)
 
-  (to display the confirmation slider)
+   (to display the confirmation slider)
 
 3. When the confirmation slider appears, drag it to start the mission.
 
-  ![Start mission](../../../assets/fly/start_mission.jpg)
+   ![Start mission](../../../assets/fly/start_mission.jpg)
 
 #### Continue Mission {#continue_mission}
 
@@ -333,11 +333,11 @@ You can continue the current mission while (unless already in a mission!):
 
 2. Select the _Continue Mission_ action from the dialog.
 
-  ![Continue Mission/Change Altitude action](../../../assets/fly/continue_mission_change_altitude_action.jpg)
+   ![Continue Mission/Change Altitude action](../../../assets/fly/continue_mission_change_altitude_action.jpg)
 
 3. Drag the confirmation slider to continue the mission.
 
-  ![Continue Mission](../../../assets/fly/continue_mission.jpg)
+   ![Continue Mission](../../../assets/fly/continue_mission.jpg)
 
 #### Resume Mission {#resume_mission}
 
diff --git a/docs/ko/qgc-user-guide/fly_view/instrument_panel.md b/docs/ko/qgc-user-guide/fly_view/instrument_panel.md
index 90ee0c777ad9..5f4deed8d8c9 100644
--- a/docs/ko/qgc-user-guide/fly_view/instrument_panel.md
+++ b/docs/ko/qgc-user-guide/fly_view/instrument_panel.md
@@ -29,4 +29,4 @@ By default this is the vehicle, but you can use the selector to choose a particu
 
 The selection list on the top right is used to select a particular telemetry value for the vehicle or sensor.
 
-![Instrument Panel - value options](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
\ No newline at end of file
+![Instrument Panel - value options](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
diff --git a/docs/ko/qgc-user-guide/getting_started/download_and_install.md b/docs/ko/qgc-user-guide/getting_started/download_and_install.md
index 27ac4d88f53f..f82f600f1eb3 100644
--- a/docs/ko/qgc-user-guide/getting_started/download_and_install.md
+++ b/docs/ko/qgc-user-guide/getting_started/download_and_install.md
@@ -16,7 +16,7 @@ More capable hardware will provide a better experience.
 
 ## 윈도우 {#windows}
 
-_QGroundControl_ can be installed on 64 bit versions of Windows 10 (1809 or later) or Windows 11:
+Supported versions: Windows 10 (1809 or later), Windows 11:
 
 1. [QGroundControl-installer.exe](https://d176tv9ibo4jno.cloudfront.net/latest/QGroundControl-installer.exe)을 다운로드합니다.
 2. 다운로드한 설치 파일을 더블 클릭하여 프로그램을 실행합니다.
@@ -27,9 +27,9 @@ _QGroundControl_ can be installed on 64 bit versions of Windows 10 (1809 or late
 자세한 내용은 [QGroundControl 설정 문제 해결 > 윈도우: UI 렌더링/비디오 드라이버 문제](../troubleshooting/qgc_setup.md#opengl_troubleshooting)를 참고하십시오.
 :::
 
-## Mac OS X {#macOS}
+## Mac OS {#macOS}
 
-_QGroundControl_ can be installed on macOS 12 (Monterey) or later:
+Supported versions: macOS 12 (Monterey) or later:
 
 <!-- match version using https://docs.qgroundcontrol.com/master/en/qgc-dev-guide/getting_started/#native-builds -->
 
@@ -39,12 +39,12 @@ _QGroundControl_ can be installed on macOS 12 (Monterey) or later:
 2. 다운로드한 dmg 파일을 더블 클릭하여 마운트하여, _QGroundControl_ 애플리케이션을 _Application_ 폴더로 드래그합니다.
 
 :::info
-QGroundControl continues to not be signed. You will not to allow permission for it to install based on you macOS version.
+QGroundControl continues to not be signed. You will not to allow permission for it to install based on your macOS version.
 :::
 
 ## 우분투 리눅스 {#ubuntu}
 
-_QGroundControl_ can be installed/run on Ubuntu LTS 22.04 (and later):
+Supported versions: Ubuntu 22.04, 24.04:
 
 Ubuntu comes with a serial modem manager that interferes with any robotics related use of a serial port (or USB serial).
 _QGroundControl_을 설치 전에 모뎀 관리자를 제거하고, 직렬 포트 접근 권한을 부여합니다.
@@ -53,7 +53,7 @@ _QGroundControl_을 설치 전에 모뎀 관리자를 제거하고, 직렬 포
 **Before installing _QGroundControl_ for the first time:**
 
 1. Enable serial-port access
-  Add your user to the dialout group so you can talk to USB devices without root:
+   Add your user to the dialout group so you can talk to USB devices without root:
 
 ```
 sudo usermod -aG dialout "$(id -un)"
@@ -64,7 +64,7 @@ At login, your shell takes a snapshot of your user and group memberships. Becaus
 :::
 
 1. (Optional) Disable ModemManager
-  On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
+   On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
 
 ```
 # preferred: stop and mask the service
@@ -93,7 +93,7 @@ chmod +x QGroundControl-<arch>.AppImage
 ```
 
 1. Run QGroundControl
-  Either double-click the AppImage in your file manager or launch it from a terminal:
+   Either double-click the AppImage in your file manager or launch it from a terminal:
 
 ```
 ./QGroundControl-<arch>.AppImage
@@ -101,7 +101,7 @@ chmod +x QGroundControl-<arch>.AppImage
 
 ## 안드로이드 {#android}
 
-_QGroundControl_ can be installed/run on Android 9 or later:
+Supported versions: Android 9 to 15 (arm 32/64):
 
 - [Android 32/64 bit APK](https://qgroundcontrol.s3-us-west-2.amazonaws.com/latest/QGroundControl.apk)
 
diff --git a/docs/ko/qgc-user-guide/releases/daily_build_new_features.md b/docs/ko/qgc-user-guide/releases/daily_build_new_features.md
index dfb5757419f5..ed4736776c19 100644
--- a/docs/ko/qgc-user-guide/releases/daily_build_new_features.md
+++ b/docs/ko/qgc-user-guide/releases/daily_build_new_features.md
@@ -39,5 +39,5 @@
 - Developer changes
   - Build system fully converted to cmake
     - qmake no longer supported
-  - Source updated to use Qt 6.8.3
-  - GStreamer support updated to 1.22
\ No newline at end of file
+  - Source updated to use Qt 6.10.0
+  - GStreamer support updated to 1.22
diff --git a/docs/ko/qgc-user-guide/releases/daily_builds.md b/docs/ko/qgc-user-guide/releases/daily_builds.md
index b02898fe798d..9a1c588d79e9 100644
--- a/docs/ko/qgc-user-guide/releases/daily_builds.md
+++ b/docs/ko/qgc-user-guide/releases/daily_builds.md
@@ -9,7 +9,9 @@ Use at your own risk.
 
 아래 링크에서 다운로드할 수 있습니다([다운로드 및 설치](../getting_started/download_and_install.md)에 설명된 대로 설치).
 
-- [윈도우](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer.exe)
+- Windows
+  - [x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-AMD64.exe)
+  - [Arm_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-ARM64.exe)
 - [OS X](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl.dmg)
 - Linux - (See installation instructions below)
   - [Linux x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-x86_64.AppImage)
@@ -26,7 +28,7 @@ chmod +x QGroundControl-<arch>.AppImage
 ```
 
 2. Enable serial-port access
-  Add your user to the dialout group so you can talk to USB devices without root:
+   Add your user to the dialout group so you can talk to USB devices without root:
 
 ```
 sudo usermod -aG dialout "$(id -un)"
@@ -37,7 +39,7 @@ At login, your shell takes a snapshot of your user and group memberships. Becaus
 :::
 
 3. (Optional) Disable ModemManager
-  On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
+   On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
 
 ```
 # preferred: stop and mask the service
@@ -48,7 +50,7 @@ sudo apt remove --purge modemmanager
 ```
 
 4. Run QGroundControl
-  Either double-click the AppImage in your file manager or launch it from a terminal:
+   Either double-click the AppImage in your file manager or launch it from a terminal:
 
 ```
 ./QGroundControl-<arch>.AppImage
diff --git a/docs/ko/qgc-user-guide/viewer_3d/viewer_3d.md b/docs/ko/qgc-user-guide/viewer_3d/viewer_3d.md
index dbc2415ffcef..f90339efe72a 100644
--- a/docs/ko/qgc-user-guide/viewer_3d/viewer_3d.md
+++ b/docs/ko/qgc-user-guide/viewer_3d/viewer_3d.md
@@ -7,12 +7,12 @@ You can use it to:
 - To import and display the 3D map for any region of interest downloaded from the OpenStreetMap website (.osm file).
 - Display the vehicle along with its mission in 3D.
 - And most of the capabilities of the [Fly View](../fly_view/fly_view.md), including:
-    - Run an automated [pre-flight checklist](#preflight_checklist).
-    - Arm the vehicle (or check why it won't arm).
-    - Control missions: [start](#start_mission), [continue](#continue_mission), [pause](#pause), and [resume](#resume_mission).
-    - Guide the vehicle to [arm](#arm)/[disarm](#disarm)/[emergency stop](#emergency_stop), [takeoff](#takeoff)/[land](#land), [change altitude](#change_altitude), and [return/RTL](#rtl).
-    - Switch between a map view and a video view (if available)
-    - Display video, mission, telemetry, and other information for the current vehicle, and also switch between connected vehicles.
+  - Run an automated [pre-flight checklist](#preflight_checklist).
+  - Arm the vehicle (or check why it won't arm).
+  - Control missions: [start](#start_mission), [continue](#continue_mission), [pause](#pause), and [resume](#resume_mission).
+  - Guide the vehicle to [arm](#arm)/[disarm](#disarm)/[emergency stop](#emergency_stop), [takeoff](#takeoff)/[land](#land), [change altitude](#change_altitude), and [return/RTL](#rtl).
+  - Switch between a map view and a video view (if available)
+  - Display video, mission, telemetry, and other information for the current vehicle, and also switch between connected vehicles.
 
 ![3D View](../../../assets/viewer_3d/viewer_3d_overview.jpg)
 
@@ -31,14 +31,14 @@ To open the 3D View, when you are in the [Fly View](../fly_view/fly_view.md), fr
 Once the 3D View is opened, you can navigate through the 3D environment by using either a mouse or a touchscreen as follows:
 
 - **Mouse:**
-    - **To move horizontally and vertically**: Press and hold the mouse left-click, then move the cursor.
-    - **To rotate**: Press and hold the mouse right-click, then move the cursor.
-    - **To zoom**: Use the mouse wheel\middle button.
+  - **To move horizontally and vertically**: Press and hold the mouse left-click, then move the cursor.
+  - **To rotate**: Press and hold the mouse right-click, then move the cursor.
+  - **To zoom**: Use the mouse wheel\middle button.
 
 - **Touchscreen:**
-    - **To move horizontally and vertically**: Use a single finger, then tap and move your finger.
-    - **To rotate**: Use two fingers, then tap and move your fingers while keeping them together.
-    - **To zoom**: Use a pinch with two fingers and move them together or apart to zoom in or out.
+  - **To move horizontally and vertically**: Use a single finger, then tap and move your finger.
+  - **To rotate**: Use two fingers, then tap and move your fingers while keeping them together.
+  - **To zoom**: Use a pinch with two fingers and move them together or apart to zoom in or out.
 
 To visualize the 3D map of a particular area in the 3D viewer, you have to download the .osm file of that area from the [OpenStreetMap](https://www.openstreetmap.org/#map=16/47.3964/8.5498) website and then import it through the **3D View** settings. More details on the **3D View** settings can be found in the next section.
 
@@ -51,5 +51,3 @@ The following properties can be modified in the 3D View settings group:
 - **3D Map File**: The path to the .osm file of a region of interest to be visualized in the QGC. The .osm file can be uploaded by clicking on the **Select File** button. To clear the 3D View from the previously loaded .osm file, you can click on the **Clear** button.
 - **Average Building Level Height**: This parameter determines the height of each storey of the buildings, as in .osm file sometimes the height of the buildings is specified in terms of the level/storey.
 - **Vehicle Altitude Bias**: This refers to the bias in the altitude of vehicles and their missions with respect to the ground level. It is helpful in cases where the estimated altitude of the vehicle by its flight control is biased, as the relative altitude is currently used in the 3D View.
-
-
diff --git a/docs/tr/qgc-dev-guide/contribute/pull_requests.md b/docs/tr/qgc-dev-guide/contribute/pull_requests.md
index fe120dcf7dca..b5891b9fcea6 100644
--- a/docs/tr/qgc-dev-guide/contribute/pull_requests.md
+++ b/docs/tr/qgc-dev-guide/contribute/pull_requests.md
@@ -1,3 +1,16 @@
 # Pull Requests
 
 All pull requests go through the QGC CI build system which builds release and debug version. Builds will fail if there are compiler warnings. Also unit tests are run against supported OS debug builds.
+
+## Automatic Release Note Generation
+
+Releases notes are generated from the following GitHub labels qhich should be set on Pull Requests as appropriate:
+
+- "RN: MAJOR FEATURE"
+- "RN: MINOR FEATURE"
+- "RN: IMPROVEMENT"
+- "RN: REFACTORING"
+- "RN: BUGFIX"
+- "RN: NEW BOARD SUPPORT"
+
+There are also a set of the above labels which end in "- CUSTOM BUILD" which indicate the changes is associated with the custom build architecture.
diff --git a/docs/tr/qgc-dev-guide/contribute/unit_tests.md b/docs/tr/qgc-dev-guide/contribute/unit_tests.md
index 023595d60160..f77eac271297 100644
--- a/docs/tr/qgc-dev-guide/contribute/unit_tests.md
+++ b/docs/tr/qgc-dev-guide/contribute/unit_tests.md
@@ -2,7 +2,7 @@
 
 _QGroundControl_ (QGC) contains a set of unit tests that must pass before a pull request will be accepted. The addition of new complex subsystems to QGC should include a corresponding new unit test to test it.
 
-The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/src/qgcunittest/UnitTestList.cc).
+The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/test/UnitTestList.cc).
 
 To run unit tests:
 
diff --git a/docs/tr/qgc-dev-guide/custom_build/mavlink.md b/docs/tr/qgc-dev-guide/custom_build/mavlink.md
index bbdb3addd0ee..cf4cb272acb7 100644
--- a/docs/tr/qgc-dev-guide/custom_build/mavlink.md
+++ b/docs/tr/qgc-dev-guide/custom_build/mavlink.md
@@ -20,4 +20,4 @@ To modify the version of MAVLink used by QGC:
     Just add to [/qgroundcontrol/cmake/CustomOptions.cmake](../../../../cmake/CustomOptions.cmake):
   ```cmake
   set(CPM_mavlink_SOURCE "/path/to/your/custom/mavlink")
-  ```
\ No newline at end of file
+  ```
diff --git a/docs/tr/qgc-dev-guide/custom_build/resource_override.md b/docs/tr/qgc-dev-guide/custom_build/resource_override.md
index 7667557aac28..897c3a6c5b3f 100644
--- a/docs/tr/qgc-dev-guide/custom_build/resource_override.md
+++ b/docs/tr/qgc-dev-guide/custom_build/resource_override.md
@@ -11,4 +11,4 @@ By overriding a resource you can replace it with your own version of it. This co
 
 Resource overrides work by using `QQmlEngine::addUrlInterceptor` to intercept requests for resources and re-route the request to available custom resources instead of the normal resource. Look at [custom_example/CustomPlugin.cc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CustomPlugin.cc) for how it's done and replicate that in your own custom build source.
 
-Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
\ No newline at end of file
+Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
diff --git a/docs/tr/qgc-dev-guide/custom_build/toolbar.md b/docs/tr/qgc-dev-guide/custom_build/toolbar.md
index 662cb8db4ae9..e4dae8b2607c 100644
--- a/docs/tr/qgc-dev-guide/custom_build/toolbar.md
+++ b/docs/tr/qgc-dev-guide/custom_build/toolbar.md
@@ -30,10 +30,6 @@ These provide information to the user which is not associated with a vehicle. Fo
 
 These are indicators which are associated with information about the vehicle. They are only available when a vehicle is connected. To manipulate the list of vehicle indicators you override `FirmwarePlugin::toolIndicators`.
 
-#### Vehicle Mode Indicators
-
-These are indicators which are associated with information about the vehicle. They require additional UI provided by the Fly View to complete their actions. An example is Arming and Disarming. They are only available when a vehicle is connected. To manipulate the list of vehicle mode indicators you override `FirmwarePlugin::modeIndicators`.
-
 ### Modifying the toolbar UI itself
 
 This is accomplished by using resource overrides on the qml files associated with the toolbar. This provides a high level of customization but also a higher level of complexity. The primary ui for the toolbar is in `MainToolBar.qml`. The main window code in `MainRootWindow.qml` interacts with the toolbar to show different indicator sections based on current view as well as whether the mode indicators show or not also based on current view.
diff --git a/docs/tr/qgc-dev-guide/getting_started/index.md b/docs/tr/qgc-dev-guide/getting_started/index.md
index 7262c1a5c986..fd7ff25f7e9f 100644
--- a/docs/tr/qgc-dev-guide/getting_started/index.md
+++ b/docs/tr/qgc-dev-guide/getting_started/index.md
@@ -1,5 +1,5 @@
 ---
-qt_version: 6.8.3
+qt_version: 6.10.0
 ---
 
 # Getting Started with Source and Builds
@@ -21,15 +21,15 @@ To get the source files:
 
 1. Clone the repo (or your fork) including submodules:
 
-  ```sh
-  git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
-  ```
+   ```sh
+   git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
+   ```
 
 2. Update submodules (required each time you pull new source code):
 
-  ```sh
-  git submodule update --recursive
-  ```
+   ```sh
+   git submodule update --recursive
+   ```
 
 :::tip
 Github source-code zip files cannot be used because these do not contain the appropriate submodule source code.
@@ -66,15 +66,15 @@ You **must install Qt as described below** instead of using pre-built packages f
 To install Qt:
 
 1. Download and run the [Qt Online Installer](https://www.qt.io/download-qt-installer-oss)
-  - **Ubuntu:**
-    - Set the downloaded file to executable using: `chmod +x`.
-    - You may also need to install libxcb-cursor0
+   - **Ubuntu:**
+     - Set the downloaded file to executable using: `chmod +x`.
+     - You may also need to install libxcb-cursor0
 
 2. On the _Installation Folder_ page select "Custom Installation"
 
 3. On the _Select Components_ page:
 
-  - I you don't see _Qt {{ $frontmatter.qt_version }}_ listed check the _Archive_ checkbox and click _Filter_.
+   - I you don't see _Qt {{ $frontmatter.qt_version }}_ listed check the _Archive_ checkbox and click _Filter_.
 
 - Under Qt -> _Qt {{ $frontmatter.qt_version }}_ select:
   - **Windows**: MSVC 2022 _arch_ - where _arch_ is the architecture of your machine
@@ -86,22 +86,21 @@ To install Qt:
 
 1. Install Additional Packages (Platform Specific)
 
-  - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
-  - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
-  - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
-  - **Mac** `sh qgroundcontrol/tools/setup/macos-dependencies.sh`
-  - **Android** [Setup](https://doc.qt.io/qt-6/android-getting-started.html). JDK17 is required for the latest updated versions. NDK Version: 25.1.8937393
-    You can confirm it is being used by reviewing the project setting: **Projects > Manage Kits > Devices > Android (tab) > Android Settings > _JDK location_**.
-    Note: Visit here for more detailed configurations [android.yml](.github/workflows/android.yml)
+   - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
+   - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
+   - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
+   - **Mac** `sh qgroundcontrol/tools/setup/install-dependencies-osx.sh`
+   - **Windows** `qgroundcontrol/tools/setup/install-depedencies-windows.ps1`
+   - **Android** Installing dependencies for android is quite involved. You are better off using Qt documentation for android setup instructions. Search for "Qt 6.10 android" on the internet to find the correct "Gettting Started with Qt for Android" page. Read it full and carefully! An example of what you are looking for is [here](https://doc.qt.io/qt-6/android-getting-started.html).
 
 2. Install Optional/OS-Specific Functionality
 
-  ::: info
-  Optional features that are dependent on the operating system and user-installed libraries are linked/described below.
-  These features can be forcibly enabled/disabled by specifying additional values to qmake.
-  :::
+   ::: info
+   Optional features that are dependent on the operating system and user-installed libraries are linked/described below.
+   These features can be forcibly enabled/disabled by specifying additional values to qmake.
+   :::
 
-  - **Video Streaming/Gstreamer:** - see [Video Streaming](https://github.com/mavlink/qgroundcontrol/blob/master/src/VideoManager/VideoReceiver/GStreamer/README.md)
+   - **Video Streaming/Gstreamer:** - see [Video Streaming](https://github.com/mavlink/qgroundcontrol/blob/master/src/VideoManager/VideoReceiver/GStreamer/README.md)
 
 #### Install Visual Studio (Windows Only) {#vs}
 
@@ -123,7 +122,7 @@ Visual Studio is ONLY used to get the compiler. Building _QGroundControl_ is don
 
 3. Build using the "hammer" (or "play") icons or the menus:
 
-  ![QtCreator Build Button](../../../assets/dev_getting_started/qt_creator_build_qgc.png)
+   ![QtCreator Build Button](../../../assets/dev_getting_started/qt_creator_build_qgc.png)
 
 #### Build using CMake on CLI {#cmake}
 
@@ -131,29 +130,36 @@ Example commands to build a default QGC and run it afterwards:
 
 1. Make sure you cloned the repository and updated the submodules before, see chapter _Source Code_ above and switch into the repository folder:
 
-  ```sh
-  cd qgroundcontrol
-  ```
+   ```sh
+   cd qgroundcontrol
+   ```
 
 2. Configure:
 
-  ```sh
-  ~/Qt/6.8.3/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
-  ```
+   ```sh
+   ~/Qt/{{ $frontmatter.qt_version }}/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+   ```
 
-  Change the directory for qt-cmake to match your install location for Qt and the kit you want to use.
+   Change the directory for qt-cmake to match your install location for Qt and the kit you want to use.
+
+   **Mac**: To Sign/Notarize/Staple the QGC app bundle, add `-DQGC_MACOS_SIGN_WITH_IDENTITY=ON` to the configure command line. During the `install` phase the following environment variables will need to be available:
+
+   - `QGC_MACOS_SIGNING_IDENTITY` - Signing identity for your Developer ID certificate which must be in the keychain
+   - `QGC_MACOS_NOTARIZATION_USERNAME` - Username for your Apple Developer Account
+   - `QGC_MACOS_NOTARIZATION_PASSWORD` - App specific password for Notarization from your Apple Developer Account
+   - `QGC_MACOS_NOTARIZATION_TEAM_ID` - Apple Developer Account Team ID
 
 3. Build
 
-  ```sh
-  cmake --build build --config Debug
-  ```
+   ```sh
+   cmake --build build --config Debug
+   ```
 
 4. Run the QGroundcontrol binary that was just built:
 
-  ```sh
-  ./build/Debug/QGroundControl
-  ```
+   ```sh
+   ./build/Debug/QGroundControl
+   ```
 
 ### Vagrant
 
diff --git a/docs/tr/qgc-user-guide/fly_view/camera_tools.md b/docs/tr/qgc-user-guide/fly_view/camera_tools.md
index 69dc11226735..a1cd5980e3c4 100644
--- a/docs/tr/qgc-user-guide/fly_view/camera_tools.md
+++ b/docs/tr/qgc-user-guide/fly_view/camera_tools.md
@@ -26,4 +26,4 @@ Most of the settings that are displayed depend on the camera (they are defined i
 The video page is used to enable/disable video streaming.
 When enabled, you can start/stop the video stream, enable a grid overlay, change how the image fits the screen, and record the video locally with QGC.
 
-![Instrument Page - Video Stream](../../../assets/fly/instrument_page_video_stream.jpg)
\ No newline at end of file
+![Instrument Page - Video Stream](../../../assets/fly/instrument_page_video_stream.jpg)
diff --git a/docs/tr/qgc-user-guide/fly_view/fly_tools.md b/docs/tr/qgc-user-guide/fly_view/fly_tools.md
index c1c8d2aba11f..dff94728e21a 100644
--- a/docs/tr/qgc-user-guide/fly_view/fly_tools.md
+++ b/docs/tr/qgc-user-guide/fly_view/fly_tools.md
@@ -57,4 +57,4 @@ You can change altitude while flying, except when in a mission:
 1. Press the **Actions** button on the _Fly Tools_
 2. Select the _Change Altitude_ button
 3. Select the new altitude from the vertical slider
-4. Confirm the action
\ No newline at end of file
+4. Confirm the action
diff --git a/docs/tr/qgc-user-guide/fly_view/fly_view_toolbar.md b/docs/tr/qgc-user-guide/fly_view/fly_view_toolbar.md
index 1895c883cfde..d4a3ea9ed6d4 100644
--- a/docs/tr/qgc-user-guide/fly_view/fly_view_toolbar.md
+++ b/docs/tr/qgc-user-guide/fly_view/fly_view_toolbar.md
@@ -73,6 +73,6 @@ There are other indicators which only show in certain situations:
 
 - Telemetry RSSI
 - RC RSSI
-- Gimbal
+- Gimbal - Only displayed if the vehicle supports the [Mavlink Gimbal Protocol](https://mavlink.io/en/services/gimbal_v2.html)
 - VTOL transitions
 - Select from multiple connected vehicles
diff --git a/docs/tr/qgc-user-guide/fly_view/hud.md b/docs/tr/qgc-user-guide/fly_view/hud.md
index cc6ac3bae629..6ec8c28be747 100644
--- a/docs/tr/qgc-user-guide/fly_view/hud.md
+++ b/docs/tr/qgc-user-guide/fly_view/hud.md
@@ -309,13 +309,13 @@ To start a mission from landed:
 
 2. Select the _Start Mission_ action from the dialog.
 
-  ![Start mission action](../../../assets/fly/start_mission_action.jpg)
+   ![Start mission action](../../../assets/fly/start_mission_action.jpg)
 
-  (to display the confirmation slider)
+   (to display the confirmation slider)
 
 3. When the confirmation slider appears, drag it to start the mission.
 
-  ![Start mission](../../../assets/fly/start_mission.jpg)
+   ![Start mission](../../../assets/fly/start_mission.jpg)
 
 #### Continue Mission {#continue_mission}
 
@@ -333,11 +333,11 @@ You can continue the current mission while (unless already in a mission!):
 
 2. Select the _Continue Mission_ action from the dialog.
 
-  ![Continue Mission/Change Altitude action](../../../assets/fly/continue_mission_change_altitude_action.jpg)
+   ![Continue Mission/Change Altitude action](../../../assets/fly/continue_mission_change_altitude_action.jpg)
 
 3. Drag the confirmation slider to continue the mission.
 
-  ![Continue Mission](../../../assets/fly/continue_mission.jpg)
+   ![Continue Mission](../../../assets/fly/continue_mission.jpg)
 
 #### Resume Mission {#resume_mission}
 
diff --git a/docs/tr/qgc-user-guide/fly_view/instrument_panel.md b/docs/tr/qgc-user-guide/fly_view/instrument_panel.md
index 90ee0c777ad9..5f4deed8d8c9 100644
--- a/docs/tr/qgc-user-guide/fly_view/instrument_panel.md
+++ b/docs/tr/qgc-user-guide/fly_view/instrument_panel.md
@@ -29,4 +29,4 @@ By default this is the vehicle, but you can use the selector to choose a particu
 
 The selection list on the top right is used to select a particular telemetry value for the vehicle or sensor.
 
-![Instrument Panel - value options](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
\ No newline at end of file
+![Instrument Panel - value options](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
diff --git a/docs/tr/qgc-user-guide/getting_started/download_and_install.md b/docs/tr/qgc-user-guide/getting_started/download_and_install.md
index 7028d35000ae..7ca6f7148394 100644
--- a/docs/tr/qgc-user-guide/getting_started/download_and_install.md
+++ b/docs/tr/qgc-user-guide/getting_started/download_and_install.md
@@ -16,7 +16,7 @@ En iyi deneyim ve uyumluluk için size işletim sisteminizin en yeni sürümün
 
 ## Windows {#windows}
 
-_QGroundControl_ can be installed on 64 bit versions of Windows 10 (1809 or later) or Windows 11:
+Supported versions: Windows 10 (1809 or later), Windows 11:
 
 1. Download [QGroundControl-installer.exe](https://d176tv9ibo4jno.cloudfront.net/latest/QGroundControl-installer.exe).
 2. exe'ye çift tıklayın.
@@ -27,9 +27,9 @@ Eğer başlatma veya video işleme sorunları yaşamıyorsanız ilk kısayolu ku
 For more information see [Troubleshooting QGC Setup > Windows: UI Rendering/Video Driver Issues](../troubleshooting/qgc_setup.md#opengl_troubleshooting).
 :::
 
-## Mac OS X {#macOS}
+## Mac OS {#macOS}
 
-_QGroundControl_ can be installed on macOS 12 (Monterey) or later:
+Supported versions: macOS 12 (Monterey) or later:
 
 <!-- match version using https://docs.qgroundcontrol.com/master/en/qgc-dev-guide/getting_started/#native-builds -->
 
@@ -39,12 +39,12 @@ _QGroundControl_ can be installed on macOS 12 (Monterey) or later:
 2. .dmg dosyasına çift tıklayın, ardından çıkan ekranda _QGroundControl_'ü _Application_ dosyasına sürükleyin.
 
 :::info
-QGroundControl continues to not be signed. You will not to allow permission for it to install based on you macOS version.
+QGroundControl continues to not be signed. You will not to allow permission for it to install based on your macOS version.
 :::
 
 ## Ubuntu Linux {#ubuntu}
 
-_QGroundControl_ can be installed/run on Ubuntu LTS 22.04 (and later):
+Supported versions: Ubuntu 22.04, 24.04:
 
 Ubuntu, bir seri bağlantı noktasının (veya USB serisinin) robotikle ilgili kullanımına müdahale eden bir seri modem yöneticisi ile birlikte gelir.
 _ QGroundControl _ 'ü kurmadan önce modem yöneticisini kaldırmalı ve seri bağlantı noktasına erişim için kendinize izin vermelisiniz.
@@ -53,7 +53,7 @@ Ayrıca video akışını desteklemek için _ GStreamer _ 'ı da yüklemeniz ger
 **Before installing _QGroundControl_ for the first time:**
 
 1. Enable serial-port access
-  Add your user to the dialout group so you can talk to USB devices without root:
+   Add your user to the dialout group so you can talk to USB devices without root:
 
 ```
 sudo usermod -aG dialout "$(id -un)"
@@ -64,7 +64,7 @@ At login, your shell takes a snapshot of your user and group memberships. Becaus
 :::
 
 1. (Optional) Disable ModemManager
-  On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
+   On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
 
 ```
 # preferred: stop and mask the service
@@ -93,7 +93,7 @@ chmod +x QGroundControl-<arch>.AppImage
 ```
 
 1. Run QGroundControl
-  Either double-click the AppImage in your file manager or launch it from a terminal:
+   Either double-click the AppImage in your file manager or launch it from a terminal:
 
 ```
 ./QGroundControl-<arch>.AppImage
@@ -101,7 +101,7 @@ chmod +x QGroundControl-<arch>.AppImage
 
 ## Android {#android}
 
-_QGroundControl_ can be installed/run on Android 9 or later:
+Supported versions: Android 9 to 15 (arm 32/64):
 
 - [Android 32/64 bit APK](https://qgroundcontrol.s3-us-west-2.amazonaws.com/latest/QGroundControl.apk)
 
diff --git a/docs/tr/qgc-user-guide/releases/daily_build_new_features.md b/docs/tr/qgc-user-guide/releases/daily_build_new_features.md
index ae8567b43834..8e64414ec619 100644
--- a/docs/tr/qgc-user-guide/releases/daily_build_new_features.md
+++ b/docs/tr/qgc-user-guide/releases/daily_build_new_features.md
@@ -39,5 +39,5 @@ There is also a [Change Log](https://github.com/mavlink/qgroundcontrol/blob/mast
 - Developer changes
   - Build system fully converted to cmake
     - qmake no longer supported
-  - Source updated to use Qt 6.8.3
-  - GStreamer support updated to 1.22
\ No newline at end of file
+  - Source updated to use Qt 6.10.0
+  - GStreamer support updated to 1.22
diff --git a/docs/tr/qgc-user-guide/releases/daily_builds.md b/docs/tr/qgc-user-guide/releases/daily_builds.md
index 66d5092279f4..e4e12e0e67e1 100644
--- a/docs/tr/qgc-user-guide/releases/daily_builds.md
+++ b/docs/tr/qgc-user-guide/releases/daily_builds.md
@@ -9,7 +9,9 @@ Use at your own risk.
 
 These can be downloaded from the links below (install as described in [Download and Install](../getting_started/download_and_install.md)):
 
-- [Windows](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer.exe)
+- Windows
+  - [x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-AMD64.exe)
+  - [Arm_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-ARM64.exe)
 - [OS X](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl.dmg)
 - Linux - (See installation instructions below)
   - [Linux x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-x86_64.AppImage)
@@ -26,7 +28,7 @@ chmod +x QGroundControl-<arch>.AppImage
 ```
 
 2. Enable serial-port access
-  Add your user to the dialout group so you can talk to USB devices without root:
+   Add your user to the dialout group so you can talk to USB devices without root:
 
 ```
 sudo usermod -aG dialout "$(id -un)"
@@ -37,7 +39,7 @@ At login, your shell takes a snapshot of your user and group memberships. Becaus
 :::
 
 3. (Optional) Disable ModemManager
-  On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
+   On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
 
 ```
 # preferred: stop and mask the service
@@ -48,7 +50,7 @@ sudo apt remove --purge modemmanager
 ```
 
 4. Run QGroundControl
-  Either double-click the AppImage in your file manager or launch it from a terminal:
+   Either double-click the AppImage in your file manager or launch it from a terminal:
 
 ```
 ./QGroundControl-<arch>.AppImage
diff --git a/docs/tr/qgc-user-guide/viewer_3d/viewer_3d.md b/docs/tr/qgc-user-guide/viewer_3d/viewer_3d.md
index dbc2415ffcef..f90339efe72a 100644
--- a/docs/tr/qgc-user-guide/viewer_3d/viewer_3d.md
+++ b/docs/tr/qgc-user-guide/viewer_3d/viewer_3d.md
@@ -7,12 +7,12 @@ You can use it to:
 - To import and display the 3D map for any region of interest downloaded from the OpenStreetMap website (.osm file).
 - Display the vehicle along with its mission in 3D.
 - And most of the capabilities of the [Fly View](../fly_view/fly_view.md), including:
-    - Run an automated [pre-flight checklist](#preflight_checklist).
-    - Arm the vehicle (or check why it won't arm).
-    - Control missions: [start](#start_mission), [continue](#continue_mission), [pause](#pause), and [resume](#resume_mission).
-    - Guide the vehicle to [arm](#arm)/[disarm](#disarm)/[emergency stop](#emergency_stop), [takeoff](#takeoff)/[land](#land), [change altitude](#change_altitude), and [return/RTL](#rtl).
-    - Switch between a map view and a video view (if available)
-    - Display video, mission, telemetry, and other information for the current vehicle, and also switch between connected vehicles.
+  - Run an automated [pre-flight checklist](#preflight_checklist).
+  - Arm the vehicle (or check why it won't arm).
+  - Control missions: [start](#start_mission), [continue](#continue_mission), [pause](#pause), and [resume](#resume_mission).
+  - Guide the vehicle to [arm](#arm)/[disarm](#disarm)/[emergency stop](#emergency_stop), [takeoff](#takeoff)/[land](#land), [change altitude](#change_altitude), and [return/RTL](#rtl).
+  - Switch between a map view and a video view (if available)
+  - Display video, mission, telemetry, and other information for the current vehicle, and also switch between connected vehicles.
 
 ![3D View](../../../assets/viewer_3d/viewer_3d_overview.jpg)
 
@@ -31,14 +31,14 @@ To open the 3D View, when you are in the [Fly View](../fly_view/fly_view.md), fr
 Once the 3D View is opened, you can navigate through the 3D environment by using either a mouse or a touchscreen as follows:
 
 - **Mouse:**
-    - **To move horizontally and vertically**: Press and hold the mouse left-click, then move the cursor.
-    - **To rotate**: Press and hold the mouse right-click, then move the cursor.
-    - **To zoom**: Use the mouse wheel\middle button.
+  - **To move horizontally and vertically**: Press and hold the mouse left-click, then move the cursor.
+  - **To rotate**: Press and hold the mouse right-click, then move the cursor.
+  - **To zoom**: Use the mouse wheel\middle button.
 
 - **Touchscreen:**
-    - **To move horizontally and vertically**: Use a single finger, then tap and move your finger.
-    - **To rotate**: Use two fingers, then tap and move your fingers while keeping them together.
-    - **To zoom**: Use a pinch with two fingers and move them together or apart to zoom in or out.
+  - **To move horizontally and vertically**: Use a single finger, then tap and move your finger.
+  - **To rotate**: Use two fingers, then tap and move your fingers while keeping them together.
+  - **To zoom**: Use a pinch with two fingers and move them together or apart to zoom in or out.
 
 To visualize the 3D map of a particular area in the 3D viewer, you have to download the .osm file of that area from the [OpenStreetMap](https://www.openstreetmap.org/#map=16/47.3964/8.5498) website and then import it through the **3D View** settings. More details on the **3D View** settings can be found in the next section.
 
@@ -51,5 +51,3 @@ The following properties can be modified in the 3D View settings group:
 - **3D Map File**: The path to the .osm file of a region of interest to be visualized in the QGC. The .osm file can be uploaded by clicking on the **Select File** button. To clear the 3D View from the previously loaded .osm file, you can click on the **Clear** button.
 - **Average Building Level Height**: This parameter determines the height of each storey of the buildings, as in .osm file sometimes the height of the buildings is specified in terms of the level/storey.
 - **Vehicle Altitude Bias**: This refers to the bias in the altitude of vehicles and their missions with respect to the ground level. It is helpful in cases where the estimated altitude of the vehicle by its flight control is biased, as the relative altitude is currently used in the 3D View.
-
-
diff --git a/docs/zh/qgc-dev-guide/contribute/pull_requests.md b/docs/zh/qgc-dev-guide/contribute/pull_requests.md
index 27c68c28ec00..12cb36cedb32 100644
--- a/docs/zh/qgc-dev-guide/contribute/pull_requests.md
+++ b/docs/zh/qgc-dev-guide/contribute/pull_requests.md
@@ -1,3 +1,16 @@
 # Pull Requests
 
 所有拉取请求都通过QGC CI构建系统，该系统构建版本和调试版本。 如果存在编译器警告，则构建将失败。 还针对支持的OS调试版本运行单元测试。 如果存在编译器警告，则构建将失败。 设备测试也是根据支持的操作系统调试构建运行的。
+
+## Automatic Release Note Generation
+
+Releases notes are generated from the following GitHub labels qhich should be set on Pull Requests as appropriate:
+
+- "RN: MAJOR FEATURE"
+- "RN: MINOR FEATURE"
+- "RN: IMPROVEMENT"
+- "RN: REFACTORING"
+- "RN: BUGFIX"
+- "RN: NEW BOARD SUPPORT"
+
+There are also a set of the above labels which end in "- CUSTOM BUILD" which indicate the changes is associated with the custom build architecture.
diff --git a/docs/zh/qgc-dev-guide/contribute/unit_tests.md b/docs/zh/qgc-dev-guide/contribute/unit_tests.md
index 42e3904b0204..00ebd2826e05 100644
--- a/docs/zh/qgc-dev-guide/contribute/unit_tests.md
+++ b/docs/zh/qgc-dev-guide/contribute/unit_tests.md
@@ -2,7 +2,7 @@
 
 _QGroundControl_ (QGC) contains a set of unit tests that must pass before a pull request will be accepted. 向QGC添加新的复杂子系统应该有相应的新单元测试来测试它。
 
-单元测试的完整列表可以在UnitTestList.cc中找到。
+The full list of unit tests can be found in [UnitTestList.cc](https://github.com/mavlink/qgroundcontrol/blob/master/test/UnitTestList.cc).
 
 要运行单元测试：
 
diff --git a/docs/zh/qgc-dev-guide/custom_build/mavlink.md b/docs/zh/qgc-dev-guide/custom_build/mavlink.md
index bbdb3addd0ee..cf4cb272acb7 100644
--- a/docs/zh/qgc-dev-guide/custom_build/mavlink.md
+++ b/docs/zh/qgc-dev-guide/custom_build/mavlink.md
@@ -20,4 +20,4 @@ To modify the version of MAVLink used by QGC:
     Just add to [/qgroundcontrol/cmake/CustomOptions.cmake](../../../../cmake/CustomOptions.cmake):
   ```cmake
   set(CPM_mavlink_SOURCE "/path/to/your/custom/mavlink")
-  ```
\ No newline at end of file
+  ```
diff --git a/docs/zh/qgc-dev-guide/custom_build/resource_override.md b/docs/zh/qgc-dev-guide/custom_build/resource_override.md
index 9c1b8930a7eb..f1c6c2461b26 100644
--- a/docs/zh/qgc-dev-guide/custom_build/resource_override.md
+++ b/docs/zh/qgc-dev-guide/custom_build/resource_override.md
@@ -11,4 +11,4 @@ By overriding a resource you can replace it with your own version of it. 这可
 
 Resource overrides work by using `QQmlEngine::addUrlInterceptor` to intercept requests for resources and re-route the request to available custom resources instead of the normal resource. Look at [custom_example/CustomPlugin.cc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CustomPlugin.cc) for how it's done and replicate that in your own custom build source.
 
-Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
\ No newline at end of file
+Custom resources that are meant for override are prepended with `/Custom` to the resource prefix in the custom resource file. The file alias for the resouce should be exactly the same as the normal QGC resource. Take a look at [custom_example/custom.qrc](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/custom.qrc) and [custom_example/CMakeLists.txt](https://github.com/mavlink/qgroundcontrol/blob/master/custom-example/CMakeLists.txt) for examples of how to do all of this.
diff --git a/docs/zh/qgc-dev-guide/custom_build/toolbar.md b/docs/zh/qgc-dev-guide/custom_build/toolbar.md
index 885086fd01cf..e4dae8b2607c 100644
--- a/docs/zh/qgc-dev-guide/custom_build/toolbar.md
+++ b/docs/zh/qgc-dev-guide/custom_build/toolbar.md
@@ -30,10 +30,6 @@ These provide information to the user which is not associated with a vehicle. Fo
 
 These are indicators which are associated with information about the vehicle. They are only available when a vehicle is connected. To manipulate the list of vehicle indicators you override `FirmwarePlugin::toolIndicators`.
 
-#### Vehicle Mode Indicators
-
-These are indicators which are associated with information about the vehicle. They require additional UI provided by the Fly View to complete their actions. 一个例子是“解锁与上锁” 。 They are only available when a vehicle is connected. To manipulate the list of vehicle mode indicators you override `FirmwarePlugin::modeIndicators`.
-
 ### Modifying the toolbar UI itself
 
 This is accomplished by using resource overrides on the qml files associated with the toolbar. This provides a high level of customization but also a higher level of complexity. The primary ui for the toolbar is in `MainToolBar.qml`. The main window code in `MainRootWindow.qml` interacts with the toolbar to show different indicator sections based on current view as well as whether the mode indicators show or not also based on current view.
diff --git a/docs/zh/qgc-dev-guide/getting_started/index.md b/docs/zh/qgc-dev-guide/getting_started/index.md
index 71e25502e397..aa5904783af4 100644
--- a/docs/zh/qgc-dev-guide/getting_started/index.md
+++ b/docs/zh/qgc-dev-guide/getting_started/index.md
@@ -1,5 +1,5 @@
 ---
-qt_version: 6.8.3
+qt_version: 6.10.0
 ---
 
 # 从源码开始并构建
@@ -21,15 +21,15 @@ _QGroundControl_ 的源代码保存在GitHub 上：https://github.com/mavlink/qg
 
 1. 克隆存储库 (或您的分叉), 包括子模块：
 
-  ```sh
-  git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
-  ```
+   ```sh
+   git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
+   ```
 
 2. 2.更新子模块（每次拉新源代码时都这样做）：
 
-  ```sh
-  git submodule update --recursive
-  ```
+   ```sh
+   git submodule update --recursive
+   ```
 
 :::tip
 提示：不能使用Github以zip形式下载源文件，因为zip压缩包中不包含相应的子模块源代码。 你必须使用git工具！
@@ -66,15 +66,15 @@ QGC 已通过指定 Qt 版本（{{ $frontmatter.qt_version }}）的全面测试
 如何安装Qt：
 
 1. 下载并运行[Qt Online Installer](https://www.qt.io/download-qt-installer-oss)
-  - **Ubuntu:**
-    - 使用以下命令将下载的文件设置为可执行文件：`chmod + x`
-    - 您可能还需要安装 libxcb-cursor0
+   - **Ubuntu:**
+     - 使用以下命令将下载的文件设置为可执行文件：`chmod + x`
+     - 您可能还需要安装 libxcb-cursor0
 
 2. 在 _Installation 文件夹页面选择"自定义安装"
 
 3. 在 _选择组件_ 页面：
 
-  - 如果您没有看到 {{ $frontmatter.qt_version }}_ 列出_Qt选中 _Archive_ 复选框并单击 _Filter_。
+   - 如果您没有看到 {{ $frontmatter.qt_version }}_ 列出_Qt选中 _Archive_ 复选框并单击 _Filter_。
 
 - 在 Qt -> _Qt {{ $frontmatter.qt_version }}_ 下选择：
   - **Windows**: MSVC 2022 _arch_ - 其中 “arch” 指的是您机器的架构
@@ -86,22 +86,21 @@ QGC 已通过指定 Qt 版本（{{ $frontmatter.qt_version }}）的全面测试
 
 1. 安装附加软件包(特殊平台)
 
-  - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
-  - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
-  - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
-  - **Mac** `sh qgroundcontrol/tools/setup/macos-dependencies.sh`
-  - **Android** [Setup](https://doc.qt.io/qt-6/android-getting-started.html)。 最新版本需要 JDK17 。 NDK 版本：25.1.8937393
-    您可以通过审查项目设置确认它正在使用：**Projects > Managing Kits >  Devices > Android (tab) > Android Settings > _JDK location_**。
-    注意：访问此处查看更详细的配置 [android.yml](.github/workflows/android.yml)
+   - **Ubuntu:** `sudo bash ./qgroundcontrol/tools/setup/install-dependencies-debian.sh`
+   - **Fedora:** `sudo dnf install speech-dispatcher SDL2-devel SDL2 systemd-devel patchelf`
+   - **Arch Linux:** `pacman -Sy speech-dispatcher patchelf`
+   - **Mac** `sh qgroundcontrol/tools/setup/install-dependencies-osx.sh`
+   - **Windows** `qgroundcontrol/tools/setup/install-depedencies-windows.ps1`
+   - **Android** Installing dependencies for android is quite involved. You are better off using Qt documentation for android setup instructions. Search for "Qt 6.10 android" on the internet to find the correct "Gettting Started with Qt for Android" page. Read it full and carefully! An example of what you are looking for is [here](https://doc.qt.io/qt-6/android-getting-started.html).
 
 2. 安装可选/特定操作功能
 
-  ::: info
-  依赖操作系统和用户安装的库的可选功能在下面链接/描述。
-  这些功能可以被强制启用/禁用，为qmake指定额外的值。
-  :::
+   ::: info
+   依赖操作系统和用户安装的库的可选功能在下面链接/描述。
+   这些功能可以被强制启用/禁用，为qmake指定额外的值。
+   :::
 
-  - **视频流/Gstream:** - 查看 [视频流](https://github.com/mavlink/qgroundcontrol/blob/master/src/VideoManager/VideoReceiver/GStreamer/README.md)
+   - **视频流/Gstream:** - 查看 [视频流](https://github.com/mavlink/qgroundcontrol/blob/master/src/VideoManager/VideoReceiver/GStreamer/README.md)
 
 #### 安装 Visual Studio (仅限Windows) {#vs}
 
@@ -123,7 +122,7 @@ Visual Studio 仅用于获取编译器。 构建 _QGroundControl_ 可直接按
 
 3. 使用"hammer" (或"play") 图标或菜单构建：
 
-  ![QtCreator Build Button](../../../assets/dev_getting_started/qt_creator_build_qgc.png)
+   ![QtCreator Build Button](../../../assets/dev_getting_started/qt_creator_build_qgc.png)
 
 #### 在CLI（命令行界面）使用 CMake {#cmake} 进行构建
 
@@ -131,29 +130,36 @@ Visual Studio 仅用于获取编译器。 构建 _QGroundControl_ 可直接按
 
 1. 请确保您克隆了仓库并先更新子模块，见上文 _源代码_ 章节并切换到仓库文件夹：
 
-  ```sh
-  cd qgroundcontrol
-  ```
+   ```sh
+   cd qgroundcontrol
+   ```
 
 2. 配置：
 
-  ```sh
-  ~/Qt/6.8.3/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
-  ```
+   ```sh
+   ~/Qt/{{ $frontmatter.qt_version }}/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
+   ```
 
-  修改 qt-cmake 的目录，使其与你安装 Qt 的位置以及你想要使用的工具包相匹配。
+   修改 qt-cmake 的目录，使其与你安装 Qt 的位置以及你想要使用的工具包相匹配。
+
+   **Mac**: To Sign/Notarize/Staple the QGC app bundle, add `-DQGC_MACOS_SIGN_WITH_IDENTITY=ON` to the configure command line. During the `install` phase the following environment variables will need to be available:
+
+   - `QGC_MACOS_SIGNING_IDENTITY` - Signing identity for your Developer ID certificate which must be in the keychain
+   - `QGC_MACOS_NOTARIZATION_USERNAME` - Username for your Apple Developer Account
+   - `QGC_MACOS_NOTARIZATION_PASSWORD` - App specific password for Notarization from your Apple Developer Account
+   - `QGC_MACOS_NOTARIZATION_TEAM_ID` - Apple Developer Account Team ID
 
 3. 构建
 
-  ```sh
-  cmake --build build --config Debug
-  ```
+   ```sh
+   cmake --build build --config Debug
+   ```
 
 4. Run the QGroundcontrol binary that was just built: `./staging/QGroundControl`
 
-  ```sh
-  ./build/Debug/QGroundControl
-  ```
+   ```sh
+   ./build/Debug/QGroundControl
+   ```
 
 ### Vagrant
 
diff --git a/docs/zh/qgc-user-guide/fly_view/camera_tools.md b/docs/zh/qgc-user-guide/fly_view/camera_tools.md
index db0fb030b714..252efed38f42 100644
--- a/docs/zh/qgc-user-guide/fly_view/camera_tools.md
+++ b/docs/zh/qgc-user-guide/fly_view/camera_tools.md
@@ -26,4 +26,4 @@
 视频页面用于启用/禁用视频流。
 启用后，您可以开始/停止视频流，启用网格叠加层， 更改图像如何适合屏幕，并用QGC 在本地录制视频。
 
-![仪表页面 - 视频流](../../../assets/fly/instrument_page_video_stream.jpg)
\ No newline at end of file
+![仪表页面 - 视频流](../../../assets/fly/instrument_page_video_stream.jpg)
diff --git a/docs/zh/qgc-user-guide/fly_view/fly_tools.md b/docs/zh/qgc-user-guide/fly_view/fly_tools.md
index 32a7ecce3ab1..b16740190851 100644
--- a/docs/zh/qgc-user-guide/fly_view/fly_tools.md
+++ b/docs/zh/qgc-user-guide/fly_view/fly_tools.md
@@ -57,4 +57,4 @@
 1. 按 _飞行工具_ 上的 **操作** 按钮
 2. 选择 _改变高度_ 按钮
 3. 从垂直滑块选择新高度
-4. 确认操作
\ No newline at end of file
+4. 确认操作
diff --git a/docs/zh/qgc-user-guide/fly_view/fly_view_toolbar.md b/docs/zh/qgc-user-guide/fly_view/fly_view_toolbar.md
index 48816f399a36..ba1854dcfc8a 100644
--- a/docs/zh/qgc-user-guide/fly_view/fly_view_toolbar.md
+++ b/docs/zh/qgc-user-guide/fly_view/fly_view_toolbar.md
@@ -73,6 +73,6 @@ GPS指示器在工具栏图标中向您显示卫星计数和HDOP。 下拉菜单
 
 - 遥测信号强度指示
 - 遥控信号强度指示
-- 云台
+- Gimbal - Only displayed if the vehicle supports the [Mavlink Gimbal Protocol](https://mavlink.io/en/services/gimbal_v2.html)
 - 垂直起降转换
 - 从多个连接的载具中选择
diff --git a/docs/zh/qgc-user-guide/fly_view/hud.md b/docs/zh/qgc-user-guide/fly_view/hud.md
index e7e521a370cc..6e00af93d9aa 100644
--- a/docs/zh/qgc-user-guide/fly_view/hud.md
+++ b/docs/zh/qgc-user-guide/fly_view/hud.md
@@ -309,13 +309,13 @@ To start a mission from landed:
 
 2. Select the _Start Mission_ action from the dialog.
 
-  ![Start mission action](../../../assets/fly/start_mission_action.jpg)
+   ![Start mission action](../../../assets/fly/start_mission_action.jpg)
 
-  (to display the confirmation slider)
+   (to display the confirmation slider)
 
 3. When the confirmation slider appears, drag it to start the mission.
 
-  ![Start mission](../../../assets/fly/start_mission.jpg)
+   ![Start mission](../../../assets/fly/start_mission.jpg)
 
 #### Continue Mission {#continue_mission}
 
@@ -333,11 +333,11 @@ You can continue the current mission while (unless already in a mission!):
 
 2. 在对话框中选择 _继续任务_ 操作。
 
-  ![继续任务/改变高度](../../../assets/fly/continue_mission_change_altitude_action.jpg)
+   ![继续任务/改变高度](../../../assets/fly/continue_mission_change_altitude_action.jpg)
 
 3. 拖动滑块以确认继续执行任务。
 
-  ![继续任务](../../../assets/fly/continue_mission.jpg)
+   ![继续任务](../../../assets/fly/continue_mission.jpg)
 
 #### 恢复任务{#resume_mission}
 
diff --git a/docs/zh/qgc-user-guide/fly_view/instrument_panel.md b/docs/zh/qgc-user-guide/fly_view/instrument_panel.md
index a696b73ab7f0..6c27daea3ada 100644
--- a/docs/zh/qgc-user-guide/fly_view/instrument_panel.md
+++ b/docs/zh/qgc-user-guide/fly_view/instrument_panel.md
@@ -29,4 +29,4 @@
 
 右上方的选择列表用于为载具或传感器选择一个特定的遥测值。
 
-![仪表板 - 值选项](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
\ No newline at end of file
+![仪表板 - 值选项](../../../assets/fly/instrument_panel/instrument_panel_edit_value_options.png)
diff --git a/docs/zh/qgc-user-guide/getting_started/download_and_install.md b/docs/zh/qgc-user-guide/getting_started/download_and_install.md
index b6029e821c55..392a49da155b 100644
--- a/docs/zh/qgc-user-guide/getting_started/download_and_install.md
+++ b/docs/zh/qgc-user-guide/getting_started/download_and_install.md
@@ -16,7 +16,7 @@ QGC可以在任何当下流行的计算机或移动设备上正常运行。 性
 
 ## Windows 系统 {#windows}
 
-_QGroundControl_ 可以安装在 Windows 10 (1809 或更高) 或 Windows 11的64 位版本上：
+Supported versions: Windows 10 (1809 or later), Windows 11:
 
 1. 下载 [QGroundControl-installer.exe](https://d176tv9ibo4jno.cloudfront.net/latest/QGroundControl-installer.exe)。
 2. 双击可执行文件来启动安装程序。
@@ -27,9 +27,9 @@ Windows 安装程序创建 3 个快捷方式：**QGroundControl**，**GPU 兼容
 更多信息请见[QGC 设置故障排查 > Windows：用户界面渲染 / 视频驱动问题](../troubleshooting/qgc_setup.md#opengl_troubleshooting)。
 :::
 
-## Mac OS X 系统 {#macOS}
+## Mac OS {#macOS}
 
-_QGroundControl_ 可以安装在 macOS 12 (Montreey) 上或以后：
+Supported versions: macOS 12 (Monterey) or later:
 
 <!-- match version using https://docs.qgroundcontrol.com/master/en/qgc-dev-guide/getting_started/#native-builds -->
 
@@ -39,12 +39,12 @@ _QGroundControl_ 可以安装在 macOS 12 (Montreey) 上或以后：
 2. 双击 .dmg 文件以挂载它，然后将 _QGroundControl_ 应用程序拖动到您的 _Application_ 文件夹。
 
 :::info
-QGroundControl continues to not be signed. You will not to allow permission for it to install based on you macOS version.
+QGroundControl continues to not be signed. You will not to allow permission for it to install based on your macOS version.
 :::
 
 ## Ubuntu Linux 系统 {#ubuntu}
 
-_QGroundControl_ 可以在 Ubuntu LTS 22.04 (及以后) 安装/运行：
+Supported versions: Ubuntu 22.04, 24.04:
 
 Ubuntu 自带一个串口调制解调器管理器，它会干扰串口（或 USB 转串口）在任何与机器人相关方面的使用。
 在安装 _QGroundControl_ 之前，您应该删除调制解调器管理器并授予自己访问串行端口的权限。
@@ -53,7 +53,7 @@ Ubuntu 自带一个串口调制解调器管理器，它会干扰串口（或 USB
 **Before installing _QGroundControl_ for the first time:**
 
 1. Enable serial-port access
-  Add your user to the dialout group so you can talk to USB devices without root:
+   Add your user to the dialout group so you can talk to USB devices without root:
 
 ```
 sudo usermod -aG dialout "$(id -un)"
@@ -64,7 +64,7 @@ At login, your shell takes a snapshot of your user and group memberships. Becaus
 :::
 
 1. (Optional) Disable ModemManager
-  On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
+   On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
 
 ```
 # preferred: stop and mask the service
@@ -93,7 +93,7 @@ chmod +x QGroundControl-<arch>.AppImage
 ```
 
 1. Run QGroundControl
-  Either double-click the AppImage in your file manager or launch it from a terminal:
+   Either double-click the AppImage in your file manager or launch it from a terminal:
 
 ```
 ./QGroundControl-<arch>.AppImage
@@ -101,7 +101,7 @@ chmod +x QGroundControl-<arch>.AppImage
 
 ## Android {#android}
 
-_QGroundControl_ 可以在 Android 9 上安装/运行：
+Supported versions: Android 9 to 15 (arm 32/64):
 
 - [Android 32/64 bit APK](https://qgroundcontrol.s3-us-west-2.amazonaws.com/latest/QGroundControl.apk)
 
diff --git a/docs/zh/qgc-user-guide/releases/daily_build_new_features.md b/docs/zh/qgc-user-guide/releases/daily_build_new_features.md
index 26d22a496859..d1b6467eaf5a 100644
--- a/docs/zh/qgc-user-guide/releases/daily_build_new_features.md
+++ b/docs/zh/qgc-user-guide/releases/daily_build_new_features.md
@@ -39,5 +39,5 @@
 - 开发者更改
   - 构建系统完全转换为 cmake
     - qmake 不再支持
-  - 源代码已更新为使用Qt 6.8.3
-  - GStreamer 支持已更新到 1.22
\ No newline at end of file
+  - Source updated to use Qt 6.10.0
+  - GStreamer 支持已更新到 1.22
diff --git a/docs/zh/qgc-user-guide/releases/daily_builds.md b/docs/zh/qgc-user-guide/releases/daily_builds.md
index 64aa8d9a3754..16262f6d4644 100644
--- a/docs/zh/qgc-user-guide/releases/daily_builds.md
+++ b/docs/zh/qgc-user-guide/releases/daily_builds.md
@@ -9,7 +9,9 @@ Use at your own risk.
 
 这些可从以下链接下载（按照 [下载与安装](../getting_started/download_and_install.md) 中所述进行安装）：
 
-- [Windows](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer.exe)
+- Windows
+  - [x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-AMD64.exe)
+  - [Arm_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-installer-ARM64.exe)
 - [OS X](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl.dmg)
 - Linux - (See installation instructions below)
   - [Linux x86_64](https://d176tv9ibo4jno.cloudfront.net/builds/master/QGroundControl-x86_64.AppImage)
@@ -26,7 +28,7 @@ chmod +x QGroundControl-<arch>.AppImage
 ```
 
 2. Enable serial-port access
-  Add your user to the dialout group so you can talk to USB devices without root:
+   Add your user to the dialout group so you can talk to USB devices without root:
 
 ```
 sudo usermod -aG dialout "$(id -un)"
@@ -37,7 +39,7 @@ At login, your shell takes a snapshot of your user and group memberships. Becaus
 :::
 
 3. (Optional) Disable ModemManager
-  On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
+   On some Ubuntu-based systems, ModemManager can claim serial ports that QGC needs. If you don't use it elsewhere, mask or remove it.
 
 ```
 # preferred: stop and mask the service
@@ -48,7 +50,7 @@ sudo apt remove --purge modemmanager
 ```
 
 4. Run QGroundControl
-  Either double-click the AppImage in your file manager or launch it from a terminal:
+   Either double-click the AppImage in your file manager or launch it from a terminal:
 
 ```
 ./QGroundControl-<arch>.AppImage
diff --git a/docs/zh/qgc-user-guide/viewer_3d/viewer_3d.md b/docs/zh/qgc-user-guide/viewer_3d/viewer_3d.md
index 996ebdd55414..d879a11f6b9e 100644
--- a/docs/zh/qgc-user-guide/viewer_3d/viewer_3d.md
+++ b/docs/zh/qgc-user-guide/viewer_3d/viewer_3d.md
@@ -7,12 +7,12 @@
 - 从OpenStreetMap 网站(.osm 文件)下载的任何感兴趣区域导入和显示3D映射图。
 - 在 3D 中显示车辆和它的任务。
 - 以及[飞行视图](../fly_view/fly_view.md)的大多数功能，包括：
-    - 运行一个自动的[飞行前检查列表](#preflight_checklist)。
-    - 把载具解锁(或检查它为什么不会解锁)。
-    - 控制任务： [开始](#start_mission)、 [继续](#continue_mission)、 [暂停](#pause)和 [恢复](#resume_mission)。
-    - 引导飞行器进行[解锁](#arm)/[上锁](#disarm)/[紧急停止](#emergency_stop)、[起飞](#takeoff)/[降落](#land)、[改变高度](#change_altitude) 以及 [返航/一键返航](#rtl)。
-    - 在地图视图和视频视图之间切换(如果可用)
-    - 显示当前载具的视频、飞行任务、遥测和其他信息，同时在已连接的载具之间切换。
+  - 运行一个自动的[飞行前检查列表](#preflight_checklist)。
+  - 把载具解锁(或检查它为什么不会解锁)。
+  - 控制任务： [开始](#start_mission)、 [继续](#continue_mission)、 [暂停](#pause)和 [恢复](#resume_mission)。
+  - 引导飞行器进行[解锁](#arm)/[上锁](#disarm)/[紧急停止](#emergency_stop)、[起飞](#takeoff)/[降落](#land)、[改变高度](#change_altitude) 以及 [返航/一键返航](#rtl)。
+  - 在地图视图和视频视图之间切换(如果可用)
+  - 显示当前载具的视频、飞行任务、遥测和其他信息，同时在已连接的载具之间切换。
 
 ![3D 视图](../../../assets/viewer_3d/viewer_3d_overview.jpg)
 
@@ -31,14 +31,14 @@
 打开3D视图后，您可以使用鼠标或触摸屏来导航3D环境：
 
 - **鼠标：**
-    - **要水平和垂直移动**：按住鼠标左键，然后移动光标。
-    - **要旋转**：按住鼠标右键，然后移动光标。
-    - **放大**：使用鼠标滚轮\中键。
+  - **要水平和垂直移动**：按住鼠标左键，然后移动光标。
+  - **要旋转**：按住鼠标右键，然后移动光标。
+  - **放大**：使用鼠标滚轮\中键。
 
 - **触摸屏:**
-    - **要水平和垂直移动**：使用单指，然后点击并移动您的手指。
-    - **要旋转**：使用两个手指，然后点击并移动你的手指，同时将它们保持在一起。
-    - **要缩放**：使用双指的粉丝并移动到一起或分别缩放。
+  - **要水平和垂直移动**：使用单指，然后点击并移动您的手指。
+  - **要旋转**：使用两个手指，然后点击并移动你的手指，同时将它们保持在一起。
+  - **要缩放**：使用双指的粉丝并移动到一起或分别缩放。
 
 若要在三维查看器中可视化特定区域的3D地图，您必须下载。 从 [OpenStreetMap](https://www.openstreetmap.org/#map=16/47.3964/8.5498)网站上的sm 文件，然后通过 **3D View** 的设置导入。 更多关于**3D View** 设置的详细信息可在下一节找到。
 
@@ -51,5 +51,3 @@
 - **3D地图文件**：在QGC中可视化感兴趣区域的.osm文件的路径。 可以点击 **选择文件** 按钮上传.osm 文件。 要清除以前加载的 .osm 文件的3D 视图，您可以点击**清除** 按钮。
 - **建筑物平均楼层高度**：此参数决定建筑物每层的高度，因为在.osm文件中，建筑物高度有时是按楼层来指定的。
 - **载具高度偏差**：这是指载具及其任务的高度相对于地面的偏差。 在飞行器飞控估算的高度存在偏差的情况下，这很有用，因为3D视图目前使用的是相对高度。
-
-
diff --git a/package-lock.json b/package-lock.json
index c26574e517e9..1da0bd9e8444 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
             "version": "1.0.1",
             "license": "CC-BY-4.0",
             "dependencies": {
-                "vitepress": "^1.6.3"
+                "vitepress": "^1.6.4"
             }
         },
         "node_modules/@algolia/autocomplete-core": {
@@ -2106,10 +2106,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "5.4.19",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
-            "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
-            "license": "MIT",
+            "version": "5.4.21",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+            "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
             "dependencies": {
                 "esbuild": "^0.21.3",
                 "postcss": "^8.4.43",
@@ -2165,10 +2164,9 @@
             }
         },
         "node_modules/vitepress": {
-            "version": "1.6.3",
-            "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.3.tgz",
-            "integrity": "sha512-fCkfdOk8yRZT8GD9BFqusW3+GggWYZ/rYncOfmgcDtP3ualNHCAg+Robxp2/6xfH1WwPHtGpPwv7mbA3qomtBw==",
-            "license": "MIT",
+            "version": "1.6.4",
+            "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+            "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
             "dependencies": {
                 "@docsearch/css": "3.8.2",
                 "@docsearch/js": "3.8.2",
@@ -3471,9 +3469,9 @@
             }
         },
         "vite": {
-            "version": "5.4.19",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.19.tgz",
-            "integrity": "sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==",
+            "version": "5.4.21",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+            "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
             "requires": {
                 "esbuild": "^0.21.3",
                 "fsevents": "~2.3.3",
@@ -3482,9 +3480,9 @@
             }
         },
         "vitepress": {
-            "version": "1.6.3",
-            "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.3.tgz",
-            "integrity": "sha512-fCkfdOk8yRZT8GD9BFqusW3+GggWYZ/rYncOfmgcDtP3ualNHCAg+Robxp2/6xfH1WwPHtGpPwv7mbA3qomtBw==",
+            "version": "1.6.4",
+            "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz",
+            "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==",
             "requires": {
                 "@docsearch/css": "3.8.2",
                 "@docsearch/js": "3.8.2",
diff --git a/package.json b/package.json
index c9c8d8099611..d8fd0bb6446e 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
         "start": "yarn docs:dev"
     },
     "dependencies": {
-        "vitepress": "^1.6.3"
+        "vitepress": "^1.6.4"
     },
     "license": "CC-BY-4.0",
     "repository": {
diff --git a/qgcimages.qrc b/qgcimages.qrc
index 60fabeb58894..5c995eac1753 100644
--- a/qgcimages.qrc
+++ b/qgcimages.qrc
@@ -25,6 +25,7 @@
         <file alias="Airframe/QuadRotorWide.svg">src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
         <file alias="Airframe/QuadRotorX.svg">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
         <file alias="Airframe/Rover.svg">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
+        <file alias="Airframe/FreeFlyer.svg">src/AutoPilotPlugins/Common/Images/FreeFlyer.svg</file>
         <file alias="Airframe/Vectored6DofUUV.svg">src/AutoPilotPlugins/Common/Images/Vectored6DofUUV.svg</file>
         <file alias="Airframe/VTOLDuoRotorTailSitter.svg">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
         <file alias="Airframe/VTOLPlane.svg">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
diff --git a/qgcresources.qrc b/qgcresources.qrc
index 221737f1f1cf..37d88c0533c2 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -108,11 +108,18 @@
         <file>resources/opengl/buglist.json</file>
     </qresource>
     <qresource prefix="/gimbal">
-        <file alias="payload.svg">resources/gimbal/payload.svg</file>
+        <file alias="payload.png">resources/gimbal/payload.png</file>
     </qresource>
     <qresource prefix="/gcscontrolIndicator">
         <file alias="gcscontrol_device.svg">resources/gcscontrolIndicator/gcscontrol_device.svg</file>
         <file alias="gcscontrol_gcs.svg">resources/gcscontrolIndicator/gcscontrol_gcs.svg</file>
         <file alias="gcscontrol_line.svg">resources/gcscontrolIndicator/gcscontrol_line.svg</file>
     </qresource>
+        <qresource prefix="/qml">
+        <file alias="QGroundControl/AppSettings/NTRIPSettings.qml">src/UI/AppSettings/NTRIPSettings.qml</file>
+        <file alias="NTRIPSettings.qml">src/UI/AppSettings/NTRIPSettings.qml</file>
+    </qresource>
+    <qresource prefix="/json">
+        <file alias="NTRIP.SettingsGroup.json">src/Settings/NTRIP.SettingsGroup.json</file>
+    </qresource>
 </RCC>
diff --git a/resources/InstrumentValueIcons/UpdateResourceFile.py b/resources/InstrumentValueIcons/UpdateResourceFile.py
index 4ec3c13aa8a3..9c29eeee4e39 100644
--- a/resources/InstrumentValueIcons/UpdateResourceFile.py
+++ b/resources/InstrumentValueIcons/UpdateResourceFile.py
@@ -1,21 +1,23 @@
 #!/usr/bin/env python
 import os
 
+
 def main():
-    qrcFile = open("InstrumentValueIcons.qrc", 'wt')
+    qrcFile = open("InstrumentValueIcons.qrc", "wt")
 
     qrcFile.write("<RCC>\n")
-    qrcFile.write("\t<qresource prefix=\"/InstrumentValueIcons\">\n")
+    qrcFile.write('\t<qresource prefix="/InstrumentValueIcons">\n')
 
     files = os.listdir(".")
     for filename in files:
         if filename.endswith(".svg"):
-            qrcFile.write("\t\t<file alias=\"%s\">%s</file>\n" % (filename, filename))
+            qrcFile.write('\t\t<file alias="%s">%s</file>\n' % (filename, filename))
 
     qrcFile.write("\t</qresource>\n")
     qrcFile.write("</RCC>\n")
 
     qrcFile.close()
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()
diff --git a/resources/gimbal/payload.png b/resources/gimbal/payload.png
new file mode 100644
index 000000000000..fc490674bb3c
Binary files /dev/null and b/resources/gimbal/payload.png differ
diff --git a/resources/gimbal/payload.svg b/resources/gimbal/payload.svg
deleted file mode 100644
index d3563162cb97..000000000000
--- a/resources/gimbal/payload.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="Capa_2" data-name="Capa 2" viewBox="0 0 80 80">
-    <defs>
-        <style>
-            .cls-1{fill:#fff}
-        </style>
-    </defs>
-    <g id="Capa_1-2" data-name="Capa 1">
-        <g style="opacity:.6">
-            <path d="M0 0h80v80H0z" style="fill:none"/>
-        </g>
-        <path d="M16.86 58.51c0-8.48 4.58-15.88 11.39-19.91h-8.46a6.31 6.31 0 0 0-6.31 6.31v25.75a6.31 6.31 0 0 0 6.31 6.31h6.31c-5.6-4.22-9.24-10.91-9.24-18.47Z" class="cls-1"/>
-        <path d="M40 37.03c-11.87 0-21.49 9.62-21.49 21.49S28.13 80.01 40 80.01s21.49-9.62 21.49-21.49S51.87 37.03 40 37.03m0 39.89c-10.17 0-18.41-8.24-18.41-18.41S29.83 40.1 40 40.1s18.41 8.24 18.41 18.41S50.17 76.92 40 76.92" class="cls-1"/>
-        <path d="M60.21 38.6h-8.46c6.81 4.03 11.39 11.42 11.39 19.91 0 7.55-3.64 14.24-9.24 18.47h6.31a6.31 6.31 0 0 0 6.31-6.31V44.92a6.31 6.31 0 0 0-6.31-6.31Zm2.24 5.97c-1.04 0-1.89-.85-1.89-1.89s.85-1.89 1.89-1.89 1.89.85 1.89 1.89-.85 1.89-1.89 1.89M50.74 5.24V1.97C50.74.88 50.09 0 49.29 0H30.7c-.8 0-1.45.88-1.45 1.97v3.27h21.48ZM29.26 6.64h21.48v4.65H29.26zM29.26 12.7v3.27c0 1.09.65 1.97 1.45 1.97H49.3c.8 0 1.45-.88 1.45-1.97V12.7H29.27ZM37.45 34.72V21.33h5.09v13.39c1.47.14 2.89.43 4.28.81.05-.18.08-.38.08-.57V19.43H33.08v15.53c0 .2.03.39.08.57 1.39-.38 2.81-.67 4.28-.81Z" class="cls-1"/>
-    </g>
-</svg>
diff --git a/src/ADSB/ADSBTCPLink.cc b/src/ADSB/ADSBTCPLink.cc
index 936612f41de3..765d4e25c021 100644
--- a/src/ADSB/ADSBTCPLink.cc
+++ b/src/ADSB/ADSBTCPLink.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QTimer>
 #include <QtNetwork/QTcpSocket>
 
-QGC_LOGGING_CATEGORY(ADSBTCPLinkLog, "qgc.adsb.adsbtcplink")
+QGC_LOGGING_CATEGORY(ADSBTCPLinkLog, "ADSB.ADSBTCPLink")
 
 ADSBTCPLink::ADSBTCPLink(const QHostAddress &hostAddress, quint16 port, QObject *parent)
     : QObject(parent)
diff --git a/src/ADSB/ADSBVehicle.cc b/src/ADSB/ADSBVehicle.cc
index 115fea20196e..9c402b06e425 100644
--- a/src/ADSB/ADSBVehicle.cc
+++ b/src/ADSB/ADSBVehicle.cc
@@ -13,7 +13,7 @@
 
 #include <QtCore/QtNumeric>
 
-QGC_LOGGING_CATEGORY(ADSBVehicleLog, "qgc.adsb.adsbvehicle")
+QGC_LOGGING_CATEGORY(ADSBVehicleLog, "ADSB.ADSBVehicle")
 
 ADSBVehicle::ADSBVehicle(const ADSB::VehicleInfo_t &vehicleInfo, QObject *parent)
     : QObject(parent)
@@ -36,7 +36,7 @@ void ADSBVehicle::update(const ADSB::VehicleInfo_t &vehicleInfo)
         return;
     }
 
-    qCDebug(ADSBVehicleLog) << "Updating" << QStringLiteral("%1 Flags: %2").arg(vehicleInfo.icaoAddress, 0, 16).arg(vehicleInfo.availableFlags, 0, 2);
+    qCDebug(ADSBVehicleLog) << "Updating" << QStringLiteral("%1 Flags: %2").arg(vehicleInfo.icaoAddress, 0, 16).arg(vehicleInfo.availableFlags.toInt(), 0, 2);
 
     if (vehicleInfo.availableFlags & ADSB::LocationAvailable) {
         if (!QGC::fuzzyCompare(vehicleInfo.location.latitude(), coordinate().latitude()) || !QGC::fuzzyCompare(vehicleInfo.location.longitude(), coordinate().longitude())) {
diff --git a/src/ADSB/ADSBVehicleManager.cc b/src/ADSB/ADSBVehicleManager.cc
index 3c8dabad5ecd..a8eaf850ace4 100644
--- a/src/ADSB/ADSBVehicleManager.cc
+++ b/src/ADSB/ADSBVehicleManager.cc
@@ -20,7 +20,7 @@
 #include <QtCore/QTimer>
 #include <qassert.h>
 
-QGC_LOGGING_CATEGORY(ADSBVehicleManagerLog, "qgc.adsb.adsbvehiclemanager")
+QGC_LOGGING_CATEGORY(ADSBVehicleManagerLog, "ADSB.ADSBVehicleManager")
 
 Q_APPLICATION_STATIC(ADSBVehicleManager, _adsbVehicleManager, SettingsManager::instance()->adsbVehicleManagerSettings());
 
diff --git a/src/ADSB/CMakeLists.txt b/src/ADSB/CMakeLists.txt
index 4cfa8c870d57..10695141faf2 100644
--- a/src/ADSB/CMakeLists.txt
+++ b/src/ADSB/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# ADS-B Module
+# Automatic Dependent Surveillance-Broadcast for air traffic awareness
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ADSBTCPLink.cc
diff --git a/src/API/CMakeLists.txt b/src/API/CMakeLists.txt
index ab2df327ad49..65786f431911 100644
--- a/src/API/CMakeLists.txt
+++ b/src/API/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# API Module
+# Core plugin architecture and QML component interfaces
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         QGCCorePlugin.cc
diff --git a/src/API/QGCCorePlugin.cc b/src/API/QGCCorePlugin.cc
index ae2ee81461af..7194d4a8f7d5 100644
--- a/src/API/QGCCorePlugin.cc
+++ b/src/API/QGCCorePlugin.cc
@@ -40,7 +40,7 @@
 #include <QtQml/QQmlContext>
 #include <QtQuick/QQuickItem>
 
-QGC_LOGGING_CATEGORY(QGCCorePluginLog, "qgc.api.qgccoreplugin");
+QGC_LOGGING_CATEGORY(QGCCorePluginLog, "API.QGCCorePlugin");
 
 #ifndef QGC_CUSTOM_BUILD
 Q_APPLICATION_STATIC(QGCCorePlugin, _qgcCorePluginInstance);
@@ -110,7 +110,7 @@ const QmlObjectListModel *QGCCorePlugin::customMapItems()
     return _emptyCustomMapItems;
 }
 
-bool QGCCorePlugin::adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData)
+void QGCCorePlugin::adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData, bool &visible)
 {
     if (settingsGroup == AppSettings::settingsGroup) {
         if (metaData.name() == AppSettings::indoorPaletteName) {
@@ -121,22 +121,21 @@ bool QGCCorePlugin::adjustSettingMetaData(const QString &settingsGroup, FactMeta
             outdoorPalette = 1;
 #endif
             metaData.setRawDefaultValue(outdoorPalette);
-            return true;
+            return;
         }
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
         else if (metaData.name() == MavlinkSettings::telemetrySaveName) {
             metaData.setRawDefaultValue(false);
-            return true;
+            return;
         }
 #endif
 #ifndef Q_OS_ANDROID
-        else if (metaData.name() == AppSettings::androidSaveToSDCardName) {
-            return false;
+        else if (metaData.name() == AppSettings::androidDontSaveToSDCardName) {
+            visible = false;
+            return;
         }
 #endif
     }
-
-    return true;
 }
 
 QString QGCCorePlugin::showAdvancedUIMessage() const
@@ -149,10 +148,16 @@ QString QGCCorePlugin::showAdvancedUIMessage() const
 
 void QGCCorePlugin::factValueGridCreateDefaultSettings(FactValueGrid* factValueGrid)
 {
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    FactValueGrid::FontSize defaultFontSize = FactValueGrid::DefaultFontSize;
+#else
+    FactValueGrid::FontSize defaultFontSize = FactValueGrid::MediumFontSize;
+#endif
+
     if (factValueGrid->specificVehicleForCard()) {
         bool includeFWValues = factValueGrid->vehicleClass() == QGCMAVLink::VehicleClassFixedWing || factValueGrid->vehicleClass() == QGCMAVLink::VehicleClassVTOL || factValueGrid->vehicleClass() == QGCMAVLink::VehicleClassAirship;
 
-        factValueGrid->setFontSize(FactValueGrid::LargeFontSize);
+        factValueGrid->setFontSize(defaultFontSize);
         factValueGrid->appendColumn();
         factValueGrid->appendColumn();
 
@@ -183,7 +188,7 @@ void QGCCorePlugin::factValueGridCreateDefaultSettings(FactValueGrid* factValueG
     } else {
         const bool includeFWValues = ((factValueGrid->vehicleClass() == QGCMAVLink::VehicleClassFixedWing) || (factValueGrid->vehicleClass() == QGCMAVLink::VehicleClassVTOL) || (factValueGrid->vehicleClass() == QGCMAVLink::VehicleClassAirship));
 
-        factValueGrid->setFontSize(FactValueGrid::LargeFontSize);
+        factValueGrid->setFontSize(defaultFontSize);
 
         (void) factValueGrid->appendColumn();
         (void) factValueGrid->appendColumn();
diff --git a/src/API/QGCCorePlugin.h b/src/API/QGCCorePlugin.h
index 6e86af66b738..7b81a80d45b1 100644
--- a/src/API/QGCCorePlugin.h
+++ b/src/API/QGCCorePlugin.h
@@ -78,11 +78,12 @@ class QGCCorePlugin : public QObject
     /// @return true: Show settings ui, false: Hide settings ui
     virtual bool overrideSettingsGroupVisibility(const QString &name) { Q_UNUSED(name); return true; }
 
-    /// Allows the core plugin to override the setting meta data before the setting fact is created.
+    /// Allows the core plugin to override the meta data before the fact is created.
     ///     @param settingsGroup - QSettings group which contains this item
     ///     @param metaData - MetaData for setting fact
-    /// @return true: Setting should be visible in ui, false: Setting should not be shown in ui
-    virtual bool adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData);
+    ///     @param visible - true: Setting should be visible in ui, false: Setting should not be shown in ui (default value will be used as value)
+    /// If not overridden, metaData and visible are left unchanged.
+    virtual void adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData, bool &visible);
 
     /// Return the resource file which contains the brand image for for Indoor theme.
     virtual QString brandImageIndoor() const { return QString(); }
diff --git a/src/API/QGCOptions.cc b/src/API/QGCOptions.cc
index b334d48c7d84..a49fc4db259a 100644
--- a/src/API/QGCOptions.cc
+++ b/src/API/QGCOptions.cc
@@ -10,7 +10,7 @@
 #include "QGCOptions.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(QGCFlyViewOptionsLog, "qgc.api.qgcflyviewoptions");
+QGC_LOGGING_CATEGORY(QGCFlyViewOptionsLog, "API.QGCFlyViewOptions");
 
 QGCFlyViewOptions::QGCFlyViewOptions(QGCOptions *options, QObject *parent)
     : QObject(parent)
@@ -26,7 +26,7 @@ QGCFlyViewOptions::~QGCFlyViewOptions()
 
 /*===========================================================================*/
 
-QGC_LOGGING_CATEGORY(QGCOptionsLog, "qgc.api.qgcoptions");
+QGC_LOGGING_CATEGORY(QGCOptionsLog, "API.QGCOptions");
 
 QGCOptions::QGCOptions(QObject *parent)
     : QObject(parent)
diff --git a/src/API/QGCOptions.h b/src/API/QGCOptions.h
index fed55fe2ca08..e475aa6f9617 100644
--- a/src/API/QGCOptions.h
+++ b/src/API/QGCOptions.h
@@ -84,7 +84,6 @@ class QGCOptions : public QObject
     Q_PROPERTY(bool showSensorCalibrationLevel      READ showSensorCalibrationLevel     NOTIFY showSensorCalibrationLevelChanged)
     Q_PROPERTY(bool showSimpleMissionStart          READ showSimpleMissionStart         NOTIFY showSimpleMissionStartChanged)
     Q_PROPERTY(bool useMobileFileDialog             READ useMobileFileDialog            CONSTANT)
-    Q_PROPERTY(bool wifiReliableForCalibration      READ wifiReliableForCalibration     CONSTANT)
     Q_PROPERTY(double toolbarHeightMultiplier       READ toolbarHeightMultiplier        CONSTANT)
     Q_PROPERTY(float devicePixelDensity             READ devicePixelDensity             NOTIFY devicePixelDensityChanged)
     Q_PROPERTY(float devicePixelRatio               READ devicePixelRatio               NOTIFY devicePixelRatioChanged)
@@ -155,8 +154,6 @@ class QGCOptions : public QObject
     virtual bool showPX4LogTransferOptions() const { return true; }
     virtual bool showSimpleMissionStart() const { return false; }
 
-    virtual bool wifiReliableForCalibration() const { return false; }
-
     /// Desktop builds save the main application size and position on close (and restore it on open)
     virtual bool enableSaveMainWindowPosition() const { return true; }
 
diff --git a/src/API/QmlComponentInfo.cc b/src/API/QmlComponentInfo.cc
index c8a9a6e55c83..d264d798357a 100644
--- a/src/API/QmlComponentInfo.cc
+++ b/src/API/QmlComponentInfo.cc
@@ -10,7 +10,7 @@
 #include "QmlComponentInfo.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(QmlComponentInfoLog, "qgc.api.qmlcomponentinfo");
+QGC_LOGGING_CATEGORY(QmlComponentInfoLog, "API.QmlComponentInfo");
 
 QmlComponentInfo::QmlComponentInfo(const QString &title, QUrl url, QUrl icon, QObject *parent)
     : QObject(parent)
diff --git a/src/AnalyzeView/AnalyzeView.qml b/src/AnalyzeView/AnalyzeView.qml
index 3f32d2fb3f0c..8b5390bb96e2 100644
--- a/src/AnalyzeView/AnalyzeView.qml
+++ b/src/AnalyzeView/AnalyzeView.qml
@@ -30,6 +30,11 @@ Rectangle {
     readonly property real  _verticalMargin:        _defaultTextHeight / 2
     readonly property real  _buttonWidth:           _defaultTextWidth * 18
 
+    // This need to block click event leakage to underlying map.
+    DeadMouseArea {
+        anchors.fill: parent
+    }
+
     GeoTagController {
         id: geoController
     }
diff --git a/src/AnalyzeView/CMakeLists.txt b/src/AnalyzeView/CMakeLists.txt
index 25bc1bc3b5f7..202de77e55c6 100644
--- a/src/AnalyzeView/CMakeLists.txt
+++ b/src/AnalyzeView/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Analyze View Module
+# Flight log analysis, MAVLink inspection, and telemetry visualization
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ExifParser.cc
@@ -30,6 +35,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# QML Module for Analyze View UI
+# ----------------------------------------------------------------------------
 qt_add_library(AnalyzeViewModule STATIC)
 
 qt_add_qml_module(AnalyzeViewModule
@@ -46,7 +54,9 @@ qt_add_qml_module(AnalyzeViewModule
     NO_PLUGIN
 )
 
-#===========================================================================#
+# ============================================================================
+# ULog Parser Integration
+# ============================================================================
 
 CPMAddPackage(
     NAME ulog_cpp
@@ -54,6 +64,7 @@ CPMAddPackage(
     GIT_TAG main
 )
 
+# Suppress Clang warnings for ulog_cpp
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     target_compile_options(ulog_cpp PRIVATE -Wno-unknown-warning-option)
 endif()
diff --git a/src/AnalyzeView/ExifParser.cc b/src/AnalyzeView/ExifParser.cc
index 0e9edc74ba64..af0ae559c240 100644
--- a/src/AnalyzeView/ExifParser.cc
+++ b/src/AnalyzeView/ExifParser.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QtEndian>
 
-QGC_LOGGING_CATEGORY(ExifParserLog, "qgc.analyzeview.exifparser")
+QGC_LOGGING_CATEGORY(ExifParserLog, "AnalyzeView.ExifParser")
 
 namespace ExifParser
 {
diff --git a/src/AnalyzeView/GeoTagController.cc b/src/AnalyzeView/GeoTagController.cc
index fbad97313639..792ad7bc61ef 100644
--- a/src/AnalyzeView/GeoTagController.cc
+++ b/src/AnalyzeView/GeoTagController.cc
@@ -16,7 +16,7 @@
 #include <QtCore/QThread>
 #include <QtCore/QUrl>
 
-QGC_LOGGING_CATEGORY(GeoTagControllerLog, "qgc.analyzeview.geotagcontroller")
+QGC_LOGGING_CATEGORY(GeoTagControllerLog, "AnalyzeView.GeoTagController")
 
 GeoTagController::GeoTagController(QObject *parent)
     : QObject(parent)
diff --git a/src/AnalyzeView/GeoTagWorker.cc b/src/AnalyzeView/GeoTagWorker.cc
index 234ae6f470b2..38352e5508da 100644
--- a/src/AnalyzeView/GeoTagWorker.cc
+++ b/src/AnalyzeView/GeoTagWorker.cc
@@ -17,7 +17,7 @@
 
 #include <QtCore/QDir>
 
-QGC_LOGGING_CATEGORY(GeoTagWorkerLog, "qgc.analyzeview.geotagworker")
+QGC_LOGGING_CATEGORY(GeoTagWorkerLog, "AnalyzeView.GeoTagWorker")
 
 GeoTagWorker::GeoTagWorker(QObject *parent)
     : QObject(parent)
diff --git a/src/AnalyzeView/LogDownloadController.cc b/src/AnalyzeView/LogDownloadController.cc
index 1ae5f6ce6fb0..ccf020f9c2c2 100644
--- a/src/AnalyzeView/LogDownloadController.cc
+++ b/src/AnalyzeView/LogDownloadController.cc
@@ -22,7 +22,7 @@
 #include <QtCore/QApplicationStatic>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(LogDownloadControllerLog, "qgc.analyzeview.logdownloadcontroller")
+QGC_LOGGING_CATEGORY(LogDownloadControllerLog, "AnalyzeView.LogDownloadController")
 
 LogDownloadController::LogDownloadController(QObject *parent)
     : QObject(parent)
diff --git a/src/AnalyzeView/LogEntry.cc b/src/AnalyzeView/LogEntry.cc
index e03a7964b7f0..f933d8214549 100644
--- a/src/AnalyzeView/LogEntry.cc
+++ b/src/AnalyzeView/LogEntry.cc
@@ -13,7 +13,7 @@
 
 #include <QtCore/QtMath>
 
-QGC_LOGGING_CATEGORY(LogEntryLog, "test.analyzeview.logentry")
+QGC_LOGGING_CATEGORY(LogEntryLog, "AnalyzeView.QGCLogEntry")
 
 LogDownloadData::LogDownloadData(QGCLogEntry * const entry)
     : ID(entry->id())
diff --git a/src/AnalyzeView/MAVLinkChartController.cc b/src/AnalyzeView/MAVLinkChartController.cc
index d944914bd808..f4f64563810f 100644
--- a/src/AnalyzeView/MAVLinkChartController.cc
+++ b/src/AnalyzeView/MAVLinkChartController.cc
@@ -18,12 +18,10 @@
 
 Q_DECLARE_METATYPE(QAbstractSeries*)
 
-QGC_LOGGING_CATEGORY(MAVLinkChartControllerLog, "qgc.analyzeview.mavlinkchartcontroller")
+QGC_LOGGING_CATEGORY(MAVLinkChartControllerLog, "AnalyzeView.MAVLinkChartController")
 
-MAVLinkChartController::MAVLinkChartController(MAVLinkInspectorController *controller, int index, QObject *parent)
+MAVLinkChartController::MAVLinkChartController(QObject *parent)
     : QObject(parent)
-    , _index(index)
-    , _controller(controller)
     , _updateSeriesTimer(new QTimer(this))
 {
     // qCDebug(MAVLinkChartControllerLog) << Q_FUNC_INFO << this;
@@ -31,8 +29,6 @@ MAVLinkChartController::MAVLinkChartController(MAVLinkInspectorController *contr
     (void) qRegisterMetaType<QAbstractSeries*>("QAbstractSeries*");
 
     (void) connect(_updateSeriesTimer, &QTimer::timeout, this, &MAVLinkChartController::_refreshSeries);
-
-    updateXRange();
 }
 
 MAVLinkChartController::~MAVLinkChartController()
@@ -40,13 +36,23 @@ MAVLinkChartController::~MAVLinkChartController()
     // qCDebug(MAVLinkChartControllerLog) << Q_FUNC_INFO << this;
 }
 
+void MAVLinkChartController::setInspectorController(MAVLinkInspectorController *controller)
+{
+    if (_inspectorController == controller) {
+        return;
+    }
+
+    _inspectorController = controller;
+    updateXRange();
+}
+
 void MAVLinkChartController::setRangeYIndex(quint32 index)
 {
     if (index == _rangeYIndex) {
         return;
     }
 
-    if (index >= static_cast<quint32>(_controller->rangeSt().count())) {
+    if (index >= static_cast<quint32>(_inspectorController->rangeSt().count())) {
         return;
     }
 
@@ -54,7 +60,7 @@ void MAVLinkChartController::setRangeYIndex(quint32 index)
     emit rangeYIndexChanged();
 
     // If not Auto, use defined range
-    const qreal range = _controller->rangeSt()[static_cast<int>(index)]->range;
+    const qreal range = _inspectorController->rangeSt()[static_cast<int>(index)]->range;
     if (_rangeYIndex > 0) {
         _rangeYMin = -range;
         emit rangeYMinChanged();
@@ -78,7 +84,7 @@ void MAVLinkChartController::setRangeXIndex(quint32 index)
 
 void MAVLinkChartController::updateXRange()
 {
-    if (_rangeXIndex >= static_cast<quint32>(_controller->timeScaleSt().count())) {
+    if (_rangeXIndex >= static_cast<quint32>(_inspectorController->timeScaleSt().count())) {
         return;
     }
 
@@ -86,7 +92,7 @@ void MAVLinkChartController::updateXRange()
     _rangeXMax = QDateTime::fromMSecsSinceEpoch(bootTime);
     emit rangeXMaxChanged();
 
-    _rangeXMin = QDateTime::fromMSecsSinceEpoch(bootTime - _controller->timeScaleSt()[static_cast<int>(_rangeXIndex)]->timeScale);
+    _rangeXMin = QDateTime::fromMSecsSinceEpoch(bootTime - _inspectorController->timeScaleSt()[static_cast<int>(_rangeXIndex)]->timeScale);
     emit rangeXMinChanged();
 }
 
diff --git a/src/AnalyzeView/MAVLinkChartController.h b/src/AnalyzeView/MAVLinkChartController.h
index a77b45433800..d71ea5b3a151 100644
--- a/src/AnalyzeView/MAVLinkChartController.h
+++ b/src/AnalyzeView/MAVLinkChartController.h
@@ -7,10 +7,6 @@
  *
  ****************************************************************************/
 
-/// @file
-/// @brief MAVLink message inspector and charting controller
-/// @author Gus Grubba <gus@auterion.com>
-
 #pragma once
 
 #include <QtCore/QDateTime>
@@ -30,27 +26,30 @@ class MAVLinkChartController : public QObject
 {
     Q_OBJECT
     QML_ELEMENT
-    QML_UNCREATABLE("")
     Q_MOC_INCLUDE("MAVLinkInspectorController.h")
     Q_MOC_INCLUDE("MAVLinkMessageField.h")
     Q_MOC_INCLUDE("QtCharts/qabstractseries.h")
+
+    Q_PROPERTY(MAVLinkInspectorController*  inspectorController READ inspectorController WRITE setInspectorController REQUIRED)
+    Q_PROPERTY(int          chartIndex  MEMBER _chartIndex                          REQUIRED)
     Q_PROPERTY(QVariantList chartFields READ chartFields                            NOTIFY chartFieldsChanged)
     Q_PROPERTY(QDateTime    rangeXMin   READ rangeXMin                              NOTIFY rangeXMinChanged)
     Q_PROPERTY(QDateTime    rangeXMax   READ rangeXMax                              NOTIFY rangeXMaxChanged)
     Q_PROPERTY(qreal        rangeYMin   READ rangeYMin                              NOTIFY rangeYMinChanged)
     Q_PROPERTY(qreal        rangeYMax   READ rangeYMax                              NOTIFY rangeYMaxChanged)
-    Q_PROPERTY(int          chartIndex  READ chartIndex                             CONSTANT)
     Q_PROPERTY(quint32      rangeYIndex READ rangeYIndex    WRITE setRangeYIndex    NOTIFY rangeYIndexChanged)
     Q_PROPERTY(quint32      rangeXIndex READ rangeXIndex    WRITE setRangeXIndex    NOTIFY rangeXIndexChanged)
 
+
 public:
-    explicit MAVLinkChartController(MAVLinkInspectorController *controller, int index, QObject *parent = nullptr);
+    explicit MAVLinkChartController(QObject *parent = nullptr);
     ~MAVLinkChartController();
 
     Q_INVOKABLE void addSeries(QGCMAVLinkMessageField *field, QAbstractSeries *series);
     Q_INVOKABLE void delSeries(QGCMAVLinkMessageField *field);
-    Q_INVOKABLE MAVLinkInspectorController *controller() const { return _controller; }
 
+    void setInspectorController(MAVLinkInspectorController *inspectorController);
+    MAVLinkInspectorController *inspectorController() const { return _inspectorController; }
     QVariantList chartFields() const { return _chartFields; }
     QDateTime rangeXMin() const { return _rangeXMin; }
     QDateTime rangeXMax() const { return _rangeXMax; }
@@ -58,7 +57,7 @@ class MAVLinkChartController : public QObject
     qreal rangeYMax() const { return _rangeYMax; }
     quint32 rangeXIndex() const { return _rangeXIndex; }
     quint32 rangeYIndex() const { return _rangeYIndex; }
-    int chartIndex() const { return _index; }
+    int chartIndex() const { return _chartIndex; }
 
     void setRangeXIndex(quint32 index);
     void setRangeYIndex(quint32 index);
@@ -78,8 +77,8 @@ private slots:
     void _refreshSeries();
 
 private:
-    int _index = 0;
-    MAVLinkInspectorController *_controller = nullptr;
+    int _chartIndex = 0;
+    MAVLinkInspectorController *_inspectorController = nullptr;
     QTimer *_updateSeriesTimer = nullptr;
 
     QDateTime _rangeXMin;
diff --git a/src/AnalyzeView/MAVLinkConsoleController.cc b/src/AnalyzeView/MAVLinkConsoleController.cc
index eba4c7b60a98..dce87d2e3888 100644
--- a/src/AnalyzeView/MAVLinkConsoleController.cc
+++ b/src/AnalyzeView/MAVLinkConsoleController.cc
@@ -17,7 +17,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
 
-QGC_LOGGING_CATEGORY(MAVLinkConsoleControllerLog, "qgc.analyzeview.mavlinkconsolecontroller")
+QGC_LOGGING_CATEGORY(MAVLinkConsoleControllerLog, "AnalyzeView.MAVLinkConsoleController")
 
 MAVLinkConsoleController::MAVLinkConsoleController(QObject *parent)
     : QStringListModel(parent)
diff --git a/src/AnalyzeView/MAVLinkInspectorController.cc b/src/AnalyzeView/MAVLinkInspectorController.cc
index e9fddbc57651..bf5fa7f6f890 100644
--- a/src/AnalyzeView/MAVLinkInspectorController.cc
+++ b/src/AnalyzeView/MAVLinkInspectorController.cc
@@ -20,7 +20,7 @@
 
 #include <QtQml/QQmlEngine>
 
-QGC_LOGGING_CATEGORY(MAVLinkInspectorControllerLog, "qgc.analyzeview.mavlinkinspectorcontroller")
+QGC_LOGGING_CATEGORY(MAVLinkInspectorControllerLog, "AnalyzeView.MAVLinkInspectorController")
 
 MAVLinkInspectorController::TimeScale_st::TimeScale_st(const QString &label_, uint32_t timeScale_)
     : label(label_)
@@ -44,7 +44,6 @@ MAVLinkInspectorController::MAVLinkInspectorController(QObject *parent)
     : QObject(parent)
     , _updateFrequencyTimer(new QTimer(this))
     , _systems(new QmlObjectListModel(this))
-    , _charts(new QmlObjectListModel(this))
 {
     // qCDebug(MAVLinkInspectorControllerLog) << Q_FUNC_INFO << this;
 
@@ -84,7 +83,6 @@ MAVLinkInspectorController::~MAVLinkInspectorController()
 {
     qDeleteAll(_timeScaleSt);
     qDeleteAll(_rangeSt);
-    _charts->clearAndDeleteContents();
     _systems->clearAndDeleteContents();
 
     // qCDebug(MAVLinkInspectorControllerLog) << Q_FUNC_INFO << this;
@@ -227,39 +225,6 @@ void MAVLinkInspectorController::_receiveMessage(LinkInterface *link, const mavl
     }
 }
 
-MAVLinkChartController *MAVLinkInspectorController::createChart()
-{
-    MAVLinkChartController *const pChart = new MAVLinkChartController(this, _charts->count());
-    QQmlEngine::setObjectOwnership(pChart, QQmlEngine::CppOwnership);
-
-    _charts->append(pChart);
-    emit chartsChanged();
-
-    return pChart;
-}
-
-void MAVLinkInspectorController::deleteChart(MAVLinkChartController *chart)
-{
-    if (!chart) {
-        return;
-    }
-
-    bool found = false;
-    for (int i = 0; i < _charts->count(); i++) {
-        MAVLinkChartController *const controller = qobject_cast<MAVLinkChartController*>(_charts->get(i));
-        if (controller && (controller == chart)) {
-            found = true;
-            _charts->removeOne(controller);
-            delete controller;
-            break;
-        }
-    }
-
-    if (found) {
-        emit chartsChanged();
-    }
-}
-
 void MAVLinkInspectorController::setActiveSystem(int systemId)
 {
     QGCMAVLinkSystem *const system = _findVehicle(systemId);
diff --git a/src/AnalyzeView/MAVLinkInspectorController.h b/src/AnalyzeView/MAVLinkInspectorController.h
index 92b70630c32f..5e5d022c1c83 100644
--- a/src/AnalyzeView/MAVLinkInspectorController.h
+++ b/src/AnalyzeView/MAVLinkInspectorController.h
@@ -36,7 +36,6 @@ class MAVLinkInspectorController : public QObject
     Q_MOC_INCLUDE("MAVLinkChartController.h")
     Q_MOC_INCLUDE("QmlObjectListModel.h")
     Q_PROPERTY(QmlObjectListModel   *systems        READ systems        NOTIFY systemsChanged)
-    Q_PROPERTY(QmlObjectListModel   *charts         READ charts         NOTIFY chartsChanged)
     Q_PROPERTY(QGCMAVLinkSystem     *activeSystem   READ activeSystem   NOTIFY activeSystemChanged)
     Q_PROPERTY(QStringList          timeScales      READ timeScales     NOTIFY timeScalesChanged)
     Q_PROPERTY(QStringList          rangeList       READ rangeList      NOTIFY rangeListChanged)
@@ -62,13 +61,10 @@ class MAVLinkInspectorController : public QObject
     explicit MAVLinkInspectorController(QObject *parent = nullptr);
     ~MAVLinkInspectorController();
 
-    Q_INVOKABLE MAVLinkChartController *createChart();
-    Q_INVOKABLE void deleteChart(MAVLinkChartController *chart);
     Q_INVOKABLE void setActiveSystem(int systemId);
     Q_INVOKABLE void setMessageInterval(int32_t rate) const;
 
     QmlObjectListModel *systems() const { return _systems; }
-    QmlObjectListModel *charts() const { return _charts; }
     QGCMAVLinkSystem *activeSystem() const { return _activeSystem; }
     QStringList systemNames() const { return _systemNames; }
     QStringList timeScales();
@@ -79,7 +75,6 @@ class MAVLinkInspectorController : public QObject
 
 signals:
     void activeSystemChanged();
-    void chartsChanged();
     void rangeListChanged();
     void systemsChanged();
     void timeScalesChanged();
@@ -104,5 +99,4 @@ private slots:
     QGCMAVLinkSystem *_activeSystem = nullptr;
     QTimer *_updateFrequencyTimer = nullptr;
     QmlObjectListModel *_systems = nullptr;     ///< List of QGCMAVLinkSystem
-    QmlObjectListModel *_charts = nullptr;      ///< List of MAVLinkCharts
 };
diff --git a/src/AnalyzeView/MAVLinkInspectorPage.qml b/src/AnalyzeView/MAVLinkInspectorPage.qml
index 0a810272b319..2445beaeed5b 100644
--- a/src/AnalyzeView/MAVLinkInspectorPage.qml
+++ b/src/AnalyzeView/MAVLinkInspectorPage.qml
@@ -18,8 +18,6 @@ import QGroundControl
 
 import QGroundControl.Controls
 
-
-
 AnalyzePage {
     id: root
     headerComponent:    headerComponent
@@ -45,27 +43,22 @@ AnalyzePage {
             if(!checkBox) {
                 continue
             }
-            const object = message.fields.get(i)
-            checkBox.enabled = isCheckboxEnabled(checkBox, object, chart)
+            const messageField = message.fields.get(i)
+            checkBox.enabled = isCheckboxEnabled(checkBox, messageField, chart)
         }
     }
 
-    function isCheckboxEnabled(checkBox, object, chart) {
+    function isCheckboxEnabled(checkBox, messageField, chart) {
         if(checkBox.checkState === Qt.Checked) {
             return true
         }
-        if(!object.selectable) {
+        if(!messageField.selectable) {
             return false
         }
-        if(object.series !== null) {
+        if(messageField.series !== null) {
             return false
         }
-        if(chart.chartController !== null) {
-            if (chart.chartController.chartFields.length >= chart.seriesColors.length) {
-                return false
-            }
-        }
-        return true
+        return chart.roomForNewDimension()
     }
 
     Component {
@@ -338,14 +331,18 @@ AnalyzePage {
                     }
                     Item { height: ScreenTools.defaultFontPixelHeight * 0.25; width: 1 }
                     MAVLinkChart {
-                        id:         chart1
-                        height:     ScreenTools.defaultFontPixelHeight * 20
-                        width:      parent.width
+                        id:                     chart1
+                        height:                 ScreenTools.defaultFontPixelHeight * 20
+                        width:                  parent.width
+                        inspectorController:    controller
+                        chartIndex:             0
                     }
                     MAVLinkChart {
-                        id:         chart2
-                        height:     ScreenTools.defaultFontPixelHeight * 20
-                        width:      parent.width
+                        id:                     chart2
+                        height:                 ScreenTools.defaultFontPixelHeight * 20
+                        width:                  parent.width
+                        inspectorController:    controller
+                        chartIndex:             1
                     }
                 }
             }
diff --git a/src/AnalyzeView/MAVLinkMessage.cc b/src/AnalyzeView/MAVLinkMessage.cc
index 0771fab06b4c..52b2cf1a8038 100644
--- a/src/AnalyzeView/MAVLinkMessage.cc
+++ b/src/AnalyzeView/MAVLinkMessage.cc
@@ -14,7 +14,7 @@
 
 #include <QtCore/QTimeZone>
 
-QGC_LOGGING_CATEGORY(MAVLinkMessageLog, "qgc.analyzeview.mavlinkmessage")
+QGC_LOGGING_CATEGORY(MAVLinkMessageLog, "AnalyzeView.MAVLinkMessage")
 
 QGCMAVLinkMessage::QGCMAVLinkMessage(const mavlink_message_t &message, QObject *parent)
     : QObject(parent)
diff --git a/src/AnalyzeView/MAVLinkMessageField.cc b/src/AnalyzeView/MAVLinkMessageField.cc
index bfe73677b8fc..f09c0a541e87 100644
--- a/src/AnalyzeView/MAVLinkMessageField.cc
+++ b/src/AnalyzeView/MAVLinkMessageField.cc
@@ -16,7 +16,7 @@
 #include <QtCharts/QLineSeries>
 #include <QtCharts/QAbstractSeries>
 
-QGC_LOGGING_CATEGORY(MAVLinkMessageFieldLog, "qgc.analyzeview.mavlinkmessagefield")
+QGC_LOGGING_CATEGORY(MAVLinkMessageFieldLog, "AnalyzeView.MAVLinkMessageField")
 
 QGCMAVLinkMessageField::QGCMAVLinkMessageField(const QString &name, const QString &type, QGCMAVLinkMessage *parent)
     : QObject(parent)
@@ -34,13 +34,13 @@ QGCMAVLinkMessageField::~QGCMAVLinkMessageField()
     // qCDebug(MAVLinkMessageFieldLog) << Q_FUNC_INFO << this;
 }
 
-void QGCMAVLinkMessageField::addSeries(MAVLinkChartController *chart, QAbstractSeries *series)
+void QGCMAVLinkMessageField::addSeries(MAVLinkChartController *chartController, QAbstractSeries *series)
 {
     if (_pSeries) {
         return;
     }
 
-    _chart = chart;
+    _chartController = chartController;
     _pSeries = series;
     emit seriesChanged();
 
@@ -58,7 +58,7 @@ void QGCMAVLinkMessageField::delSeries()
     QLineSeries *const lineSeries = static_cast<QLineSeries*>(_pSeries);
     lineSeries->replace(_values);
     _pSeries = nullptr;
-    _chart = nullptr;
+    _chartController = nullptr;
     emit seriesChanged();
     _msg->updateFieldSelection();
 }
@@ -78,8 +78,8 @@ void QGCMAVLinkMessageField::setSelectable(bool sel)
 
 int QGCMAVLinkMessageField::chartIndex() const
 {
-    if (_chart) {
-        return _chart->chartIndex();
+    if (_chartController) {
+        return _chartController->chartIndex();
     }
 
     return 0;
@@ -92,7 +92,7 @@ void QGCMAVLinkMessageField::updateValue(const QString &newValue, qreal v)
         emit valueChanged();
     }
 
-    if (!_pSeries || !_chart) {
+    if (!_pSeries || !_chartController) {
         return;
     }
 
@@ -109,7 +109,7 @@ void QGCMAVLinkMessageField::updateValue(const QString &newValue, qreal v)
         _dataIndex++;
     }
 
-    if (_chart->rangeYIndex() != 0) {
+    if (_chartController->rangeYIndex() != 0) {
         return;
     }
 
@@ -137,7 +137,7 @@ void QGCMAVLinkMessageField::updateValue(const QString &newValue, qreal v)
     }
 
     if (changed) {
-        _chart->updateYRange();
+        _chartController->updateYRange();
     }
 }
 
diff --git a/src/AnalyzeView/MAVLinkMessageField.h b/src/AnalyzeView/MAVLinkMessageField.h
index 66745cb71314..f459e8faa34d 100644
--- a/src/AnalyzeView/MAVLinkMessageField.h
+++ b/src/AnalyzeView/MAVLinkMessageField.h
@@ -53,7 +53,7 @@ class QGCMAVLinkMessageField : public QObject
     void setSelectable(bool sel);
     void updateValue(const QString &newValue, qreal v);
 
-    void addSeries(MAVLinkChartController *chart, QAbstractSeries *series);
+    void addSeries(MAVLinkChartController *chartController, QAbstractSeries *series);
     void delSeries();
     void updateSeries();
 
@@ -75,5 +75,5 @@ class QGCMAVLinkMessageField : public QObject
     QList<QPointF> _values;
 
     QAbstractSeries *_pSeries = nullptr;
-    MAVLinkChartController *_chart = nullptr;
+    MAVLinkChartController *_chartController = nullptr;
 };
diff --git a/src/AnalyzeView/MAVLinkSystem.cc b/src/AnalyzeView/MAVLinkSystem.cc
index 2ad489afa407..63788e833e40 100644
--- a/src/AnalyzeView/MAVLinkSystem.cc
+++ b/src/AnalyzeView/MAVLinkSystem.cc
@@ -11,7 +11,7 @@
 #include "MAVLinkMessage.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MAVLinkSystemLog, "qgc.analyzeview.mavlinksystem")
+QGC_LOGGING_CATEGORY(MAVLinkSystemLog, "AnalyzeView.MAVLinkSystem")
 
 QGCMAVLinkSystem::QGCMAVLinkSystem(quint8 id, QObject *parent)
     : QObject(parent)
diff --git a/src/AnalyzeView/PX4LogParser.cc b/src/AnalyzeView/PX4LogParser.cc
index 21f9e240e89c..95c7562f9564 100644
--- a/src/AnalyzeView/PX4LogParser.cc
+++ b/src/AnalyzeView/PX4LogParser.cc
@@ -12,7 +12,7 @@
 
 #include <QtCore/QtEndian>
 
-QGC_LOGGING_CATEGORY(PX4LogParserLog, "qgc.analyzeview.px4logparser")
+QGC_LOGGING_CATEGORY(PX4LogParserLog, "AnalyzeView.PX4LogParser")
 
 // general message header
 static constexpr const char header[3] = {static_cast<char>(0xA3), static_cast<char>(0x95), static_cast<char>(0x00)};
diff --git a/src/AnalyzeView/ULogParser.cc b/src/AnalyzeView/ULogParser.cc
index 4897f2c0731e..b9836dcf829f 100644
--- a/src/AnalyzeView/ULogParser.cc
+++ b/src/AnalyzeView/ULogParser.cc
@@ -18,7 +18,7 @@
 
 using namespace ulog_cpp;
 
-QGC_LOGGING_CATEGORY(ULogParserLog, "qgc.analyzeview.ulogparser")
+QGC_LOGGING_CATEGORY(ULogParserLog, "AnalyzeView.ULogParser")
 
 namespace ULogParser {
 
diff --git a/src/Android/AndroidInterface.cc b/src/Android/AndroidInterface.cc
index e63b95f2d2a7..675fede6e0bb 100644
--- a/src/Android/AndroidInterface.cc
+++ b/src/Android/AndroidInterface.cc
@@ -12,7 +12,6 @@
 
 #include <QtCore/QJniObject>
 #include <QtCore/QJniEnvironment>
-#include <QtCore/private/qandroidextras_p.h>
 
 QGC_LOGGING_CATEGORY(AndroidInterfaceLog, "qgc.android.src.androidinterface")
 
@@ -107,23 +106,20 @@ void jniLogWarning(JNIEnv *envA, jobject thizA, jstring messageA)
 
 bool checkStoragePermissions()
 {
-    const QString readPermission("android.permission.READ_EXTERNAL_STORAGE");
-    const QString writePermission("android.permission.WRITE_EXTERNAL_STORAGE");
-
-    const QStringList permissions = { readPermission, writePermission };
-    for (const auto& permission: permissions) {
-        QFuture<QtAndroidPrivate::PermissionResult> futurePermissionResult = QtAndroidPrivate::checkPermission(permission);
-        QtAndroidPrivate::PermissionResult permissionResult = futurePermissionResult.result();
-        if (permissionResult == QtAndroidPrivate::PermissionResult::Denied) {
-            futurePermissionResult = QtAndroidPrivate::requestPermission(permission);
-            permissionResult = futurePermissionResult.result();
-            if (permissionResult == QtAndroidPrivate::PermissionResult::Denied) {
-                return false;
-            }
-        }
+    // Call the Java method to check and request storage permissions
+    const bool hasPermission = QJniObject::callStaticMethod<jboolean>(
+        kJniQGCActivityClassName,
+        "checkStoragePermissions",
+        "()Z"
+    );
+
+    if (hasPermission) {
+        qCDebug(AndroidInterfaceLog) << "Storage permissions granted";
+    } else {
+        qCWarning(AndroidInterfaceLog) << "Storage permissions not granted";
     }
 
-    return true;
+    return hasPermission;
 }
 
 QString getSDCardPath()
diff --git a/src/Android/CMakeLists.txt b/src/Android/CMakeLists.txt
index de495aab6718..88adb80b1c3d 100644
--- a/src/Android/CMakeLists.txt
+++ b/src/Android/CMakeLists.txt
@@ -1,3 +1,9 @@
+# ============================================================================
+# Android Module
+# Android platform-specific initialization and interfaces
+# ============================================================================
+
+# Only build on Android platforms
 if(NOT ANDROID)
     return()
 endif()
@@ -13,4 +19,7 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Android Serial Port Support
+# ----------------------------------------------------------------------------
 add_subdirectory(qtandroidserialport)
diff --git a/src/Android/qtandroidserialport/CMakeLists.txt b/src/Android/qtandroidserialport/CMakeLists.txt
index 16dc23a16007..ba3f06258e6c 100644
--- a/src/Android/qtandroidserialport/CMakeLists.txt
+++ b/src/Android/qtandroidserialport/CMakeLists.txt
@@ -1,3 +1,9 @@
+# ============================================================================
+# Qt Android Serial Port
+# Android-specific serial port implementation
+# ============================================================================
+
+# Only build on Android platforms
 if(NOT ANDROID)
     return()
 endif()
@@ -19,4 +25,5 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# TODO: Enable I/O device debugging
 # target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QIODEVICE_DEBUG)
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
index 8829e3ac88b4..dde7ac4ecfb8 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -23,7 +23,7 @@
 #include <QtGui/QCursor>
 #include <QtGui/QGuiApplication>
 
-QGC_LOGGING_CATEGORY(APMAirframeComponentControllerLog, "qgc.autopilotplugins.apm.apmairframecomponentcontroller")
+QGC_LOGGING_CATEGORY(APMAirframeComponentControllerLog, "AutoPilotPlugins.APMAirframeComponentController")
 
 /*===========================================================================*/
 
diff --git a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
index 0bd9f0e5cc3b..ae23fb638798 100644
--- a/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
@@ -37,7 +37,7 @@
 #include "SerialLink.h"
 #endif
 
-QGC_LOGGING_CATEGORY(APMAutoPilotPluginLog, "qgc.autopilotplugins.apm.apmautopilotplugin")
+QGC_LOGGING_CATEGORY(APMAutoPilotPluginLog, "AutoPilotPlugins.APM.apmautopilotplugin")
 
 APMAutoPilotPlugin::APMAutoPilotPlugin(Vehicle *vehicle, QObject *parent)
     : AutoPilotPlugin(vehicle, parent)
diff --git a/src/AutoPilotPlugins/APM/APMRemoteSupportComponent.qml b/src/AutoPilotPlugins/APM/APMRemoteSupportComponent.qml
index 3f43e5e539f7..7a368b06019e 100644
--- a/src/AutoPilotPlugins/APM/APMRemoteSupportComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMRemoteSupportComponent.qml
@@ -33,7 +33,7 @@ SetupPage {
             GridLayout {
                 id:               elementsRow
                 columns:          2
-                
+
                 anchors.left:           parent.left
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.margins:        ScreenTools.defaultFontPixelWidth
diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc b/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
index b63397d6a317..ee6f585ddee2 100644
--- a/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
@@ -18,8 +18,8 @@
 
 #include <QtCore/QVariant>
 
-QGC_LOGGING_CATEGORY(APMSensorsComponentControllerLog, "qgc.autopilotplugins.apm.apmsensorscomponentcontroller")
-QGC_LOGGING_CATEGORY(APMSensorsComponentControllerVerboseLog, "qgc.autopilotplugins.apm.apmsensorscomponentcontroller:verbose")
+QGC_LOGGING_CATEGORY(APMSensorsComponentControllerLog, "AutoPilotPlugins.APMSensorsComponentController")
+QGC_LOGGING_CATEGORY(APMSensorsComponentControllerVerboseLog, "AutoPilotPlugins.APMSensorsComponentController:verbose")
 
 APMSensorsComponentController::APMSensorsComponentController(QObject *parent)
     : FactPanelController(parent)
diff --git a/src/AutoPilotPlugins/APM/APMSubMotorComponentController.h b/src/AutoPilotPlugins/APM/APMSubMotorComponentController.h
index 97d7386ee520..5387a50702c2 100644
--- a/src/AutoPilotPlugins/APM/APMSubMotorComponentController.h
+++ b/src/AutoPilotPlugins/APM/APMSubMotorComponentController.h
@@ -34,4 +34,3 @@ private slots:
 private:
     QString _motorDetectionMessages;
 };
-
diff --git a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
index 1f5636cd4a49..f24fedef7ece 100644
--- a/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
+++ b/src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
@@ -27,9 +27,8 @@ SetupPage {
     Component {
         id: tuningPageComponent
 
-        Column {
-            width: availableWidth
-            height: availableHeight
+        ColumnLayout {
+            width:  availableWidth
 
             FactPanelController { id: controller; }
 
@@ -65,19 +64,7 @@ SetupPage {
             Component.onCompleted: {
                 // We use QtCharts only on Desktop platforms
                 showAdvanced = !ScreenTools.isMobile
-
-                // Qml Sliders have a strange behavior in which they first set Slider::value to some internal
-                // setting and then set Slider::value to the bound properties value. If you have an onValueChanged
-                // handler which updates your property with the new value, this first value change will trash
-                // your bound values. In order to work around this we don't set the values into the Sliders until
-                // after Qml load is done. We also don't track value changes until Qml load completes.
-                rollPitch.value = _rateRollP.value
-                climb.value = _rateClimbP.value
-                if (_atcInputTCAvailable) {
-                    atcInputTC.value = _atcInputTC.value
-                }
                 _loadComplete = true
-
                 calcAutoTuneChannel()
             }
 
@@ -118,341 +105,171 @@ SetupPage {
             Connections { target: _ch11Opt; function onValueChanged(value) { calcAutoTuneChannel() } }
             Connections { target: _ch12Opt; function onValueChanged(value) { calcAutoTuneChannel() } }
 
-            Column {
-                anchors.left:       parent.left
-                anchors.right:      parent.right
+            ColumnLayout {
+                Layout.fillWidth:   true
                 spacing:            _margins
                 visible:            !advanced
 
-                QGCLabel {
-                    text:       qsTr("Basic Tuning")
-                    font.bold:   true
-                }
-
-                Rectangle {
-                    id:                 basicTuningRect
-                    anchors.left:       parent.left
-                    anchors.right:      parent.right
-                    height:             basicTuningColumn.y + basicTuningColumn.height + _margins
-                    color:              qgcPal.windowShade
-
-                    Column {
-                        id:                 basicTuningColumn
-                        anchors.margins:    _margins
-                        anchors.left:       parent.left
-                        anchors.right:      parent.right
-                        anchors.top:        parent.top
-                        spacing:            _margins
-
-                        Column {
-                            anchors.left:       parent.left
-                            anchors.right:      parent.right
-
-                            QGCLabel {
-                                text:       qsTr("Roll/Pitch Sensitivity")
-                                font.bold:   true
-                            }
-
-                            QGCLabel {
-                                text: qsTr("Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy")
-                            }
-
-                            QGCSlider {
-                                id:                 rollPitch
-                                anchors.left:       parent.left
-                                anchors.right:      parent.right
-                                from:       0.08
-                                to:       0.4
-                                stepSize:           0.01
-                                tickmarksEnabled:   true
-
-                                onValueChanged: {
-                                    if (_loadComplete) {
-                                        _rateRollP.value = value
-                                        _rateRollI.value = value
-                                        _ratePitchP.value = value
-                                        _ratePitchI.value = value
-                                    }
-                                }
-                            }
-                        }
-
-                        Column {
-                            anchors.left:       parent.left
-                            anchors.right:      parent.right
-
-                            QGCLabel {
-                                text:       qsTr("Climb Sensitivity")
-                                font.bold:   true
-                            }
-
-                            QGCLabel {
-                                text: qsTr("Slide to the right to climb more aggressively or slide to the left to climb more gently")
-                            }
-
-                            QGCSlider {
-                                id:                 climb
-                                anchors.left:       parent.left
-                                anchors.right:      parent.right
-                                from:       0.3
-                                to:       1.0
-                                stepSize:           0.02
-                                tickmarksEnabled:   true
-                                value:              _rateClimbP.value
-
-                                onValueChanged: {
-                                    if (_loadComplete) {
-                                        _rateClimbP.value = value
-                                        _rateClimbI.value = value * 2
-                                    }
-                                }
-                            }
-                        }
-
-                        Column {
-                            anchors.left:       parent.left
-                            anchors.right:      parent.right
-                            visible:            _atcInputTCAvailable
-
-                            QGCLabel {
-                                text:       qsTr("RC Roll/Pitch Feel")
-                                font.bold:   true
-                            }
-
-                            QGCLabel {
-                                text: qsTr("Slide to the left for soft control, slide to the right for crisp control")
-                            }
-
-                            QGCSlider {
-                                id:                 atcInputTC
-                                anchors.left:       parent.left
-                                anchors.right:      parent.right
-                                from:       _atcInputTC.min
-                                to:       _atcInputTC.max
-                                stepSize:           _atcInputTC.increment
-                                tickmarksEnabled:   true
-
-                                onValueChanged: {
-                                    if (_loadComplete) {
-                                        _atcInputTC.value = value
-                                    }
-                                }
-                            }
-                        }
-
-                        Column {
-                            anchors.left:       parent.left
-                            anchors.right:      parent.right
-
-                            QGCLabel {
-                                text:       qsTr("Spin While Armed")
-                                font.bold:   true
-                            }
-
-                            QGCLabel {
-                                text: qsTr("Adjust the amount the motors spin to indicate armed")
-                            }
-
-                            QGCSlider {
-                                anchors.left:       parent.left
-                                anchors.right:      parent.right
-                                from:       0
-                                to:       Math.max(0.3, _motSpinArm.rawValue)
-                                stepSize:           0.01
-                                tickmarksEnabled:   true
-                                value:              _motSpinArm.rawValue
-
-                                onValueChanged: {
-                                    if (_loadComplete) {
-                                        _motSpinArm.rawValue = value
-                                    }
-                                }
-                            }
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    heading:            qsTr("Roll/Pitch Sensitivity")
+                    headingDescription: qsTr("Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy")
+
+                    FactSlider {
+                        id:                 rollPitch
+                        Layout.fillWidth:   true
+                        from:               0.08
+                        to:                 0.4
+                        majorTickStepSize:  0.02
+                        decimalPlaces:      3
+                        fact:              _rateRollP
+
+                        onValueChanged: {
+                            _rateRollI.rawValue = value
+                            _ratePitchP.rawValue = value
+                            _ratePitchI.rawValue = value
                         }
+                    }
+                }
 
-                        Column {
-                            anchors.left:       parent.left
-                            anchors.right:      parent.right
-
-                            QGCLabel {
-                                text:       qsTr("Minimum Thrust")
-                                font.bold:   true
-                            }
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    heading:            qsTr("Climb Sensitivity")
+                    headingDescription: qsTr("Slide to the right to climb more aggressively or slide to the left to climb more gently")
+
+                    FactSlider {
+                        id:                 climb
+                        Layout.fillWidth:   true
+                        from:               0.03
+                        to:                 1.0
+                        majorTickStepSize:  0.05
+                        decimalPlaces:      3
+                        fact:               _rateClimbP
+                        onValueChanged:     _rateClimbI.rawValue = value * 2
+                    }
+                }
 
-                            QGCLabel {
-                                text: qsTr("Adjust the minimum amount of thrust require for the vehicle to move")
-                            }
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    heading:            qsTr("RC Roll/Pitch Feel")
+                    headingDescription: qsTr("Slide to the left for soft control, slide to the right for crisp control")
+
+                    FactSlider {
+                        id:                 atcInputTC
+                        Layout.fillWidth:   true
+                        from:               _atcInputTC.min
+                        to:                 _atcInputTC.max
+                        majorTickStepSize:  _atcInputTC.increment
+                        decimalPlaces:      2
+                        unitsString:        ""
+                        fact:              _atcInputTC
+                    }
+                }
 
-                            QGCLabel {
-                                text:       qsTr("Warning: This setting should be higher than 'Spin While Armed'")
-                                color:      qgcPal.warningText
-                                visible:    _motSpinMin.rawValue < _motSpinArm.rawValue
-                            }
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    heading:            qsTr("Spin While Armed")
+                    headingDescription: qsTr("Adjust the amount the motors spin to indicate armed. Should be lower than 'Minimum Thrust'")
+
+                    FactSlider {
+                        Layout.fillWidth:   true
+                        from:               0
+                        to:                 0.3
+                        majorTickStepSize:  0.1
+                        decimalPlaces:      1
+                        fact:              _motSpinArm
+                    }
+                }
 
-                            QGCSlider {
-                                anchors.left:       parent.left
-                                anchors.right:      parent.right
-                                from:       0
-                                to:       Math.max(0.3, _motSpinMin.rawValue)
-                                stepSize:           0.01
-                                tickmarksEnabled:   true
-                                value:              _motSpinMin.rawValue
-
-                                onValueChanged: {
-                                    if (_loadComplete) {
-                                        _motSpinMin.rawValue = value
-                                    }
-                                }
-                            }
-                        }
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    heading:            qsTr("Minimum Thrust")
+                    headingDescription: qsTr("Adjust the minimum amount of thrust require for the vehicle to move. Should be higher than 'Spin While Armed")
+
+                    FactSlider {
+                        Layout.fillWidth:   true
+                        from:               0
+                        to:                 0.3
+                        majorTickStepSize:  0.1
+                        decimalPlaces:      1
+                        fact:              _motSpinArm
                     }
-                } // Rectangle - Basic tuning
+                }
 
                 Flow {
                     id:                 flowLayout
                     Layout.fillWidth:   true
                     spacing:            _margins
 
-                    Rectangle {
-                        height: autoTuneLabel.height + autoTuneRect.height
-                        width:  autoTuneRect.width
-                        color:  qgcPal.window
+                    SettingsGroupLayout {
+                        heading: qsTr("AutoTune")
 
-                        QGCLabel {
-                            id:                 autoTuneLabel
-                            text:               qsTr("AutoTune")
-                            font.bold:          true
-                        }
-
-                        Rectangle {
-                            id:             autoTuneRect
-                            width:          autoTuneColumn.x + autoTuneColumn.width + _margins
-                            height:         autoTuneColumn.y + autoTuneColumn.height + _margins
-                            anchors.top:    autoTuneLabel.bottom
-                            color:          qgcPal.windowShade
-
-                            Column {
-                                id:                 autoTuneColumn
-                                anchors.margins:    _margins
-                                anchors.left:       parent.left
-                                anchors.top:        parent.top
-                                spacing:            _margins
-
-                                Row {
-                                    spacing: _margins
-
-                                    QGCLabel { text: qsTr("Axes to AutoTune:") }
-                                    FactBitmask { fact: _autoTuneAxes }
-                                }
+                        ColumnLayout {
+                            RowLayout {
+                                spacing: _margins
 
-                                Row {
-                                    spacing:    _margins
-
-                                    QGCLabel {
-                                        anchors.baseline:   autoTuneChannelCombo.baseline
-                                        text:               qsTr("Channel for AutoTune switch:")
-                                    }
+                                QGCLabel { text: qsTr("Axes to AutoTune:") }
+                                FactBitmask { fact: _autoTuneAxes }
+                            }
 
-                                    QGCComboBox {
-                                        id:             autoTuneChannelCombo
-                                        width:          ScreenTools.defaultFontPixelWidth * 14
-                                        model:          [qsTr("None"), qsTr("Channel 7"), qsTr("Channel 8"), qsTr("Channel 9"), qsTr("Channel 10"), qsTr("Channel 11"), qsTr("Channel 12") ]
-                                        currentIndex:   _autoTuneSwitchChannelIndex
+                            LabelledComboBox {
+                                id:             autoTuneChannelCombo
+                                width:          ScreenTools.defaultFontPixelWidth * 14
+                                label:          qsTr("Channel for AutoTune switch:")
+                                model:          [qsTr("None"), qsTr("Channel 7"), qsTr("Channel 8"), qsTr("Channel 9"), qsTr("Channel 10"), qsTr("Channel 11"), qsTr("Channel 12") ]
+                                currentIndex:   _autoTuneSwitchChannelIndex
 
-                                        onActivated: (index) => {
-                                            var channel = index
+                                onActivated: (index) => {
+                                    var channel = index
 
-                                            if (channel > 0) {
-                                                channel += 6
-                                            }
-                                            setChannelAutoTuneOption(channel)
-                                        }
+                                    if (channel > 0) {
+                                        channel += 6
                                     }
+                                    setChannelAutoTuneOption(channel)
                                 }
                             }
-                        } // Rectangle - AutoTune
-                    } // Rectangle - AutoTuneWrap
-
-                    Rectangle {
-                        height:     inFlightTuneLabel.height + channel6TuningOption.height
-                        width:      channel6TuningOption.width
-                        color:      qgcPal.window
-
-                        QGCLabel {
-                            id:                 inFlightTuneLabel
-                            text:               qsTr("In Flight Tuning")
-                            font.bold:          true
                         }
+                    }
 
-                        Rectangle {
-                            id:             channel6TuningOption
-                            width:          channel6TuningOptColumn.width + (_margins * 2)
-                            height:         channel6TuningOptColumn.height + ScreenTools.defaultFontPixelHeight
-                            anchors.top:    inFlightTuneLabel.bottom
-                            color:          qgcPal.windowShade
-
-                            Column {
-                                id:                 channel6TuningOptColumn
-                                anchors.margins:    ScreenTools.defaultFontPixelWidth
-                                anchors.left:       parent.left
-                                anchors.top:        parent.top
-                                spacing:            ScreenTools.defaultFontPixelHeight
-
-                                Row {
-                                    spacing: ScreenTools.defaultFontPixelWidth
-                                    property Fact nullFact: Fact { }
-
-                                    QGCLabel {
-                                        anchors.baseline:   optCombo.baseline
-                                        text:               qsTr("RC Channel 6 Option (Tuning):")
-                                        //color:            controller.channelOptionEnabled[modelData] ? "yellow" : qgcPal.text
-                                    }
-
-                                    FactComboBox {
-                                        id:         optCombo
-                                        width:      ScreenTools.defaultFontPixelWidth * 15
-                                        fact:       controller.getParameterFact(-1, "TUNE")
-                                        indexModel: false
-                                    }
-                                }
+                    SettingsGroupLayout {
+                        heading: qsTr("In Flight Tuning")
 
-                                Row {
-                                    spacing: ScreenTools.defaultFontPixelWidth
-                                    property Fact nullFact: Fact { }
+                        ColumnLayout {
+                            id:     channel6TuningOptColumn
+                            spacing: ScreenTools.defaultFontPixelHeight
 
-                                    QGCLabel {
-                                        anchors.baseline:   tuneMinField.baseline
-                                        text:               qsTr("Min:")
-                                        //color:            controller.channelOptionEnabled[modelData] ? "yellow" : qgcPal.text
-                                    }
+                            LabelledFactComboBox {
+                                id:         optCombo
+                                width:      ScreenTools.defaultFontPixelWidth * 15
+                                label:      qsTr("RC Channel 6 Option (Tuning):")
+                                fact:       controller.getParameterFact(-1, "TUNE")
+                                indexModel: false
+                            }
 
-                                    FactTextField {
-                                        id:                 tuneMinField
-                                        validator:          DoubleValidator {bottom: 0; top: 32767;}
-                                        fact:               controller.getParameterFact(-1, "r.TUNE_MAX")
-                                    }
+                            RowLayout {
+                                spacing: ScreenTools.defaultFontPixelWidth
 
-                                    QGCLabel {
-                                        anchors.baseline:   tuneMaxField.baseline
-                                        text:               qsTr("Max:")
-                                        //color:            controller.channelOptionEnabled[modelData] ? "yellow" : qgcPal.text
-                                    }
+                                LabelledFactTextField {
+                                    id:                     tuneMinField
+                                    textField.validator:    DoubleValidator {bottom: 0; top: 32767;}
+                                    label:                  qsTr("Min:")
+                                    fact:                   controller.getParameterFact(-1, "r.TUNE_MIN")
+                                }
 
-                                    FactTextField {
-                                        id:                 tuneMaxField
-                                        validator:          DoubleValidator {bottom: 0; top: 32767;}
-                                        fact:               controller.getParameterFact(-1, "r.TUNE_MIN")
-                                    }
+                                LabelledFactTextField {
+                                    id:                     tuneMaxField
+                                    textField.validator:    DoubleValidator {bottom: 0; top: 32767;}
+                                    label:                  qsTr("Max:")
+                                    fact:                   controller.getParameterFact(-1, "r.TUNE_MAX")
                                 }
-                            } // Column - Channel 6 Tuning option
-                        } // Rectangle - Channel 6 Tuning options
-                    } // Rectangle - Channel 6 Tuning options wrap
-                } // Flow - Tune
+                            }
+                        }
+                    }
+                }
             }
 
             Loader {
-                anchors.left:       parent.left
-                anchors.right:      parent.right
+                Layout.fillWidth:   true
                 sourceComponent:    advanced ? advancePageComponent : undefined
             }
 
@@ -460,9 +277,7 @@ SetupPage {
                 id: advancePageComponent
 
                 PIDTuning {
-                    anchors.left:   parent.left
-                    anchors.right:  parent.right
-                    height: availableHeight
+                    property bool useAutoTuning: false
 
                     property var roll: QtObject {
                         property string name: qsTr("Roll")
diff --git a/src/AutoPilotPlugins/APM/CMakeLists.txt b/src/AutoPilotPlugins/APM/CMakeLists.txt
index d1e69b582dda..ea86c4ae8ed6 100644
--- a/src/AutoPilotPlugins/APM/CMakeLists.txt
+++ b/src/AutoPilotPlugins/APM/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# APM AutoPilot Plugin
+# ArduPilot-specific vehicle configuration and setup
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         APMAirframeComponent.cc
@@ -44,6 +49,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# APM QML Module
+# ----------------------------------------------------------------------------
 qt_add_library(AutoPilotPluginsAPMModule STATIC)
 
 qt_add_qml_module(AutoPilotPluginsAPMModule
@@ -91,7 +99,9 @@ qt_add_qml_module(AutoPilotPluginsAPMModule
     NO_PLUGIN
 )
 
-# Add json file
+# ----------------------------------------------------------------------------
+# APM Component Metadata
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} autopilot_plugin_apm_resource
     PREFIX "/json"
     FILES APMFollowComponent.FactMetaData.json
diff --git a/src/AutoPilotPlugins/AutoPilotPlugin.cc b/src/AutoPilotPlugins/AutoPilotPlugin.cc
index dc65ee2b11a5..8cfec9aeeec1 100644
--- a/src/AutoPilotPlugins/AutoPilotPlugin.cc
+++ b/src/AutoPilotPlugins/AutoPilotPlugin.cc
@@ -16,7 +16,7 @@
 
 #include <QtCore/QCoreApplication>
 
-QGC_LOGGING_CATEGORY(AutoPilotPluginLog, "qgc.autopilotplugin.autopilotplugin");
+QGC_LOGGING_CATEGORY(AutoPilotPluginLog, "AutoPilotPlugins.AutoPilotPlugin");
 
 AutoPilotPlugin::AutoPilotPlugin(Vehicle *vehicle, QObject *parent)
     : QObject(parent)
diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
index 04f26cb8de01..16f48fdeacd4 100644
--- a/src/AutoPilotPlugins/CMakeLists.txt
+++ b/src/AutoPilotPlugins/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# AutoPilot Plugins Module
+# Provides autopilot-specific UI and configuration handling
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         AutoPilotPlugin.cc
@@ -14,10 +19,15 @@ target_include_directories(${CMAKE_PROJECT_NAME}
         Generic
 )
 
+# ----------------------------------------------------------------------------
+# Autopilot-Specific Plugins
+# ----------------------------------------------------------------------------
 add_subdirectory(Common)
+
 if(NOT QGC_DISABLE_APM_PLUGIN)
     add_subdirectory(APM)
 endif()
+
 if(NOT QGC_DISABLE_PX4_PLUGIN)
     add_subdirectory(PX4)
 endif()
diff --git a/src/AutoPilotPlugins/Common/CMakeLists.txt b/src/AutoPilotPlugins/Common/CMakeLists.txt
index 38993b427d2c..c2c02f80c90e 100644
--- a/src/AutoPilotPlugins/Common/CMakeLists.txt
+++ b/src/AutoPilotPlugins/Common/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Common AutoPilot Plugins
+# Components shared across different autopilot types
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ESP8266Component.cc
@@ -16,6 +21,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Common AutoPilot Plugins QML Module
+# ----------------------------------------------------------------------------
 qt_add_library(AutoPilotPluginsCommonModule STATIC)
 
 qt_add_qml_module(AutoPilotPluginsCommonModule
diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentController.cc b/src/AutoPilotPlugins/Common/ESP8266ComponentController.cc
index 76de21bb4ccc..9e3e1c01b5c3 100644
--- a/src/AutoPilotPlugins/Common/ESP8266ComponentController.cc
+++ b/src/AutoPilotPlugins/Common/ESP8266ComponentController.cc
@@ -14,7 +14,7 @@
 
 #include <QtNetwork/QHostAddress>
 
-QGC_LOGGING_CATEGORY(ESP8266ComponentControllerLog, "qgc.autopilotplugins.common.esp8266componentcontroller")
+QGC_LOGGING_CATEGORY(ESP8266ComponentControllerLog, "AutoPilotPlugins.ESP8266ComponentController")
 
 #define MAX_RETRIES 5
 
diff --git a/src/AutoPilotPlugins/Common/Images/FreeFlyer.svg b/src/AutoPilotPlugins/Common/Images/FreeFlyer.svg
new file mode 100644
index 000000000000..aba991c424ef
--- /dev/null
+++ b/src/AutoPilotPlugins/Common/Images/FreeFlyer.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="draw"
+   x="0px"
+   y="0px"
+   viewBox="0 0 291.424 291.77"
+   enable-background="new 0 0 291.424 291.77"
+   xml:space="preserve"
+   sodipodi:docname="FreeFlyer.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   id="metadata13908"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>QuadRotorX</dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs13906"><rect
+     x="64.295094"
+     y="257.16159"
+     width="20.004284"
+     height="19.434001"
+     id="rect1674" /><rect
+     x="57.181928"
+     y="12.768183"
+     width="21.455602"
+     height="14.069247"
+     id="rect1668" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-3" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-6" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-8" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9-0" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9-0-3" /><rect
+     x="64.295097"
+     y="257.16159"
+     width="20.004284"
+     height="19.434002"
+     id="rect1674-9-0-5" /></defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1131"
+   id="namedview13904"
+   showgrid="true"
+   showguides="false"
+   inkscape:zoom="2"
+   inkscape:cx="37"
+   inkscape:cy="143.75"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="draw"
+   inkscape:showpageshadow="2"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"><inkscape:grid
+     type="xygrid"
+     id="grid14610" /></sodipodi:namedview><title
+   id="title13869">QuadRotorX</title>
+     <rect
+   style="fill:#4ec3e8;fill-opacity:0.8;stroke-width:0.703099"
+   id="rect866"
+   width="182.87863"
+   height="182.87863"
+   x="54.336742"
+   y="54.008221" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 41.75804,283.31181 64.75142,-0.1091 -34.35904,-46.53234"
+   id="path978" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 8.0625538,189.05596 0.1091,64.75142 46.5323452,-34.35904"
+   id="path978-3" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 7.6111718,42.233006 0.1091,64.751414 46.5323442,-34.359034"
+   id="path978-3-5" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="M 283.3143,102.92315 283.2052,38.171731 236.67284,72.530766"
+   id="path978-3-0" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 283.76568,249.7461 -0.1091,-64.75142 -46.53235,34.35904"
+   id="path978-3-5-9" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 186.0159,282.76127 64.75142,-0.1091 -34.35904,-46.53235"
+   id="path978-5" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="m 249.48837,7.3723165 -64.75142,0.1091 34.35904,46.5323455"
+   id="path978-6" /><path
+   style="fill:#159e1f;fill-opacity:0.8;stroke-width:1.32638"
+   d="M 105.23051,7.9228645 40.479095,8.0319644 74.838131,54.56431"
+   id="path978-5-2" /><path
+   fill="#ffffff"
+   stroke="#000000"
+   stroke-miterlimit="10"
+   d="m 177.46535,152.08429 -25.44869,25.44869 c -2.72029,2.72029 -7.13013,2.72029 -9.84972,0 l -25.44868,-25.44869 c -2.7203,-2.72029 -2.7203,-7.13013 0,-9.84972 l 25.44868,-25.44868 c 2.72029,-2.72029 7.13013,-2.72029 9.84972,0 l 25.44869,25.44868 c 2.72029,2.72029 2.72029,7.13013 0,9.84972 z"
+   id="path13875-2"
+   style="stroke-width:0.703099" /><polygon
+   fill="#ff442b"
+   stroke="#000000"
+   stroke-miterlimit="10"
+   points="145.645,117.211 163.823,168.211 127.468,168.211 "
+   id="polygon13877-7"
+   transform="matrix(0.70309945,0,0,0.70309945,44.68853,44.358917)" /><text
+   xml:space="preserve"
+   id="text1666"
+   style="fill:#ffffff;fill-opacity:0.80000001;white-space:pre;shape-inside:url(#rect1668)" /><text
+   xml:space="preserve"
+   id="text1672"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674);fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-56.149908,-232.98716)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2022">1</tspan></text><text
+   xml:space="preserve"
+   id="text1672-6"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-3);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-54.90599,-471.96664)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2024">2</tspan></text><text
+   xml:space="preserve"
+   id="text1672-1"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-6);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,88.181331,-233.48182)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2026">3</tspan></text><text
+   xml:space="preserve"
+   id="text1672-7"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-8);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,89.923516,-472.9994)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2028">4</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-107.88311,-425.85878)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2030">5</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2-2"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9-0);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,140.31603,-426.60417)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2032">6</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2-2-7"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9-0-3);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,-106.57328,-277.85487)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2034">7</tspan></text><text
+   xml:space="preserve"
+   id="text1672-2-2-9"
+   style="font-size:16px;white-space:pre;shape-inside:url(#rect1674-9-0-5);display:inline;fill:#ffffff;fill-opacity:0.8"
+   transform="matrix(1.8712033,0,0,1.8712033,140.59859,-279.63807)"><tspan
+     x="64.294922"
+     y="271.72011"
+     id="tspan2036">8</tspan></text></svg>
diff --git a/src/AutoPilotPlugins/Common/MotorComponent.qml b/src/AutoPilotPlugins/Common/MotorComponent.qml
index e1c5b5be7a41..fe382c9a840c 100644
--- a/src/AutoPilotPlugins/Common/MotorComponent.qml
+++ b/src/AutoPilotPlugins/Common/MotorComponent.qml
@@ -56,7 +56,7 @@ SetupPage {
                 id:         motorSlider
                 enabled:    safetySwitch.checked
                 spacing:    ScreenTools.defaultFontPixelWidth * 4
-                
+
                 ValueSlider {
                     id:                 sliderThrottle
                     width:              motorButtons.width
diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.cc b/src/AutoPilotPlugins/Common/RadioComponentController.cc
index dbf6d7de3aa0..8d8497f7fd9c 100644
--- a/src/AutoPilotPlugins/Common/RadioComponentController.cc
+++ b/src/AutoPilotPlugins/Common/RadioComponentController.cc
@@ -16,8 +16,8 @@
 
 #include <QtCore/QSettings>
 
-QGC_LOGGING_CATEGORY(RadioComponentControllerLog, "qgc.autopilotplugins.common.radiocomponentcontroller")
-QGC_LOGGING_CATEGORY(RadioComponentControllerVerboseLog, "qgc.autopilotplugins.common.radiocomponentcontroller:verbose")
+QGC_LOGGING_CATEGORY(RadioComponentControllerLog, "AutoPilotPlugins.RadioComponentController")
+QGC_LOGGING_CATEGORY(RadioComponentControllerVerboseLog, "AutoPilotPlugins.RadioComponentController:verbose")
 
 #ifdef QGC_UNITTEST_BUILD
 RadioComponentController* RadioComponentController::_unitTestController = nullptr;
diff --git a/src/AutoPilotPlugins/Common/SyslinkComponentController.cc b/src/AutoPilotPlugins/Common/SyslinkComponentController.cc
index 0ea2e15edfe4..b4927d7c1e28 100644
--- a/src/AutoPilotPlugins/Common/SyslinkComponentController.cc
+++ b/src/AutoPilotPlugins/Common/SyslinkComponentController.cc
@@ -11,7 +11,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(SyslinkComponentControllerLog, "qgc.autopilotplugins.common.syslinkcomponentcontroller")
+QGC_LOGGING_CATEGORY(SyslinkComponentControllerLog, "AutoPilotPlugins.SyslinkComponentController")
 
 SyslinkComponentController::SyslinkComponentController(QObject *parent)
     : FactPanelController(parent)
diff --git a/src/AutoPilotPlugins/PX4/ActuatorComponent.cc b/src/AutoPilotPlugins/PX4/ActuatorComponent.cc
index d2ccc780a375..533f729b885c 100644
--- a/src/AutoPilotPlugins/PX4/ActuatorComponent.cc
+++ b/src/AutoPilotPlugins/PX4/ActuatorComponent.cc
@@ -16,7 +16,7 @@
 
 static bool imageProviderAdded{false};
 
-ActuatorComponent::ActuatorComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) 
+ActuatorComponent::ActuatorComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, AutoPilotPlugin::UnknownVehicleComponent, parent)
     , _name(tr("Actuators"))
     , _actuators(*vehicle->actuators())
diff --git a/src/AutoPilotPlugins/PX4/ActuatorComponent.h b/src/AutoPilotPlugins/PX4/ActuatorComponent.h
index bf4b35b2c6c7..e3ad0dec593f 100644
--- a/src/AutoPilotPlugins/PX4/ActuatorComponent.h
+++ b/src/AutoPilotPlugins/PX4/ActuatorComponent.h
@@ -17,13 +17,13 @@ class Actuators;
 class ActuatorComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     ActuatorComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
 
     // Virtuals from VehicleComponent
     QStringList setupCompleteChangedTriggerList(void) const final;
-    
+
     // Virtuals from VehicleComponent
     QString name(void) const final;
     QString description(void) const final;
diff --git a/src/AutoPilotPlugins/PX4/ActuatorFact.qml b/src/AutoPilotPlugins/PX4/ActuatorFact.qml
index 910bb58a7901..eecae1c8ae8d 100644
--- a/src/AutoPilotPlugins/PX4/ActuatorFact.qml
+++ b/src/AutoPilotPlugins/PX4/ActuatorFact.qml
@@ -46,9 +46,8 @@ Loader {
 			text:           qsTr("(Param not available)")
 		}
 	}
-	sourceComponent: fact ? 
-		(fact.enumStrings.length > 0 ? factComboBox : 
+	sourceComponent: fact ?
+		(fact.enumStrings.length > 0 ? factComboBox :
 			(fact.readOnly ? factReadOnly : (fact.typeIsBool ? factCheckbox : factTextField))
 		) : notAvailable
 }
-
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.h b/src/AutoPilotPlugins/PX4/AirframeComponent.h
index 122eb8182c86..e2853b9889a5 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponent.h
+++ b/src/AutoPilotPlugins/PX4/AirframeComponent.h
@@ -19,10 +19,10 @@
 class AirframeComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     AirframeComponent(Vehicle* vehicles, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Virtuals from VehicleComponent
     virtual QStringList setupCompleteChangedTriggerList(void) const;
 
@@ -33,7 +33,7 @@ class AirframeComponent : public VehicleComponent
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QUrl summaryQmlSource(void) const;    
+    virtual QUrl summaryQmlSource(void) const;
 
 private:
     const QString   _name;
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.qml b/src/AutoPilotPlugins/PX4/AirframeComponent.qml
index 3e0a107b66a9..4390eadc4a71 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponent.qml
+++ b/src/AutoPilotPlugins/PX4/AirframeComponent.qml
@@ -109,7 +109,7 @@ SetupPage {
                     text:           (controller.currentVehicleName != "" ?
                                          qsTr("You've connected a %1.").arg(controller.currentVehicleName) :
                                          qsTr("Airframe is not set.")) +
-                                    qsTr("To change this configuration, select the desired airframe below then click 'Apply and Restart'.")
+                                    qsTr(" To change this configuration, select the desired airframe below then click 'Apply and Restart'.")
                     font.bold:      true
                     wrapMode:       Text.WordWrap
                 }
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.h b/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.h
index 17748b623fa5..10a7fb5da4df 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.h
+++ b/src/AutoPilotPlugins/PX4/AirframeComponentAirframes.h
@@ -24,7 +24,7 @@ class AirframeComponentAirframes
         QString name;
         int         autostartId;
     } AirframeInfo_t;
-    
+
     typedef struct {
         QString name;
         QString imageResource;
@@ -34,9 +34,9 @@ class AirframeComponentAirframes
     static QMap<QString, AirframeComponentAirframes::AirframeType_t*>& get();
     static void clear();
     static void insert(QString& group, QString& image, QString& name, int id);
-    
+
 protected:
     static QMap<QString, AirframeType_t*> rgAirframeTypes;
-    
+
 private:
 };
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentController.cc b/src/AutoPilotPlugins/PX4/AirframeComponentController.cc
index 0fb2fe8d09c0..9b1527f47fa5 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/AirframeComponentController.cc
@@ -30,19 +30,19 @@ AirframeComponentController::AirframeComponentController(void) :
     if (!_typesRegistered) {
         _typesRegistered = true;
     }
-    
+
     QStringList usedParams;
     usedParams << "SYS_AUTOSTART" << "SYS_AUTOCONFIG";
     if (!_allParametersExists(ParameterManager::defaultComponentId, usedParams)) {
         return;
     }
-    
+
     // Load up member variables
-    
+
     bool autostartFound = false;
     _autostartId = getParameterFact(ParameterManager::defaultComponentId, "SYS_AUTOSTART")->rawValue().toInt();
+    _currentVehicleName = QString::number(_autostartId); // Temp val. Replaced with actual vehicle name if found
 
-    
     for (int tindex = 0; tindex < AirframeComponentAirframes::get().count(); tindex++) {
 
         const AirframeComponentAirframes::AirframeType_t* pType = AirframeComponentAirframes::get().values().at(tindex);
@@ -65,10 +65,10 @@ AirframeComponentController::AirframeComponentController(void) :
             }
             airframeType->addAirframe(pInfo->name, pInfo->autostartId);
         }
-        
+
         _airframeTypes.append(QVariant::fromValue(airframeType));
     }
-    
+
     if (_autostartId != 0 && !autostartFound) {
         _showCustomConfigPanel = true;
         emit showCustomConfigPanelChanged(true);
@@ -88,15 +88,15 @@ void AirframeComponentController::changeAutostart(void)
 	}
 
     QGuiApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-    
+
     Fact* sysAutoStartFact  = getParameterFact(-1, "SYS_AUTOSTART");
     Fact* sysAutoConfigFact = getParameterFact(-1, "SYS_AUTOCONFIG");
-    
+
     // We need to wait for the vehicleUpdated signals to come back before we reboot
     _waitParamWriteSignalCount = 0;
     connect(sysAutoStartFact, &Fact::vehicleUpdated, this, &AirframeComponentController::_waitParamWriteSignal);
     connect(sysAutoConfigFact, &Fact::vehicleUpdated, this, &AirframeComponentController::_waitParamWriteSignal);
-    
+
     // We use forceSetValue to ensure params are sent even if the previous value is that same as the new value
     sysAutoStartFact->forceSetRawValue(_autostartId);
     sysAutoConfigFact->forceSetRawValue(1);
@@ -105,7 +105,7 @@ void AirframeComponentController::changeAutostart(void)
 void AirframeComponentController::_waitParamWriteSignal(QVariant value)
 {
     Q_UNUSED(value);
-    
+
     _waitParamWriteSignalCount++;
     if (_waitParamWriteSignalCount == 2) {
         // Now that both params have made it to the vehicle we can reboot it. All these signals are flying
@@ -116,7 +116,7 @@ void AirframeComponentController::_waitParamWriteSignal(QVariant value)
 }
 
 void AirframeComponentController::_rebootAfterStackUnwind(void)
-{    
+{
     _vehicle->sendMavCommand(_vehicle->defaultComponentId(), MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN, true /* showError */, 1.0f);
     QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
     for (unsigned i = 0; i < 2000; i++) {
@@ -132,19 +132,19 @@ AirframeType::AirframeType(const QString& name, const QString& imageResource, QO
     _name(name),
     _imageResource(imageResource)
 {
-    
+
 }
 
 AirframeType::~AirframeType()
 {
-    
+
 }
 
 void AirframeType::addAirframe(const QString& name, int autostartId)
 {
     Airframe* airframe = new Airframe(name, autostartId);
     Q_CHECK_PTR(airframe);
-    
+
     _airframes.append(QVariant::fromValue(airframe));
 }
 
@@ -153,10 +153,10 @@ Airframe::Airframe(const QString& name, int autostartId, QObject* parent) :
     _name(name),
     _autostartId(autostartId)
 {
-    
+
 }
 
 Airframe::~Airframe()
 {
-    
+
 }
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentController.h b/src/AutoPilotPlugins/PX4/AirframeComponentController.h
index 54f81f5d6c1a..f2ac08b45733 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponentController.h
+++ b/src/AutoPilotPlugins/PX4/AirframeComponentController.h
@@ -24,37 +24,37 @@ class AirframeComponentController : public FactPanelController
 {
     Q_OBJECT
     QML_ELEMENT
-    
+
 public:
     AirframeComponentController(void);
     ~AirframeComponentController();
-    
+
     Q_PROPERTY(bool showCustomConfigPanel MEMBER _showCustomConfigPanel NOTIFY showCustomConfigPanelChanged)
-    
+
     Q_PROPERTY(QVariantList airframeTypes MEMBER _airframeTypes CONSTANT)
-    
+
     Q_PROPERTY(QString currentAirframeType MEMBER _currentAirframeType CONSTANT)
     Q_PROPERTY(QString currentVehicleName MEMBER _currentVehicleName CONSTANT)
     Q_PROPERTY(int currentVehicleIndex MEMBER _currentVehicleIndex CONSTANT)
-    
+
     Q_PROPERTY(int autostartId MEMBER _autostartId NOTIFY autostartIdChanged)
-    
+
     Q_INVOKABLE void changeAutostart(void);
-    
+
     int currentAirframeIndex(void);
     void setCurrentAirframeIndex(int newIndex);
-    
+
 signals:
     void autostartIdChanged(int newAutostartId);
     void showCustomConfigPanelChanged(bool show);
-    
+
 private slots:
     void _waitParamWriteSignal(QVariant value);
     void _rebootAfterStackUnwind(void);
-    
+
 private:
     static bool _typesRegistered;
-    
+
     QVariantList    _airframeTypes;
     QString         _currentAirframeType;
     QString         _currentVehicleName;
@@ -69,14 +69,14 @@ class Airframe : public QObject
     Q_OBJECT
     QML_ELEMENT
     QML_UNCREATABLE("")
-    
+
 public:
     Airframe(const QString& name, int autostartId, QObject* parent = nullptr);
     ~Airframe();
-    
+
     Q_PROPERTY(QString text MEMBER _name CONSTANT)
     Q_PROPERTY(int autostartId MEMBER _autostartId CONSTANT)
-    
+
 private:
     QString _name;
     int     _autostartId;
@@ -87,17 +87,17 @@ class AirframeType : public QObject
     Q_OBJECT
     QML_ELEMENT
     QML_UNCREATABLE("")
-    
+
 public:
     AirframeType(const QString& name, const QString& imageResource, QObject* parent = nullptr);
     ~AirframeType();
-    
+
     Q_PROPERTY(QString name MEMBER _name CONSTANT)
     Q_PROPERTY(QString imageResource MEMBER _imageResource CONSTANT)
     Q_PROPERTY(QVariantList airframes MEMBER _airframes CONSTANT)
-    
+
     void addAirframe(const QString& name, int autostartId);
-    
+
 private:
     QString         _name;
     QString         _imageResource;
diff --git a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
index 5a9dad533369..d91b37a0046e 100644
--- a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
+++ b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
@@ -372,4 +372,10 @@
       <type>VTOL Tiltrotor</type>
     </airframe>
   </airframe_group>
+  <airframe_group name="Spacecraft" image="FreeFlyer">
+    <airframe name="KTH ATMOS Free-flyer" id="70000" maintainer="DISCOWER">
+      <class>Spacecraft</class>
+      <type>Free-Flyer</type>
+    </airframe>
+  </airframe_group>
 </airframes>
diff --git a/src/AutoPilotPlugins/PX4/CMakeLists.txt b/src/AutoPilotPlugins/PX4/CMakeLists.txt
index 0f4afdd3fe8a..3b3093257cb2 100644
--- a/src/AutoPilotPlugins/PX4/CMakeLists.txt
+++ b/src/AutoPilotPlugins/PX4/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# PX4 AutoPilot Plugin
+# PX4-specific vehicle configuration and setup
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ActuatorComponent.cc
@@ -34,7 +39,9 @@ target_sources(${CMAKE_PROJECT_NAME}
         SensorsComponentController.h
 )
 
-# Add metadata file
+# ----------------------------------------------------------------------------
+# PX4 Airframe Metadata
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} autopilot_plugin_px4_resource
     PREFIX "/AutoPilotPlugins/PX4"
     FILES AirframeFactMetaData.xml
@@ -42,6 +49,9 @@ qt_add_resources(${CMAKE_PROJECT_NAME} autopilot_plugin_px4_resource
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# PX4 QML Module
+# ----------------------------------------------------------------------------
 qt_add_library(AutoPilotPluginsPX4Module STATIC)
 
 qt_add_qml_module(AutoPilotPluginsPX4Module
@@ -74,6 +84,12 @@ qt_add_qml_module(AutoPilotPluginsPX4Module
         PX4TuningComponentPlaneAttitude.qml
         PX4TuningComponentPlaneRate.qml
         PX4TuningComponentPlaneTECS.qml
+        PX4TuningComponentSpacecraft.qml
+        PX4TuningComponentSpacecraftAll.qml
+        PX4TuningComponentSpacecraftAttitude.qml
+        PX4TuningComponentSpacecraftPosition.qml
+        PX4TuningComponentSpacecraftRate.qml
+        PX4TuningComponentSpacecraftVelocity.qml
         PX4TuningComponentVTOL.qml
         SafetyComponent.qml
         SafetyComponentSummary.qml
diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc
index ac7b252cb461..dc7f1dbb3b93 100644
--- a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc
+++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc
@@ -20,7 +20,7 @@ struct SwitchListItem {
     const char* name;
 };
 
-FlightModesComponent::FlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) 
+FlightModesComponent::FlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
     : VehicleComponent(vehicle, autopilot, AutoPilotPlugin::KnownFlightModesVehicleComponent, parent)
     , _name(tr("Flight Modes"))
 {
diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.h b/src/AutoPilotPlugins/PX4/FlightModesComponent.h
index 2cd98d043a27..db306efeb3f4 100644
--- a/src/AutoPilotPlugins/PX4/FlightModesComponent.h
+++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.h
@@ -19,10 +19,10 @@
 class FlightModesComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     FlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Overrides from VehicleComponent
     QString name(void) const final;
     QString description(void) const final;
@@ -32,7 +32,7 @@ class FlightModesComponent : public VehicleComponent
     bool requiresSetup() const final { return false; }
     bool setupComplete() const final { return true; }
     QStringList setupCompleteChangedTriggerList() const final { return QStringList(); }
-    
+
 private:
     const QString   _name;
     QVariantList    _summaryItems;
diff --git a/src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc b/src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc
index 05a495968a7b..472911d6ad2a 100644
--- a/src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc
+++ b/src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc
@@ -24,7 +24,7 @@
 #include <QtCore/QXmlStreamReader>
 #include <QtCore/QSettings>
 
-QGC_LOGGING_CATEGORY(PX4AirframeLoaderLog, "PX4AirframeLoaderLog")
+QGC_LOGGING_CATEGORY(PX4AirframeLoaderLog, "AutoPilotPlugins.PX4AirframeLoader")
 
 bool PX4AirframeLoader::_airframeMetaDataLoaded = false;
 
diff --git a/src/AutoPilotPlugins/PX4/PX4FlightBehavior.h b/src/AutoPilotPlugins/PX4/PX4FlightBehavior.h
index 264f7fb25b7a..cdc1d8332dd0 100644
--- a/src/AutoPilotPlugins/PX4/PX4FlightBehavior.h
+++ b/src/AutoPilotPlugins/PX4/PX4FlightBehavior.h
@@ -15,13 +15,13 @@
 class PX4FlightBehavior : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     PX4FlightBehavior(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Virtuals from VehicleComponent
     QStringList setupCompleteChangedTriggerList() const final;
-    
+
     // Virtuals from VehicleComponent
     QString name() const final;
     QString description() const final;
diff --git a/src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml b/src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml
index 8c51f801aba7..9d0d4107fcc8 100644
--- a/src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml
+++ b/src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml
@@ -20,14 +20,15 @@ import QGroundControl.Controls
 SetupPage {
     id:             flightBehavior
     pageComponent:  pageComponent
+
     property real _margins: ScreenTools.defaultFontPixelHeight
 
     FactPanelController {
-        id:         controller
+        id: controller
     }
 
     QGCPalette {
-        id:                 qgcPal
+        id: qgcPal
     }
 
     property Fact _sys_vehicle_resp:  controller.getParameterFact(-1, "SYS_VEHICLE_RESP", false)
@@ -37,135 +38,153 @@ SetupPage {
     Component {
         id: pageComponent
 
-        Column {
-
-            spacing:            _margins
-
-            Column {
-                visible:                _sys_vehicle_resp
+        ColumnLayout {
+            width:   Math.max(availableWidth, ScreenTools.defaultFontPixelWidth * 40)
+            spacing: _margins
+
+            ColumnLayout {
+                Layout.fillWidth:   true
+                visible:            _sys_vehicle_resp
+
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    enabled:            responsivenessCheckbox.checked
+                    heading:            qsTr("Responsiveness")
+                    headingDescription: qsTr("A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.")
+
+                    // It's a bit tricky to handle the fact that the parameter goes negative to signal disabled.
+                    // We can't allow the slider to go negative, hence all the hoops to jump through with value and loadComplete.
+                    ValueSlider {
+                        Layout.fillWidth:   true
+                        from:               0.0
+                        to:                 1
+                        majorTickStepSize:  0.01
+                        value:              { value = _sys_vehicle_resp ? Math.abs(_sys_vehicle_resp.value) : (from + to) / 2 }
+                        decimalPlaces:      _sys_vehicle_resp ? _sys_vehicle_resp.decimalPlaces : 0
+
+                        property bool loadComplete: false
+
+                        Component.onCompleted: loadComplete = true
+
+                        onValueChanged: {
+                            if (loadComplete && enabled) {
+                                _sys_vehicle_resp.value = value
+                            }
+                        }
+                    }
+                }
 
                 QGCCheckBox {
                     id:                 responsivenessCheckbox
+                    Layout.fillWidth:   true
                     text:               qsTr("Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)")
                     checked:            _sys_vehicle_resp && _sys_vehicle_resp.value >= 0
-                    onClicked: {
-                        if (checked) {
-                            _sys_vehicle_resp.value = Math.abs(_sys_vehicle_resp.value)
-                        } else {
-                            _sys_vehicle_resp.value = -Math.abs(_sys_vehicle_resp.value)
-                        }
-                    }
+                    onClicked:          _sys_vehicle_resp.value = checked ? Math.abs(_sys_vehicle_resp.value) : -Math.abs(_sys_vehicle_resp.value)
                 }
 
-                FactSliderPanel {
-                    width:          availableWidth
-                    enabled:        responsivenessCheckbox.checked
-
-                    sliderModel: ListModel {
-                        id:             responsivenessSlider
-
-                        ListElement {
-                            title:          qsTr("Responsiveness")
-                            description:    qsTr("A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.")
-                            param:          "SYS_VEHICLE_RESP"
-                            min:            0.01
-                            max:            1
-                            step:           0.01
-                        }
-                    }
-                }
                 QGCLabel {
+                    Layout.fillWidth:   true
                     visible:            _sys_vehicle_resp && _sys_vehicle_resp.value > 0.8
                     color:              qgcPal.warningText
-                    text:              qsTr("Warning: a high responsiveness requires a vehicle with large thrust-to-weight ratio. The vehicle might lose altitude otherwise.")
+                    text:               qsTr("Warning: a high responsiveness requires a vehicle with large thrust-to-weight ratio. The vehicle might lose altitude otherwise.")
                 }
             }
 
-            Column {
-                visible:                _mpc_xy_vel_all
+            ColumnLayout {
+                Layout.fillWidth:   true
+                visible:            _mpc_xy_vel_all
+
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    enabled:            xyVelCheckbox.checked
+                    heading:            qsTr("Horizontal velocity (m/s)")
+                    headingDescription: qsTr("Limit the horizonal velocity (applies to all modes).")
+
+                    // It's a bit tricky to handle the fact that the parameter goes negative to signal disabled.
+                    // We can't allow the slider to go negative, hence all the hoops to jump through with value and loadComplete.
+                    ValueSlider {
+                        Layout.fillWidth:   true
+                        from:               0.5
+                        to:                 20
+                        majorTickStepSize:  0.6
+                        value:              { value = _mpc_xy_vel_all ? Math.abs(_mpc_xy_vel_all.value) : (from + to) / 2 }
+                        decimalPlaces:      _mpc_xy_vel_all ? _mpc_xy_vel_all.decimalPlaces : 0
+
+                        property bool loadComplete: false
+
+                        Component.onCompleted: loadComplete = true
+
+                        onValueChanged: {
+                            if (loadComplete && enabled) {
+                                _mpc_xy_vel_all.value = value
+                            }
+                        }
+                    }
+                }
 
                 QGCCheckBox {
                     id:                 xyVelCheckbox
+                    Layout.fillWidth:   true
                     text:               qsTr("Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)")
                     checked:            _mpc_xy_vel_all ? (_mpc_xy_vel_all.value >= 0) : false
-                    onClicked: {
-                        if (checked) {
-                            _mpc_xy_vel_all.value = Math.abs(_mpc_xy_vel_all.value)
-                        } else {
-                            _mpc_xy_vel_all.value = -Math.abs(_mpc_xy_vel_all.value)
-                        }
-                    }
+                    onClicked:          mpc_xy_vel_all.value = checked ? Math.abs(_mpc_xy_vel_all.value) : -Math.abs(_mpc_xy_vel_all.value)
                 }
+            }
 
-                FactSliderPanel {
-                    width:          availableWidth
-                    enabled:        xyVelCheckbox.checked
-
-                    sliderModel: ListModel {
-                        id:             xyVelSlider
-
-                        ListElement {
-                            title:          qsTr("Horizontal velocity (m/s)")
-                            description:    qsTr("Limit the horizonal velocity (applies to all modes).")
-                            param:          "MPC_XY_VEL_ALL"
-                            min:            0.5
-                            max:            20
-                            step:           0.5
+            ColumnLayout {
+                Layout.fillWidth:   true
+                visible:            _mpc_z_vel_all
+
+                SettingsGroupLayout {
+                    Layout.fillWidth:   true
+                    enabled:            zVelCheckbox.checked
+                    heading:            qsTr("Vertical velocity (m/s)")
+                    headingDescription: qsTr("Limit the vertical velocity (applies to all modes).")
+
+                    // It's a bit tricky to handle the fact that the parameter goes negative to signal disabled.
+                    // We can't allow the slider to go negative, hence all the hoops to jump through with value and loadComplete.
+                    ValueSlider {
+                        Layout.fillWidth:   true
+                        from:               0.2
+                        to:                 8
+                        majorTickStepSize:  0.2
+                        value:              { value = _mpc_z_vel_all ? Math.abs(_mpc_z_vel_all.value) : (from + to) / 2 }
+                        decimalPlaces:      _mpc_z_vel_all ? _mpc_z_vel_all.decimalPlaces : 0
+
+                        property bool loadComplete: false
+
+                        Component.onCompleted: loadComplete = true
+
+                        onValueChanged: {
+                            if (loadComplete && enabled) {
+                                _mpc_z_vel_all.value = value
+                            }
                         }
                     }
                 }
-            }
-
-            Column {
-                visible:                _mpc_z_vel_all
 
                 QGCCheckBox {
                     id:                 zVelCheckbox
+                    Layout.fillWidth:   true
                     text:               qsTr("Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)")
                     checked:            _mpc_z_vel_all && _mpc_z_vel_all.value >= 0
-                    onClicked: {
-                        if (checked) {
-                            _mpc_z_vel_all.value = Math.abs(_mpc_z_vel_all.value)
-                        } else {
-                            _mpc_z_vel_all.value = -Math.abs(_mpc_z_vel_all.value)
-                        }
-                    }
-                }
-
-                FactSliderPanel {
-                    width:          availableWidth
-                    enabled:        zVelCheckbox.checked
-
-                    sliderModel: ListModel {
-                        id:             zVelSlider
-
-                        ListElement {
-                            title:          qsTr("Vertical velocity (m/s)")
-                            description:    qsTr("Limit the vertical velocity (applies to all modes).")
-                            param:          "MPC_Z_VEL_ALL"
-                            min:            0.2
-                            max:            8
-                            step:           0.2
-                        }
-                    }
+                    onClicked:          mpc_z_vel_all.value = checked ? Math.abs(_mpc_z_vel_all.value) : -Math.abs(_mpc_z_vel_all.value)
                 }
             }
 
-            FactSliderPanel {
-                width:          availableWidth
-
-                sliderModel: ListModel {
-                    ListElement {
-                        title:          qsTr("Mission Turning Radius")
-                        description:    qsTr("Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.")
-                        param:          "NAV_ACC_RAD"
-                        min:            2
-                        max:            16
-                        step:           0.5
-                    }
+            SettingsGroupLayout {
+                Layout.fillWidth:   true
+                heading:            qsTr("Mission Turning Radius")
+                headingDescription: qsTr("Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.")
+
+                FactSlider {
+                    Layout.fillWidth:   true
+                    from:               QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(2)
+                    to:                 QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(16)
+                    majorTickStepSize:  0.5
+                    fact:               controller.getParameterFact(-1, "NAV_ACC_RAD")
                 }
             }
-
-        } // Column
-    } // Component - pageComponent
-} // SetupPage
+        }
+    }
+}
diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponent.h b/src/AutoPilotPlugins/PX4/PX4RadioComponent.h
index e7d69e55c5df..ae15a7285c9b 100644
--- a/src/AutoPilotPlugins/PX4/PX4RadioComponent.h
+++ b/src/AutoPilotPlugins/PX4/PX4RadioComponent.h
@@ -15,13 +15,13 @@
 class PX4RadioComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     PX4RadioComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Virtuals from VehicleComponent
     virtual QStringList setupCompleteChangedTriggerList(void) const;
-    
+
     // Virtuals from VehicleComponent
     virtual QString name(void) const;
     virtual QString description(void) const;
@@ -30,7 +30,7 @@ class PX4RadioComponent : public VehicleComponent
     virtual bool setupComplete(void) const;
     virtual QUrl setupSource(void) const;
     virtual QUrl summaryQmlSource(void) const;
-    
+
 private:
     const QString   _name;
     QVariantList    _summaryItems;
diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.h b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.h
index 27a748d3e677..586be6139c5c 100644
--- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.h
+++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModesController.h
@@ -23,7 +23,7 @@ class PX4SimpleFlightModesController : public FactPanelController
     QML_ELEMENT
 public:
     PX4SimpleFlightModesController(void);
-    
+
     Q_PROPERTY(int          activeFlightMode    READ activeFlightMode       NOTIFY activeFlightModeChanged)
     Q_PROPERTY(int          channelCount        MEMBER _channelCount        CONSTANT)
     Q_PROPERTY(QVariantList rcChannelValues     MEMBER _rcChannelValues     NOTIFY rcChannelValuesChanged)
@@ -34,10 +34,10 @@ class PX4SimpleFlightModesController : public FactPanelController
     void activeFlightModeChanged(int activeFlightMode);
     void channelOptionEnabledChanged(void);
     void rcChannelValuesChanged(void);
-    
+
 private slots:
     void _rcChannelsChanged(int channelCount, int pwmValues[QGCMAVLink::maxRcChannels]);
-    
+
 private:
     int             _activeFlightMode;
     int             _channelCount;
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc b/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc
index ca0842df36c3..b3ebed2f213c 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponent.cc
@@ -73,6 +73,10 @@ QUrl PX4TuningComponent::setupSource(void) const
         case MAV_TYPE_VTOL_RESERVED5:
             qmlFile = "qrc:/qml/QGroundControl/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml";
             break;
+        case MAV_TYPE_SPACECRAFT_ORBITER:
+            // Spacecraft Type
+            qmlFile = "qrc:/qml/QGroundControl/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraft.qml";
+            break;
         default:
             break;
     }
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponent.h b/src/AutoPilotPlugins/PX4/PX4TuningComponent.h
index e620ea8c7d6a..d5a2cefd603f 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponent.h
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponent.h
@@ -15,13 +15,13 @@
 class PX4TuningComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     PX4TuningComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Virtuals from VehicleComponent
     QStringList setupCompleteChangedTriggerList(void) const final;
-    
+
     // Virtuals from VehicleComponent
     QString name(void) const final;
     QString description(void) const final;
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml
index c296d084b654..096e82937553 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml
@@ -18,19 +18,19 @@ import QGroundControl.Controls
 
 PX4TuningComponent {
     model: ListModel {
-        ListElement { 
+        ListElement {
             buttonText: qsTr("Rate Controller")
             tuningPage: "PX4TuningComponentCopterRate.qml"
         }
-        ListElement { 
+        ListElement {
             buttonText: qsTr("Attitude Controller")
             tuningPage: "PX4TuningComponentCopterAttitude.qml"
         }
-        ListElement { 
+        ListElement {
             buttonText: qsTr("Velocity Controller")
             tuningPage: "PX4TuningComponentCopterVelocity.qml"
         }
-        ListElement { 
+        ListElement {
             buttonText: qsTr("Position Controller")
             tuningPage: "PX4TuningComponentCopterPosition.qml"
         }
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml
index 933fc08fe03d..0635096b581f 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml
@@ -86,4 +86,3 @@ ColumnLayout {
         showAutoTuning:     true
     }
 }
-
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml
index 7d724414d7ba..ed00610a0818 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml
@@ -84,5 +84,3 @@ ColumnLayout {
         chartDisplaySec: 50
     }
 }
-
-
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
index 1e1d83d6b63c..df2868960a10 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
@@ -161,4 +161,3 @@ ColumnLayout {
         }
     }
 }
-
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml
index 01bc8fe01f9a..8c31652cc868 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml
@@ -115,5 +115,3 @@ ColumnLayout {
         axis: [ horizontal, vertical ]
     }
 }
-
-
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml
index 4e224b381c8e..5c853ac98637 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml
@@ -18,13 +18,13 @@ import QGroundControl.Controls
 
 PX4TuningComponent {
     model: ListModel {
-        ListElement { 
+        ListElement {
             buttonText: qsTr("Rate Controller")
-            tuningPage: "PX4TuningComponentPlaneRate.qml" 
+            tuningPage: "PX4TuningComponentPlaneRate.qml"
         }
-        ListElement { 
+        ListElement {
             buttonText: qsTr("Rate Controller")
-            tuningPage: "PX4TuningComponentPlaneAttitude.qml" 
+            tuningPage: "PX4TuningComponentPlaneAttitude.qml"
         }
     }
 }
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneRate.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneRate.qml
index a04d3606a8d2..3781ff517561 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneRate.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneRate.qml
@@ -167,4 +167,3 @@ ColumnLayout {
         showAutoTuning:     true
     }
 }
-
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml
index 8cb6fc770cd8..4c020f980f08 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml
@@ -53,6 +53,3 @@ ColumnLayout {
         axis: [ data ]
     }
 }
-
-
-
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraft.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraft.qml
new file mode 100644
index 000000000000..79da78d045b9
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraft.qml
@@ -0,0 +1,27 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+SetupPage {
+    id:             tuningPage
+    pageComponent:  pageComponent
+
+    Component {
+        id: pageComponent
+
+        PX4TuningComponentSpacecraftAll {
+        }
+    } // Component - pageComponent
+} // SetupPage
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftAll.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftAll.qml
new file mode 100644
index 000000000000..2b18c741663b
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftAll.qml
@@ -0,0 +1,36 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+PX4TuningComponent {
+    model: ListModel {
+        ListElement {
+            buttonText: qsTr("Rate Controller")
+            tuningPage: "PX4TuningComponentSpacecraftRate.qml"
+        }
+        ListElement {
+            buttonText: qsTr("Attitude Controller")
+            tuningPage: "PX4TuningComponentSpacecraftAttitude.qml"
+        }
+        ListElement {
+            buttonText: qsTr("Velocity Controller")
+            tuningPage: "PX4TuningComponentSpacecraftVelocity.qml"
+        }
+        ListElement {
+            buttonText: qsTr("Position Controller")
+            tuningPage: "PX4TuningComponentSpacecraftPosition.qml"
+        }
+    }
+}
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftAttitude.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftAttitude.qml
new file mode 100644
index 000000000000..e7bdbac6b370
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftAttitude.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+ *
+ * (c) 2021 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+import QGroundControl.FactControls
+
+ColumnLayout {
+    property real _availableHeight:     availableHeight
+    property real _availableWidth:      availableWidth
+
+    PIDTuning {
+        id:                 pidTuning
+        availableWidth:     _availableWidth
+        availableHeight:    _availableHeight - pidTuning.y
+
+        property var roll: QtObject {
+            property string name: qsTr("Roll")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.roll.value },
+                { name: "Setpoint", value: globals.activeVehicle.setpoint.roll.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Proportional Gain (SC_ROLL_P)")
+                    description:    qsTr("Increase for more responsiveness, reduce if the attitude overshoots.")
+                    param:          "SC_ROLL_P"
+                    min:            1
+                    max:            14
+                    step:           0.5
+                }
+            }
+        }
+        property var pitch: QtObject {
+            property string name: qsTr("Pitch")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.pitch.value },
+                { name: "Setpoint", value: globals.activeVehicle.setpoint.pitch.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Proportional Gain (SC_PITCH_P)")
+                    description:    qsTr("Increase for more responsiveness, reduce if the attitude overshoots.")
+                    param:          "SC_PITCH_P"
+                    min:            1
+                    max:            14
+                    step:           0.5
+                }
+            }
+        }
+        property var yaw: QtObject {
+            property string name: qsTr("Yaw")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.heading.value },
+                { name: "Setpoint", value: globals.activeVehicle.setpoint.yaw.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Proportional Gain (SC_YAW_P)")
+                    description:    qsTr("Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).")
+                    param:          "SC_YAW_P"
+                    min:            1
+                    max:            5
+                    step:           0.1
+                }
+            }
+        }
+        title: "Attitude"
+        tuningMode: Vehicle.ModeRateAndAttitude
+        unit: "deg"
+        axis: [ roll, pitch, yaw ]
+        showAutoModeChange: true
+        showAutoTuning:     false
+    }
+}
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftPosition.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftPosition.qml
new file mode 100644
index 000000000000..20276a3e0bd4
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftPosition.qml
@@ -0,0 +1,76 @@
+/****************************************************************************
+ *
+ * (c) 2021 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+import QGroundControl.FactControls
+
+ColumnLayout {
+    property real _availableHeight: availableHeight
+    property real _availableWidth:  availableWidth
+
+    PIDTuning {
+        id:                 pidTuning
+        availableWidth:     _availableWidth
+        availableHeight:    _availableHeight - pidTuning.y
+
+        property var position: QtObject {
+            property string name: qsTr("Position")
+            property string plotTitle: qsTr("Position (X direction)")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.localPosition.x.value },
+                { name: "Setpoint", value: globals.activeVehicle.localPositionSetpoint.x.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Proportional gain (SPC_POS_P)")
+                    description:    qsTr("Increase for more responsiveness, reduce if the position overshoots.")
+                    param:          "SPC_POS_P"
+                    min:            0
+                    max:            20
+                    step:           0.05
+                }
+                ListElement {
+                    title:          qsTr("Integral gain (SPC_POS_I)")
+                    description:    qsTr("Increase for faster convergence to zero steady-state error.")
+                    param:          "SPC_POS_I"
+                    min:            0
+                    max:            2
+                    step:           0.001
+                }
+                ListElement {
+                    title:          qsTr("Integral gain limit (SPC_POS_I_LIM)")
+                    description:    qsTr("Anti-windup limit for the position controller integral component.")
+                    param:          "SPC_POS_I_LIM"
+                    min:            0
+                    max:            2
+                    step:           0.001
+                }
+                ListElement {
+                    title:          qsTr("Position Error Limit (SPC_VEL_MAX)")
+                    description:    qsTr("Increase for more responsiveness, reduce if the position overshoots.")
+                    param:          "SPC_VEL_MAX"
+                    min:            0
+                    max:            20
+                    step:           0.05
+                }
+            }
+        }
+        title: "Position"
+        tuningMode: Vehicle.ModeVelocityAndPosition
+        unit: "m"
+        axis: [ position ]
+        chartDisplaySec: 50
+    }
+}
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftRate.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftRate.qml
new file mode 100644
index 000000000000..12dd4587748e
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftRate.qml
@@ -0,0 +1,145 @@
+/****************************************************************************
+ *
+ * (c) 2021 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+import QGroundControl.FactControls
+
+ColumnLayout {
+    property real _availableHeight:     availableHeight
+    property real _availableWidth:      availableWidth
+    property Fact _airmode:             controller.getParameterFact(-1, "MC_AIRMODE", false)
+    property Fact _thrustModelFactor:   controller.getParameterFact(-1, "THR_MDL_FAC", false)
+
+    PIDTuning {
+        id:                 pidTuning
+        availableWidth:     _availableWidth
+        availableHeight:    _availableHeight - pidTuning.y
+        title:              qsTr("Rate")
+        tuningMode:         Vehicle.ModeRateAndAttitude
+        unit:               qsTr("deg/s")
+        axis:               [ roll, pitch, yaw ]
+        chartDisplaySec:    3
+        showAutoModeChange: false
+        showAutoTuning:     false
+
+        property var roll: QtObject {
+            property string name: qsTr("Roll")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.rollRate.value },
+                { name: "Setpoint", value: globals.activeVehicle.setpoint.rollRate.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Overall Multiplier (SC_ROLLRATE_K)")
+                    description:    qsTr("Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).")
+                    param:          "SC_ROLLRATE_K"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Differential Gain (SC_ROLLRATE_D)")
+                    description:    qsTr("Damping: increase to reduce overshoots and oscillations, but not higher than really needed.")
+                    param:          "SC_ROLLRATE_D"
+                    min:            0.0000
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Integral Gain (SC_ROLLRATE_I)")
+                    description:    qsTr("Generally does not need much adjustment, reduce this when seeing slow oscillations.")
+                    param:          "SC_ROLLRATE_I"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+            }
+        }
+        property var pitch: QtObject {
+            property string name: qsTr("Pitch")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.pitchRate.value },
+                { name: "Setpoint", value: globals.activeVehicle.setpoint.pitchRate.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Overall Multiplier (SC_PITCHRATE_K)")
+                    description:    qsTr("Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).")
+                    param:          "SC_PITCHRATE_K"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Differential Gain (SC_PITCHRATE_D)")
+                    description:    qsTr("Damping: increase to reduce overshoots and oscillations, but not higher than really needed.")
+                    param:          "SC_PITCHRATE_D"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Integral Gain (SC_PITCHRATE_I)")
+                    description:    qsTr("Generally does not need much adjustment, reduce this when seeing slow oscillations.")
+                    param:          "SC_PITCHRATE_I"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+            }
+        }
+        property var yaw: QtObject {
+            property string name: qsTr("Yaw")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.yawRate.value },
+                { name: "Setpoint", value: globals.activeVehicle.setpoint.yawRate.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Overall Multiplier (SC_YAWRATE_K)")
+                    description:    qsTr("Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).")
+                    param:          "SC_YAWRATE_K"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Derivative Gain (SC_YAWRATE_D)")
+                    description:    qsTr("Damping: increase to reduce overshoots and oscillations, but not higher than really needed.")
+                    param:          "SC_YAWRATE_D"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Integral Gain (SC_YAWRATE_I)")
+                    description:    qsTr("Generally does not need much adjustment, reduce this when seeing slow oscillations.")
+                    param:          "SC_YAWRATE_I"
+                    min:            0.0
+                    max:            10.0
+                    step:           0.005
+                }
+                ListElement {
+                    title:          qsTr("Integral Limit (SC_YR_INT_LIM)")
+                    description:    qsTr("Increase if the robot still has a steady-state error at maximum integral gain.")
+                    param:          "SC_YR_INT_LIM"
+                    min:            0.0
+                    max:            5.0
+                    step:           0.005
+                }
+            }
+        }
+    }
+}
diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftVelocity.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftVelocity.qml
new file mode 100644
index 000000000000..da27af403cbf
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentSpacecraftVelocity.qml
@@ -0,0 +1,75 @@
+/****************************************************************************
+ *
+ * (c) 2021 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+import QGroundControl.FactControls
+
+ColumnLayout {
+    property real _availableHeight: availableHeight
+    property real _availableWidth:  availableWidth
+
+    PIDTuning {
+        id:                 pidTuning
+        availableWidth:     _availableWidth
+        availableHeight:    _availableHeight - pidTuning.y
+
+        property var position: QtObject {
+            property string name: qsTr("Velocity")
+            property string plotTitle: qsTr("Velocity (X axis)")
+            property var plot: [
+                { name: "Response", value: globals.activeVehicle.localPosition.vx.value },
+                { name: "Setpoint", value: globals.activeVehicle.localPositionSetpoint.vx.value }
+            ]
+            property var params: ListModel {
+                ListElement {
+                    title:          qsTr("Proportional gain (SPC_VEL_P)")
+                    description:    qsTr("Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).")
+                    param:          "SPC_VEL_P"
+                    min:            0.0
+                    max:            20
+                    step:           0.05
+                }
+                ListElement {
+                    title:          qsTr("Differential gain (SPC_VEL_D)")
+                    description:    qsTr("Damping: increase to reduce overshoots and oscillations, but not higher than really needed.")
+                    param:          "SPC_VEL_D"
+                    min:            0.0
+                    max:            3
+                    step:           0.05
+                }
+                ListElement {
+                    title:          qsTr("Integral gain (SPC_VEL_I)")
+                    description:    qsTr("Increase to reduce steady-state error (e.g. wind)")
+                    param:          "SPC_VEL_I"
+                    min:            0.0
+                    max:            10
+                    step:           0.2
+                }
+                ListElement {
+                    title:          qsTr("Integral gain Limiter (SPC_VEL_I_LIM)")
+                    description:    qsTr("Increase to enlarge the allowed integral compensation.")
+                    param:          "SPC_VEL_I_LIM"
+                    min:            0.0
+                    max:            5
+                    step:           0.2
+                }
+            }
+        }
+        title: "Velocity"
+        tuningMode: Vehicle.ModeVelocityAndPosition
+        unit: "m/s"
+        axis: [ position]
+    }
+}
diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.h b/src/AutoPilotPlugins/PX4/PowerComponent.h
index 0647d69af068..0083aac89eb7 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponent.h
+++ b/src/AutoPilotPlugins/PX4/PowerComponent.h
@@ -19,13 +19,13 @@
 class PowerComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     PowerComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Overrides from VehicleComponent
     QStringList setupCompleteChangedTriggerList(void) const override;
-    
+
     // Overrides from VehicleComponent
     QString name                    (void) const override;
     QString description             (void) const override;
diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.qml b/src/AutoPilotPlugins/PX4/PowerComponent.qml
index abd0befa3c1f..2bb56f4483a7 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponent.qml
+++ b/src/AutoPilotPlugins/PX4/PowerComponent.qml
@@ -289,14 +289,14 @@ SetupPage {
                                 visible:                battNumCellsAvailable && battLowVoltAvailable && battHighVoltAvailable
                             }
 
-                            Item { 
+                            Item {
                                 width:              1
                                 height:             1
                                 Layout.columnSpan:  battImage.visible ? 2 : 3
                             }
 
-                            QGCLabel { 
-                                text:  qsTr("Number of Cells (in Series)") 
+                            QGCLabel {
+                                text:  qsTr("Number of Cells (in Series)")
                                 visible: battNumCellsAvailable
                             }
                             FactTextField {
@@ -305,23 +305,23 @@ SetupPage {
                                 showUnits:  true
                                 visible:    battNumCellsAvailable
                             }
-                            QGCLabel { 
+                            QGCLabel {
                                 text:       qsTr("Battery Max:")
-                                visible:    battImage.visible 
+                                visible:    battImage.visible
                             }
-                            QGCLabel { 
+                            QGCLabel {
                                 text:       visible ? (battNumCells.value * battHighVolt.value).toFixed(1) + ' V' : ""
-                                visible:    battImage.visible 
+                                visible:    battImage.visible
                             }
-                            Item { 
+                            Item {
                                 width:              1
                                 height:             1
                                 Layout.columnSpan:  3
                                 visible:            !battImage.visible
                             }
 
-                            QGCLabel { 
-                                text:       qsTr("Empty Voltage (per cell)") 
+                            QGCLabel {
+                                text:       qsTr("Empty Voltage (per cell)")
                                 visible:    battLowVoltAvailable
                             }
                             FactTextField {
@@ -330,23 +330,23 @@ SetupPage {
                                 showUnits:  true
                                 visible:    battLowVoltAvailable
                             }
-                            QGCLabel { 
-                                text:       qsTr("Battery Min:") 
+                            QGCLabel {
+                                text:       qsTr("Battery Min:")
                                 visible:    battImage.visible
                             }
-                            QGCLabel { 
+                            QGCLabel {
                                 text:       visible ? (battNumCells.value * battLowVolt.value).toFixed(1) + ' V' : ""
                                 visible:    battImage.visible
                             }
-                            Item { 
+                            Item {
                                 width:              1
                                 height:             1
                                 Layout.columnSpan:  3
                                 visible:            battLowVoltAvailable && !battImage.visible
                             }
 
-                            QGCLabel { 
-                                text:       qsTr("Full Voltage (per cell)") 
+                            QGCLabel {
+                                text:       qsTr("Full Voltage (per cell)")
                                 visible:    battHighVoltAvailable
                             }
                             FactTextField {
@@ -355,7 +355,7 @@ SetupPage {
                                 showUnits:  true
                                 visible:    battHighVoltAvailable
                             }
-                            Item { 
+                            Item {
                                 width:              1
                                 height:             1
                                 Layout.columnSpan:  battImage.visible ? 2 : 3
diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.cc b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
index f9de761c187c..2daac1060f24 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.cc
@@ -64,17 +64,17 @@ void PowerComponentController::_handleVehicleTextMessage(int vehicleId, int /* c
     QString calStartPrefix("calibration started: ");
     if (text.startsWith(calStartPrefix)) {
         text = text.right(text.length() - calStartPrefix.length());
-        
+
         // Split version number and cal type
         QStringList parts = text.split(" ");
         if (parts.count() != 2) {
             emit incorrectFirmwareRevReporting();
             return;
         }
-        
+
 #if 0
         // FIXME: Cal version check is not working. Needs to be able to cancel, calibration
-        
+
         int firmwareRev = parts[0].toInt();
         if (firmwareRev < _neededFirmwareRev) {
             emit oldFirmware();
@@ -91,13 +91,13 @@ void PowerComponentController::_handleVehicleTextMessage(int vehicleId, int /* c
         emit connectBattery();
         return;
     }
-    
+
     if (text == "Battery connected") {
         emit batteryConnected();
         return;
     }
 
-    
+
     QString failedPrefix("calibration failed: ");
     if (text.startsWith(failedPrefix)) {
         QString failureText = text.right(text.length() - failedPrefix.length());
@@ -106,18 +106,18 @@ void PowerComponentController::_handleVehicleTextMessage(int vehicleId, int /* c
             emit disconnectBattery();
             return;
         }
-        
+
         emit calibrationFailed(text.right(text.length() - failedPrefix.length()));
         return;
     }
-    
+
     QString calCompletePrefix("calibration done:");
     if (text.startsWith(calCompletePrefix)) {
         _stopCalibration();
         emit calibrationSuccess(_warningMessages);
         return;
     }
-    
+
     QString warningPrefix("config warning: ");
     if (text.startsWith(warningPrefix)) {
         _warningMessages << text.right(text.length() - warningPrefix.length());
diff --git a/src/AutoPilotPlugins/PX4/PowerComponentController.h b/src/AutoPilotPlugins/PX4/PowerComponentController.h
index 4172bd82e2ac..2cbf9eb8e152 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponentController.h
+++ b/src/AutoPilotPlugins/PX4/PowerComponentController.h
@@ -24,11 +24,11 @@ class PowerComponentController : public FactPanelController
     QML_ELEMENT
 public:
     PowerComponentController(void);
-    
+
     Q_INVOKABLE void calibrateEsc(void);
     Q_INVOKABLE void startBusConfigureActuators(void);
     Q_INVOKABLE void stopBusConfigureActuators(void);
-    
+
 signals:
     void oldFirmware(void);
     void newerFirmware(void);
@@ -38,14 +38,14 @@ class PowerComponentController : public FactPanelController
     void batteryConnected(void);
     void calibrationFailed(const QString& errorMessage);
     void calibrationSuccess(const QStringList& warningMessages);
-    
+
 private slots:
     void _handleVehicleTextMessage(int vehicleId, int compId, int severity, QString text, const QString &description);
-    
+
 private:
     void _stopCalibration(void);
     void _stopBusConfig(void);
-    
+
     QStringList _warningMessages;
     static const int _neededFirmwareRev = 1;
 };
diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.h b/src/AutoPilotPlugins/PX4/SafetyComponent.h
index 226ff0cdb4b7..57a26685725d 100644
--- a/src/AutoPilotPlugins/PX4/SafetyComponent.h
+++ b/src/AutoPilotPlugins/PX4/SafetyComponent.h
@@ -20,13 +20,13 @@
 class SafetyComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     SafetyComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     // Virtuals from VehicleComponent
     QStringList setupCompleteChangedTriggerList(void) const override;
-    
+
     // Virtuals from VehicleComponent
     QString name                (void) const override;
     QString description         (void) const override;
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.cc b/src/AutoPilotPlugins/PX4/SensorsComponent.cc
index b849238417d8..d2c585062430 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.cc
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.cc
@@ -84,12 +84,12 @@ bool SensorsComponent::setupComplete(void) const
 QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
-    
+
     triggers << _deviceIds << _magCalParam << _magEnabledParam;
     if (_vehicle->fixedWing() || _vehicle->vtol() || _vehicle->airship()) {
         triggers << _airspeedCalTriggerParams;
     }
-    
+
     return triggers;
 }
 
@@ -101,13 +101,13 @@ QUrl SensorsComponent::setupSource(void) const
 QUrl SensorsComponent::summaryQmlSource(void) const
 {
     QString summaryQml;
-    
+
     if (_vehicle->fixedWing() || _vehicle->vtol() || _vehicle->airship()) {
         summaryQml = "qrc:/qml/QGroundControl/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml";
     } else {
         summaryQml = "qrc:/qml/QGroundControl/AutoPilotPlugins/PX4/SensorsComponentSummary.qml";
     }
-    
+
     return QUrl::fromUserInput(summaryQml);
 }
 
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.h b/src/AutoPilotPlugins/PX4/SensorsComponent.h
index 2f5329d00fc4..6dc9e8decca5 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.h
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.h
@@ -19,16 +19,16 @@
 class SensorsComponent : public VehicleComponent
 {
     Q_OBJECT
-    
+
 public:
     SensorsComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
-    
+
     Q_PROPERTY(bool airspeedCalSupported    READ _airspeedCalSupported  STORED false NOTIFY setupCompleteChanged)
     Q_PROPERTY(bool airspeedCalRequired     READ _airspeedCalRequired   STORED false NOTIFY setupCompleteChanged)
 
     // Virtuals from VehicleComponent
     QStringList setupCompleteChangedTriggerList(void) const override;
-    
+
     // Virtuals from VehicleComponent
     virtual QString name(void) const override;
     virtual QString description(void) const override;
@@ -37,7 +37,7 @@ class SensorsComponent : public VehicleComponent
     virtual bool setupComplete(void) const override;
     virtual QUrl setupSource(void) const override;
     virtual QUrl summaryQmlSource(void) const override;
-    
+
 private:
     bool _airspeedCalSupported  (void) const;
     bool _airspeedCalRequired   (void) const;
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
index fa26007f9ce5..a82bed0024b5 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.cc
@@ -13,7 +13,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(SensorsComponentControllerLog, "SensorsComponentControllerLog")
+QGC_LOGGING_CATEGORY(SensorsComponentControllerLog, "AutoPilotPlugins.SensorsComponentController")
 
 SensorsComponentController::SensorsComponentController(void)
     : _statusLog                                (nullptr)
@@ -79,7 +79,7 @@ void SensorsComponentController::_appendStatusLog(const QString& text)
         qWarning() << "Internal error";
         return;
     }
-    
+
     QString varText = text;
     QMetaObject::invokeMethod(_statusLog,
                               "append",
@@ -90,9 +90,9 @@ void SensorsComponentController::_startLogCalibration(void)
 {
     _unknownFirmwareVersion = false;
     _hideAllCalAreas();
-    
+
     connect(_vehicle, &Vehicle::textMessageReceived, this, &SensorsComponentController::_handleUASTextMessage);
-    
+
     _cancelButton->setEnabled(false);
 }
 
@@ -107,7 +107,7 @@ void SensorsComponentController::_startVisualCalibration(void)
     _cancelButton->setEnabled(true);
 
     _resetInternalState();
-    
+
     _progressBar->setProperty("value", 0);
 }
 
@@ -140,7 +140,7 @@ void SensorsComponentController::_resetInternalState(void)
 void SensorsComponentController::_stopCalibration(SensorsComponentController::StopCalibrationCode code)
 {
     disconnect(_vehicle, &Vehicle::textMessageReceived, this, &SensorsComponentController::_handleUASTextMessage);
-    
+
     _compassButton->setEnabled(true);
     _gyroButton->setEnabled(true);
     _accelButton->setEnabled(true);
@@ -148,20 +148,20 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
     _levelButton->setEnabled(true);
     _setOrientationsButton->setEnabled(true);
     _cancelButton->setEnabled(false);
-    
+
     if (code == StopCalibrationSuccess) {
         _resetInternalState();
-        
+
         _progressBar->setProperty("value", 1);
     } else {
         _progressBar->setProperty("value", 0);
     }
-    
+
     _waitingForCancel = false;
     emit waitingForCancelChanged();
 
     _refreshParams();
-    
+
     switch (code) {
         case StopCalibrationSuccess:
             _orientationCalAreaHelpText->setProperty("text", tr("Calibration complete"));
@@ -172,19 +172,19 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
                 emit magCalComplete();
             }
             break;
-            
+
         case StopCalibrationCancelled:
             emit resetStatusTextArea();
             _hideAllCalAreas();
             break;
-            
+
         default:
             // Assume failed
             _hideAllCalAreas();
             qgcApp()->showAppMessage(tr("Calibration failed. Calibration log will be displayed."));
             break;
     }
-    
+
     _magCalInProgress = false;
     _accelCalInProgress = false;
     _gyroCalInProgress = false;
@@ -226,7 +226,7 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
     Q_UNUSED(compId);
     Q_UNUSED(severity);
     Q_UNUSED(description);
-    
+
     if (uasId != _vehicle->id()) {
         return;
     }
@@ -234,7 +234,7 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
     // Needed for level horizon calibration
     text.replace("&lt;", "<");
     text.replace("&gt;", ">");
-    
+
     if (text.contains("progress <")) {
         QString percent = text.split("<").last().split(">").first();
         bool ok;
@@ -251,12 +251,12 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
 
     _appendStatusLog(text);
     qCDebug(SensorsComponentControllerLog) << text;
-    
+
     if (_unknownFirmwareVersion) {
         // We don't know how to do visual cal with the version of firwmare
         return;
     }
-    
+
     // All calibration messages start with [cal]
     QString calPrefix("[cal] ");
     if (!text.startsWith(calPrefix)) {
@@ -267,7 +267,7 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
     QString calStartPrefix("calibration started: ");
     if (text.startsWith(calStartPrefix)) {
         text = text.right(text.length() - calStartPrefix.length());
-        
+
         // Split version number and cal type
         QStringList parts = text.split(" ");
         if (parts.count() != 2 && parts[0].toInt() != _supportedFirmwareCalVersion) {
@@ -277,9 +277,9 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
             qDebug() << msg;
             return;
         }
-        
+
         _startVisualCalibration();
-        
+
         text = parts[1];
         if (text == "accel" || text == "mag" || text == "gyro") {
             // Reset all progress indication
@@ -295,7 +295,7 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
             _orientationCalRightSideInProgress = false;
             _orientationCalNoseDownSideInProgress = false;
             _orientationCalTailDownSideInProgress = false;
-            
+
             // Reset all visibility
             _orientationCalDownSideVisible = false;
             _orientationCalUpsideDownSideVisible = false;
@@ -303,9 +303,9 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
             _orientationCalRightSideVisible = false;
             _orientationCalTailDownSideVisible = false;
             _orientationCalNoseDownSideVisible = false;
-            
+
             _orientationCalAreaHelpText->setProperty("text", tr("Place your vehicle into one of the Incomplete orientations shown below and hold it still"));
-            
+
             if (text == "accel") {
                 _accelCalInProgress = true;
                 _orientationCalDownSideVisible = true;
@@ -351,11 +351,11 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
         }
         return;
     }
-    
+
     if (text.endsWith("orientation detected")) {
         QString side = text.section(" ", 0, 0);
         qCDebug(SensorsComponentControllerLog) << "Side started" << side;
-        
+
         if (side == "down") {
             _orientationCalDownSideInProgress = true;
             if (_magCalInProgress) {
@@ -387,22 +387,22 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
                 _orientationCalTailDownSideRotate = true;
             }
         }
-        
+
         if (_magCalInProgress) {
             _orientationCalAreaHelpText->setProperty("text", tr("Rotate the vehicle continuously as shown in the diagram until marked as Completed"));
         } else {
             _orientationCalAreaHelpText->setProperty("text", tr("Hold still in the current orientation"));
         }
-        
+
         emit orientationCalSidesInProgressChanged();
         emit orientationCalSidesRotateChanged();
         return;
     }
-    
+
     if (text.endsWith("side done, rotate to a different side")) {
         QString side = text.section(" ", 0, 0);
         qCDebug(SensorsComponentControllerLog) << "Side finished" << side;
-        
+
         if (side == "down") {
             _orientationCalDownSideInProgress = false;
             _orientationCalDownSideDone = true;
@@ -428,7 +428,7 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
             _orientationCalTailDownSideDone = true;
             _orientationCalTailDownSideRotate = false;
         }
-        
+
         _orientationCalAreaHelpText->setProperty("text", tr("Place you vehicle into one of the orientations shown below and hold it still"));
 
         emit orientationCalSidesInProgressChanged();
@@ -441,18 +441,18 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
         _orientationCalAreaHelpText->setProperty("text", tr("Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still"));
         return;
     }
-    
+
     QString calCompletePrefix("calibration done:");
     if (text.startsWith(calCompletePrefix)) {
         _stopCalibration(StopCalibrationSuccess);
         return;
     }
-    
+
     if (text.startsWith("calibration cancelled")) {
         _stopCalibration(_waitingForCancel ? StopCalibrationCancelled : StopCalibrationFailed);
         return;
     }
-    
+
     if (text.startsWith("calibration failed")) {
         _stopCalibration(StopCalibrationFailed);
         return;
@@ -462,13 +462,13 @@ void SensorsComponentController::_handleUASTextMessage(int uasId, int compId, in
 void SensorsComponentController::_refreshParams(void)
 {
     QStringList fastRefreshList;
-    
+
     // We ask for a refresh on these first so that the rotation combo show up as fast as possible
     fastRefreshList << "CAL_MAG0_ID" << "CAL_MAG1_ID" << "CAL_MAG2_ID" << "CAL_MAG0_ROT" << "CAL_MAG1_ROT" << "CAL_MAG2_ROT";
     for (const QString &paramName : std::as_const(fastRefreshList)) {
         _vehicle->parameterManager()->refreshParameter(ParameterManager::defaultComponentId, paramName);
     }
-    
+
     // Now ask for all to refresh
     _vehicle->parameterManager()->refreshParametersPrefix(ParameterManager::defaultComponentId, "CAL_");
     _vehicle->parameterManager()->refreshParametersPrefix(ParameterManager::defaultComponentId, "SENS_");
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentController.h b/src/AutoPilotPlugins/PX4/SensorsComponentController.h
index bf42aae872e0..99d5622c309d 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponentController.h
+++ b/src/AutoPilotPlugins/PX4/SensorsComponentController.h
@@ -28,10 +28,10 @@ class SensorsComponentController : public FactPanelController
     QML_ELEMENT
 public:
     SensorsComponentController(void);
-    
+
     Q_PROPERTY(QQuickItem* statusLog MEMBER _statusLog)
     Q_PROPERTY(QQuickItem* progressBar MEMBER _progressBar)
-    
+
     Q_PROPERTY(QQuickItem* compassButton MEMBER _compassButton)
     Q_PROPERTY(QQuickItem* gyroButton MEMBER _gyroButton)
     Q_PROPERTY(QQuickItem* accelButton MEMBER _accelButton)
@@ -40,39 +40,39 @@ class SensorsComponentController : public FactPanelController
     Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton)
     Q_PROPERTY(QQuickItem* setOrientationsButton MEMBER _setOrientationsButton)
     Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText)
-    
+
     Q_PROPERTY(bool showOrientationCalArea MEMBER _showOrientationCalArea NOTIFY showOrientationCalAreaChanged)
-    
+
     Q_PROPERTY(bool orientationCalDownSideDone MEMBER _orientationCalDownSideDone NOTIFY orientationCalSidesDoneChanged)
     Q_PROPERTY(bool orientationCalUpsideDownSideDone MEMBER _orientationCalUpsideDownSideDone NOTIFY orientationCalSidesDoneChanged)
     Q_PROPERTY(bool orientationCalLeftSideDone MEMBER _orientationCalLeftSideDone NOTIFY orientationCalSidesDoneChanged)
     Q_PROPERTY(bool orientationCalRightSideDone MEMBER _orientationCalRightSideDone NOTIFY orientationCalSidesDoneChanged)
     Q_PROPERTY(bool orientationCalNoseDownSideDone MEMBER _orientationCalNoseDownSideDone NOTIFY orientationCalSidesDoneChanged)
     Q_PROPERTY(bool orientationCalTailDownSideDone MEMBER _orientationCalTailDownSideDone NOTIFY orientationCalSidesDoneChanged)
-    
+
     Q_PROPERTY(bool orientationCalDownSideVisible MEMBER _orientationCalDownSideVisible NOTIFY orientationCalSidesVisibleChanged)
     Q_PROPERTY(bool orientationCalUpsideDownSideVisible MEMBER _orientationCalUpsideDownSideVisible NOTIFY orientationCalSidesVisibleChanged)
     Q_PROPERTY(bool orientationCalLeftSideVisible MEMBER _orientationCalLeftSideVisible NOTIFY orientationCalSidesVisibleChanged)
     Q_PROPERTY(bool orientationCalRightSideVisible MEMBER _orientationCalRightSideVisible NOTIFY orientationCalSidesVisibleChanged)
     Q_PROPERTY(bool orientationCalNoseDownSideVisible MEMBER _orientationCalNoseDownSideVisible NOTIFY orientationCalSidesVisibleChanged)
     Q_PROPERTY(bool orientationCalTailDownSideVisible MEMBER _orientationCalTailDownSideVisible NOTIFY orientationCalSidesVisibleChanged)
-    
+
     Q_PROPERTY(bool orientationCalDownSideInProgress MEMBER _orientationCalDownSideInProgress NOTIFY orientationCalSidesInProgressChanged)
     Q_PROPERTY(bool orientationCalUpsideDownSideInProgress MEMBER _orientationCalUpsideDownSideInProgress NOTIFY orientationCalSidesInProgressChanged)
     Q_PROPERTY(bool orientationCalLeftSideInProgress MEMBER _orientationCalLeftSideInProgress NOTIFY orientationCalSidesInProgressChanged)
     Q_PROPERTY(bool orientationCalRightSideInProgress MEMBER _orientationCalRightSideInProgress NOTIFY orientationCalSidesInProgressChanged)
     Q_PROPERTY(bool orientationCalNoseDownSideInProgress MEMBER _orientationCalNoseDownSideInProgress NOTIFY orientationCalSidesInProgressChanged)
     Q_PROPERTY(bool orientationCalTailDownSideInProgress MEMBER _orientationCalTailDownSideInProgress NOTIFY orientationCalSidesInProgressChanged)
-    
+
     Q_PROPERTY(bool orientationCalDownSideRotate MEMBER _orientationCalDownSideRotate NOTIFY orientationCalSidesRotateChanged)
     Q_PROPERTY(bool orientationCalUpsideDownSideRotate MEMBER _orientationCalUpsideDownSideRotate NOTIFY orientationCalSidesRotateChanged)
     Q_PROPERTY(bool orientationCalLeftSideRotate MEMBER _orientationCalLeftSideRotate NOTIFY orientationCalSidesRotateChanged)
     Q_PROPERTY(bool orientationCalRightSideRotate MEMBER _orientationCalRightSideRotate NOTIFY orientationCalSidesRotateChanged)
     Q_PROPERTY(bool orientationCalNoseDownSideRotate MEMBER _orientationCalNoseDownSideRotate NOTIFY orientationCalSidesRotateChanged)
     Q_PROPERTY(bool orientationCalTailDownSideRotate MEMBER _orientationCalTailDownSideRotate NOTIFY orientationCalSidesRotateChanged)
-    
+
     Q_PROPERTY(bool waitingForCancel MEMBER _waitingForCancel NOTIFY waitingForCancelChanged)
-    
+
     Q_INVOKABLE void calibrateCompass(void);
     Q_INVOKABLE void calibrateGyro(void);
     Q_INVOKABLE void calibrateAccel(void);
@@ -81,7 +81,7 @@ class SensorsComponentController : public FactPanelController
     Q_INVOKABLE void cancelCalibration(void);
     Q_INVOKABLE bool usingUDPLink(void);
     Q_INVOKABLE void resetFactoryParameters();
-    
+
 signals:
     void showGyroCalAreaChanged(void);
     void showOrientationCalAreaChanged(void);
@@ -96,7 +96,7 @@ class SensorsComponentController : public FactPanelController
 private slots:
     void _handleUASTextMessage(int uasId, int compId, int severity, QString text, const QString &description);
     void _handleParametersReset(bool success);
-    
+
 private:
     void _startLogCalibration(void);
     void _startVisualCalibration(void);
@@ -104,14 +104,14 @@ private slots:
     void _refreshParams(void);
     void _hideAllCalAreas(void);
     void _resetInternalState(void);
-    
+
     enum StopCalibrationCode {
         StopCalibrationSuccess,
         StopCalibrationFailed,
         StopCalibrationCancelled
     };
     void _stopCalibration(StopCalibrationCode code);
-    
+
     void _updateAndEmitShowOrientationCalArea(bool show);
 
     QQuickItem* _statusLog;
@@ -124,10 +124,10 @@ private slots:
     QQuickItem* _cancelButton;
     QQuickItem* _setOrientationsButton;
     QQuickItem* _orientationCalAreaHelpText;
-    
+
     bool _showGyroCalArea;
     bool _showOrientationCalArea;
-    
+
     bool _gyroCalInProgress;
     bool _magCalInProgress;
     bool _accelCalInProgress;
@@ -140,30 +140,30 @@ private slots:
     bool _orientationCalRightSideDone;
     bool _orientationCalNoseDownSideDone;
     bool _orientationCalTailDownSideDone;
-    
+
     bool _orientationCalDownSideVisible;
     bool _orientationCalUpsideDownSideVisible;
     bool _orientationCalLeftSideVisible;
     bool _orientationCalRightSideVisible;
     bool _orientationCalNoseDownSideVisible;
     bool _orientationCalTailDownSideVisible;
-    
+
     bool _orientationCalDownSideInProgress;
     bool _orientationCalUpsideDownSideInProgress;
     bool _orientationCalLeftSideInProgress;
     bool _orientationCalRightSideInProgress;
     bool _orientationCalNoseDownSideInProgress;
     bool _orientationCalTailDownSideInProgress;
-    
+
     bool _orientationCalDownSideRotate;
     bool _orientationCalUpsideDownSideRotate;
     bool _orientationCalLeftSideRotate;
     bool _orientationCalRightSideRotate;
     bool _orientationCalNoseDownSideRotate;
     bool _orientationCalTailDownSideRotate;
-    
+
     bool _unknownFirmwareVersion;
     bool _waitingForCancel;
-    
+
     static const int _supportedFirmwareCalVersion = 2;
 };
diff --git a/src/AutoPilotPlugins/PX4/SensorsSetup.qml b/src/AutoPilotPlugins/PX4/SensorsSetup.qml
index 0b5b792ba143..cb6dceb80004 100644
--- a/src/AutoPilotPlugins/PX4/SensorsSetup.qml
+++ b/src/AutoPilotPlugins/PX4/SensorsSetup.qml
@@ -74,7 +74,6 @@ Item {
     property bool showCompass2Rot: cal_mag2_id.value > 0 && cal_mag2_rot.value >= 0
 
     property bool   _sensorsHaveFixedOrientation:       QGroundControl.corePlugin.options.sensorsHaveFixedOrientation
-    property bool   _wifiReliableForCalibration:        QGroundControl.corePlugin.options.wifiReliableForCalibration
     property int    _buttonWidth:                       ScreenTools.defaultFontPixelWidth * 15
     property string _calMagIdParamFormat:               "CAL_MAG#_ID"
     property string _calMagRotParamFormat:              "CAL_MAG#_ROT"
@@ -173,13 +172,6 @@ Item {
         }
     }
 
-    Component.onCompleted: {
-        var usingUDP = controller.usingUDPLink()
-        if (usingUDP && !_wifiReliableForCalibration) {
-            mainWindow.showMessageDialog(qsTr("Sensor Calibration"), qsTr("Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead."))
-        }
-    }
-
     Component {
         id: waitForCancelDialogComponent
 
@@ -403,7 +395,7 @@ Item {
                 id:             airspeedButton
                 width:          _buttonWidth
                 text:           qsTr("Airspeed")
-                visible:        vehicleComponent.airspeedCalSupported && 
+                visible:        vehicleComponent.airspeedCalSupported &&
                                     QGroundControl.corePlugin.options.showSensorCalibrationAirspeed &&
                                     showSensorCalibrationAirspeed
                 indicatorGreen: sens_dpres_off.value !== 0
diff --git a/src/AutoPilotPlugins/VehicleComponent.cc b/src/AutoPilotPlugins/VehicleComponent.cc
index 9af8d8037627..2636b1e11553 100644
--- a/src/AutoPilotPlugins/VehicleComponent.cc
+++ b/src/AutoPilotPlugins/VehicleComponent.cc
@@ -15,7 +15,7 @@
 #include <QtQml/QQmlContext>
 #include <QtQuick/QQuickItem>
 
-QGC_LOGGING_CATEGORY(VehicleComponentLog, "qgc.autopilotplugin.vehiclecomponent");
+QGC_LOGGING_CATEGORY(VehicleComponentLog, "AutoPilotPlugins.VehicleComponent");
 
 VehicleComponent::VehicleComponent(Vehicle *vehicle, AutoPilotPlugin *autopilot, AutoPilotPlugin::KnownVehicleComponent KnownVehicleComponent, QObject *parent)
     : QObject(parent)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 222325c005ba..d3d9507df8ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,16 @@
+# ============================================================================
+# QGroundControl Module Library
+# ============================================================================
+
 qt_add_library(QGroundControlModule STATIC)
 
-set_source_files_properties(UI/MainWindow.qml PROPERTIES QT_RESOURCE_ALIAS MainWindow.qml)
+# ----------------------------------------------------------------------------
+# QML Resources
+# ----------------------------------------------------------------------------
+set_source_files_properties(UI/MainWindow.qml
+    PROPERTIES
+        QT_RESOURCE_ALIAS MainWindow.qml
+)
 
 qt_add_qml_module(QGroundControlModule
     URI QGroundControl
@@ -13,9 +23,13 @@ qt_add_qml_module(QGroundControlModule
     NO_PLUGIN
 )
 
+# ============================================================================
+# Subdirectories
+# ============================================================================
+
+# Core subsystems
 add_subdirectory(ADSB)
 add_subdirectory(AnalyzeView)
-add_subdirectory(Android)
 add_subdirectory(API)
 add_subdirectory(AutoPilotPlugins)
 add_subdirectory(Camera)
@@ -41,18 +55,25 @@ add_subdirectory(Vehicle)
 add_subdirectory(VideoManager)
 add_subdirectory(Viewer3D)
 
+# Platform-specific
+add_subdirectory(Android)
+
+# Qt plugins
 add_subdirectory(QtLocationPlugin)
 
+# ============================================================================
+# Main Application Sources
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         main.cc
-        CmdLineOptParser.cc
-        CmdLineOptParser.h
         pch.h
         QGCApplication.cc
         QGCApplication.h
 )
 
+# Platform-specific sources
 if(NOT ANDROID AND NOT IOS)
     target_sources(${CMAKE_PROJECT_NAME}
         PRIVATE
@@ -61,32 +82,53 @@ if(NOT ANDROID AND NOT IOS)
     )
 endif()
 
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+# ----------------------------------------------------------------------------
+# Include Directories
+# ----------------------------------------------------------------------------
+target_include_directories(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# ============================================================================
+# Link Libraries
+# ============================================================================
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
     PRIVATE
+        # Qt6 Core
         Qt6::Charts
         Qt6::Concurrent
         Qt6::Core
         Qt6::Core5Compat
         Qt6::CorePrivate
         Qt6::Gui
-        Qt6::Location
-        Qt6::LocationPrivate
-        Qt6::Multimedia
-        Qt6::MultimediaQuickPrivate
         Qt6::Network
-        Qt6::Positioning
-        Qt6::PositioningPrivate
-        Qt6::Qml
-        Qt6::QmlIntegration
-        Qt6::Quick
-        Qt6::QuickControls2
         Qt6::Sensors
         Qt6::Svg
         Qt6::TextToSpeech
         Qt6::Widgets
         Qt6::Xml
+        Qt6::StateMachine
+
+        # Qt6 QML/Quick
+        Qt6::Qml
+        Qt6::QmlIntegration
+        Qt6::Quick
+        Qt6::QuickControls2
+
+        # Qt6 Location
+        Qt6::Location
+        Qt6::LocationPrivate
+        Qt6::Positioning
+        Qt6::PositioningPrivate
+        Qt6::Sql
+
+        # Qt6 Multimedia
+        Qt6::Multimedia
+        Qt6::MultimediaQuickPrivate
+
+        # QGC Modules
         AnalyzeViewModule
         AppSettingsModule
         AutoPilotPluginsCommonModule
@@ -101,30 +143,50 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         VehicleSetupModule
 )
 
-if(NOT QGC_DISABLE_APM_PLUGIN AND NOT QGC_DISABLE_APM_PLUGIN_FACTORY)
+# ----------------------------------------------------------------------------
+# Optional/Conditional Modules
+# ----------------------------------------------------------------------------
+if(NOT QGC_DISABLE_APM_PLUGIN)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE AutoPilotPluginsAPMModule)
 endif()
-if(NOT QGC_DISABLE_PX4_PLUGIN AND NOT QGC_DISABLE_PX4_PLUGIN_FACTORY)
+
+if(NOT QGC_DISABLE_PX4_PLUGIN)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE AutoPilotPluginsPX4Module)
 endif()
+
 if(QGC_VIEWER3D)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Viewer3DModule)
 endif()
+
 if(NOT QGC_AIRLINK_DISABLED)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE AirLinkModule)
 endif()
 
+# ============================================================================
+# Compile Definitions
+# ============================================================================
+
+# Application metadata
 target_compile_definitions(${CMAKE_PROJECT_NAME}
     PRIVATE
         QGC_APP_NAME="${QGC_APP_NAME}"
         QGC_ORG_NAME="${QGC_ORG_NAME}"
         QGC_ORG_DOMAIN="${QGC_ORG_DOMAIN}"
         QGC_APP_VERSION_STR="${QGC_APP_VERSION_STR}"
+        QGC_APP_DATE="${QGC_APP_DATE}"
+        QGC_APP_DESCRIPTION="${QGC_APP_DESCRIPTION}"
         QGC_SETTINGS_VERSION=${QGC_SETTINGS_VERSION}
         $<$<NOT:$<BOOL:${QGC_STABLE_BUILD}>>:QGC_DAILY_BUILD>
         $<$<BOOL:${QGC_DISABLE_APM_MAVLINK}>:QGC_NO_ARDUPILOT_DIALECT>
 )
 
+# Build configuration-specific definitions
+target_compile_definitions(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        QT_DISABLE_DEPRECATED_UP_TO=${QGC_QT_DISABLE_DEPRECATED_UP_TO}
+        QT_ENABLE_STRICT_MODE_UP_TO=${QGC_QT_ENABLE_STRICT_MODE_UP_TO}
+)
+
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
     target_compile_definitions(${CMAKE_PROJECT_NAME}
         PRIVATE
@@ -135,24 +197,55 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
 else()
     target_compile_definitions(${CMAKE_PROJECT_NAME}
         PRIVATE
-            QT_DISABLE_DEPRECATED_UP_TO=0x060800
-            QT_ENABLE_STRICT_MODE_UP_TO=0x060800
             $<$<BOOL:${QGC_DEBUG_QML}>:QT_QML_DEBUG>
     )
 endif()
 
+# ============================================================================
+# Code Coverage Configuration
+# ============================================================================
+
+include(Coverage)
+
+# ============================================================================
+# Target Properties
+# ============================================================================
+
 set_target_properties(${CMAKE_PROJECT_NAME}
     PROPERTIES
         QT_RESOURCE_PREFIX "/qml"
         OUTPUT_NAME ${CMAKE_PROJECT_NAME}
 )
 
+# ----------------------------------------------------------------------------
+# Precompiled Headers
+# ----------------------------------------------------------------------------
 target_precompile_headers(${CMAKE_PROJECT_NAME} PRIVATE pch.h)
 
+# ============================================================================
+# Custom Build Configuration
+# ============================================================================
+
 if(QGC_CUSTOM_BUILD)
-    find_package(Qt6 REQUIRED COMPONENTS ${CUSTOM_QT_COMPONENTS})
-    target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_SOURCES})
-    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_LIBRARIES})
-    target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_INCLUDE_DIRECTORIES})
-    target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_DEFINITIONS})
+    if(CUSTOM_QT_COMPONENTS)
+        find_package(Qt6 REQUIRED COMPONENTS ${CUSTOM_QT_COMPONENTS})
+    endif()
+
+    if(CUSTOM_SOURCES)
+        target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_SOURCES})
+    endif()
+
+    if(CUSTOM_LIBRARIES)
+        target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_LIBRARIES})
+    endif()
+
+    if(CUSTOM_INCLUDE_DIRECTORIES)
+        target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_INCLUDE_DIRECTORIES})
+    endif()
+
+    if(CUSTOM_DEFINITIONS)
+        target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE ${CUSTOM_DEFINITIONS})
+    endif()
+
+    message(STATUS "QGC: Custom build configuration applied")
 endif()
diff --git a/src/Camera/CMakeLists.txt b/src/Camera/CMakeLists.txt
index 5b494eafb376..8e973259bf1f 100644
--- a/src/Camera/CMakeLists.txt
+++ b/src/Camera/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Camera Module
+# MAVLink camera control and video stream management
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         CameraMetaData.cc
@@ -18,7 +23,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# Camera Metadata Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} json_mavlink_camera
     PREFIX "/json"
     FILES CameraMetaData.json
diff --git a/src/Camera/CameraMetaData.cc b/src/Camera/CameraMetaData.cc
index 745187d3f925..ccc7e4bb5021 100644
--- a/src/Camera/CameraMetaData.cc
+++ b/src/Camera/CameraMetaData.cc
@@ -8,9 +8,15 @@
  ****************************************************************************/
 
 #include "CameraMetaData.h"
+
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+
+#include "JsonHelper.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(CameraMetaDataLog, "qgc.camera.camerametadata")
+QGC_LOGGING_CATEGORY(CameraMetaDataLog, "Camera.CameraMetaData")
 
 CameraMetaData::CameraMetaData(const QString &canonicalName,
                                const QString &brand,
@@ -44,3 +50,73 @@ CameraMetaData::~CameraMetaData()
 {
     qCDebug(CameraMetaDataLog) << this;
 }
+
+QList<CameraMetaData*> CameraMetaData::parseCameraMetaData()
+{
+    QList<CameraMetaData*> cameraList;
+
+    QString errorString;
+    int version = 0;
+    const QJsonObject jsonObject = JsonHelper::openInternalQGCJsonFile(QStringLiteral(":/json/CameraMetaData.json"), "CameraMetaData", 1, 1, version, errorString);
+    if (!errorString.isEmpty()) {
+        qCWarning(CameraMetaDataLog) << "Internal Error:" << errorString;
+        return cameraList;
+    }
+
+    static const QList<JsonHelper::KeyValidateInfo> rootKeyInfoList = {
+        { "cameraMetaData", QJsonValue::Array, true }
+    };
+    if (!JsonHelper::validateKeys(jsonObject, rootKeyInfoList, errorString)) {
+        qCWarning(CameraMetaDataLog) << errorString;
+        return cameraList;
+    }
+
+    static const QList<JsonHelper::KeyValidateInfo> cameraKeyInfoList = {
+        { "canonicalName", QJsonValue::String, true },
+        { "brand", QJsonValue::String, true },
+        { "model", QJsonValue::String, true },
+        { "sensorWidth", QJsonValue::Double, true },
+        { "sensorHeight", QJsonValue::Double, true },
+        { "imageWidth", QJsonValue::Double, true },
+        { "imageHeight", QJsonValue::Double, true },
+        { "focalLength", QJsonValue::Double, true },
+        { "landscape", QJsonValue::Bool, true },
+        { "fixedOrientation", QJsonValue::Bool, true },
+        { "minTriggerInterval", QJsonValue::Double, true },
+        { "deprecatedTranslatedName", QJsonValue::String, true },
+    };
+    const QJsonArray cameraInfo = jsonObject["cameraMetaData"].toArray();
+    for (const QJsonValue &jsonValue : cameraInfo) {
+        if (!jsonValue.isObject()) {
+            qCWarning(CameraMetaDataLog) << "Entry in CameraMetaData array is not object";
+            return cameraList;
+        }
+
+        const QJsonObject obj = jsonValue.toObject();
+        if (!JsonHelper::validateKeys(obj, cameraKeyInfoList, errorString)) {
+            qCWarning(CameraMetaDataLog) << errorString;
+            return cameraList;
+        }
+
+        const QString canonicalName = obj["canonicalName"].toString();
+        const QString brand = obj["brand"].toString();
+        const QString model = obj["model"].toString();
+        const double sensorWidth = obj["sensorWidth"].toDouble();
+        const double sensorHeight = obj["sensorHeight"].toDouble();
+        const double imageWidth = obj["imageWidth"].toDouble();
+        const double imageHeight = obj["imageHeight"].toDouble();
+        const double focalLength = obj["focalLength"].toDouble();
+        const bool landscape = obj["landscape"].toBool();
+        const bool fixedOrientation = obj["fixedOrientation"].toBool();
+        const double minTriggerInterval = obj["minTriggerInterval"].toDouble();
+        const QString deprecatedTranslatedName = obj["deprecatedTranslatedName"].toString();
+
+        CameraMetaData *metaData = new CameraMetaData(
+            canonicalName, brand, model, sensorWidth, sensorHeight,
+            imageWidth, imageHeight, focalLength, landscape,
+            fixedOrientation, minTriggerInterval, deprecatedTranslatedName);
+        cameraList.append(metaData);
+    }
+
+    return cameraList;
+}
diff --git a/src/Camera/CameraMetaData.h b/src/Camera/CameraMetaData.h
index f9729856c9a2..5fb99fcc9c3a 100644
--- a/src/Camera/CameraMetaData.h
+++ b/src/Camera/CameraMetaData.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <QtCore/QLoggingCategory>
+#include <QtQmlIntegration/QtQmlIntegration>
 
 Q_DECLARE_LOGGING_CATEGORY(CameraMetaDataLog)
 
@@ -45,6 +46,8 @@ class CameraMetaData
                    const QString &deprecatedTranslatedName);
     ~CameraMetaData();
 
+    static QList<CameraMetaData*> parseCameraMetaData();
+
     const QString canonicalName;        ///< Canonical name saved in plan files. Not translated.
     const QString brand;                ///< Camera brand. Used for grouping.
     const QString model;                ///< Camerar model
@@ -63,4 +66,4 @@ class CameraMetaData
     /// Newly added CameraMetaData entries should leave this value empty.
     const QString deprecatedTranslatedName;
 };
-Q_DECLARE_METATYPE(CameraMetaData)
+Q_DECLARE_METATYPE(CameraMetaData*)
diff --git a/src/Camera/MavlinkCameraControl.cc b/src/Camera/MavlinkCameraControl.cc
index 6871bae01d9c..e4dd89a82d1e 100644
--- a/src/Camera/MavlinkCameraControl.cc
+++ b/src/Camera/MavlinkCameraControl.cc
@@ -10,8 +10,8 @@
 #include "MavlinkCameraControl.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(CameraControlLog, "qgc.camera.mavlinkcameracontrol")
-QGC_LOGGING_CATEGORY(CameraControlVerboseLog, "qgc.camera.mavlinkcameracontrol")
+QGC_LOGGING_CATEGORY(CameraControlLog, "Camera.MavlinkCameraControl")
+QGC_LOGGING_CATEGORY(CameraControlVerboseLog, "Camera.MavlinkCameraControl:verbose")
 
 MavlinkCameraControl::MavlinkCameraControl(Vehicle *vehicle, QObject *parent)
     : FactGroup(0, parent, true /* ignore camel case */)
diff --git a/src/Camera/QGCCameraIO.cc b/src/Camera/QGCCameraIO.cc
index 7858688caa34..653eb0aaadc2 100644
--- a/src/Camera/QGCCameraIO.cc
+++ b/src/Camera/QGCCameraIO.cc
@@ -14,8 +14,8 @@
 #include "QGCLoggingCategory.h"
 #include "Vehicle.h"
 
-QGC_LOGGING_CATEGORY(QGCCameraParamIOLog, "qgc.camera.qgccameraparamio")
-QGC_LOGGING_CATEGORY(QGCCameraParamIOVerbose, "qgc.camera.qgccameraparamio:verbose")
+QGC_LOGGING_CATEGORY(QGCCameraParamIOLog, "Camera.QGCCameraParamIO")
+QGC_LOGGING_CATEGORY(QGCCameraParamIOVerbose, "Camera.QGCCameraParamIO:verbose")
 
 namespace {
     constexpr int kMaxRetries = 3;
diff --git a/src/Camera/QGCCameraManager.cc b/src/Camera/QGCCameraManager.cc
index 16a625681386..0c570230dc45 100644
--- a/src/Camera/QGCCameraManager.cc
+++ b/src/Camera/QGCCameraManager.cc
@@ -8,78 +8,84 @@
  ****************************************************************************/
 
 #include "QGCCameraManager.h"
+#include "CameraMetaData.h"
+#include "FirmwarePlugin.h"
+#include "Joystick.h"
 #include "JoystickManager.h"
-#include "SimulatedCameraControl.h"
+#include "MavlinkCameraControl.h"
 #include "MultiVehicleManager.h"
-#include "Vehicle.h"
-#include "FirmwarePlugin.h"
 #include "QGCLoggingCategory.h"
-#include "Joystick.h"
-#include "CameraMetaData.h"
-#include "JsonHelper.h"
 #include "QGCVideoStreamInfo.h"
+#include "SimulatedCameraControl.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
+QGC_LOGGING_CATEGORY(CameraManagerLog, "Camera.QGCCameraManager")
 
-QGC_LOGGING_CATEGORY(CameraManagerLog, "qgc.camera.qgccameramanager")
+namespace {
+    constexpr int kHeartbeatTickMs = 500;
+    constexpr int kSilentTimeoutMs = 5000;
+    constexpr int kMaxRetryCount = 10;
+}
 
 QVariantList QGCCameraManager::_cameraList;
 
-//-----------------------------------------------------------------------------
-QGCCameraManager::CameraStruct::CameraStruct(QObject* parent, uint8_t compID_, Vehicle* vehicle_)
-    : QObject   (parent)
-    , compID    (compID_)
-    , vehicle   (vehicle_)
+/*===========================================================================*/
+
+QGCCameraManager::CameraStruct::CameraStruct(QGCCameraManager *manager_, uint8_t compID_, Vehicle *vehicle_)
+    : manager(manager_)
+    , compID(compID_)
+    , vehicle(vehicle_)
 {
-    backoffTimer = new QTimer(this);
-    backoffTimer->setSingleShot(true);
+    qCDebug(CameraManagerLog) << this;
+    backoffTimer.setSingleShot(true);
 }
 
-//-----------------------------------------------------------------------------
-QGCCameraManager::QGCCameraManager(Vehicle *vehicle)
-    : _vehicle                  (vehicle)
-    , _simulatedCameraControl   (new SimulatedCameraControl(vehicle, this))
+QGCCameraManager::CameraStruct::~CameraStruct()
 {
-    qCDebug(CameraManagerLog) << "QGCCameraManager Created";
+    qCDebug(CameraManagerLog) << this;
+}
 
-    (void) qRegisterMetaType<CameraMetaData>("CameraMetaData");
+/*===========================================================================*/
 
-    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
+QGCCameraManager::QGCCameraManager(Vehicle *vehicle)
+    : QObject(vehicle)
+    , _vehicle(vehicle)
+    , _simulatedCameraControl(new SimulatedCameraControl(vehicle, this))
+{
+    qCDebug(CameraManagerLog) << this;
+
+    (void) qRegisterMetaType<CameraMetaData*>("CameraMetaData*");
 
     _addCameraControlToLists(_simulatedCameraControl);
 
-    connect(MultiVehicleManager::instance(), &MultiVehicleManager::parameterReadyVehicleAvailableChanged, this, &QGCCameraManager::_vehicleReady);
-    connect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &QGCCameraManager::_mavlinkMessageReceived);
-    connect(&_camerasLostHeartbeatTimer, &QTimer::timeout, this, &QGCCameraManager::_checkForLostCameras);
+    (void) connect(MultiVehicleManager::instance(), &MultiVehicleManager::parameterReadyVehicleAvailableChanged, this, &QGCCameraManager::_vehicleReady);
+    (void) connect(_vehicle, &Vehicle::mavlinkMessageReceived, this, &QGCCameraManager::_mavlinkMessageReceived);
+    (void) connect(&_camerasLostHeartbeatTimer, &QTimer::timeout, this, &QGCCameraManager::_checkForLostCameras);
 
     _camerasLostHeartbeatTimer.setSingleShot(false);
     _lastZoomChange.start();
     _lastCameraChange.start();
-    _camerasLostHeartbeatTimer.start(500);
+    _camerasLostHeartbeatTimer.start(kHeartbeatTickMs);
 }
 
 QGCCameraManager::~QGCCameraManager()
 {
     // Stop all camera info request timers and clean up
     for (auto* cameraInfo : _cameraInfoRequest) {
-        if (cameraInfo->backoffTimer) {
-            cameraInfo->backoffTimer->stop();
-            QObject::disconnect(cameraInfo->backoffTimer, nullptr, nullptr, nullptr);
-        }
-        delete cameraInfo;
+        cameraInfo->backoffTimer.stop();
+        QObject::disconnect(&cameraInfo->backoffTimer, nullptr, nullptr, nullptr);
     }
+    qDeleteAll(_cameraInfoRequest);
     _cameraInfoRequest.clear();
 
     // Stop the main heartbeat timer
     _camerasLostHeartbeatTimer.stop();
+
+    qCDebug(CameraManagerLog) << this;
 }
 
 void QGCCameraManager::setCurrentCamera(int sel)
 {
-    if(sel != _currentCameraIndex && sel >= 0 && sel < _cameras.count()) {
+    if ((sel != _currentCameraIndex) && (sel >= 0) && (sel < _cameras.count())) {
         _currentCameraIndex = sel;
         emit currentCameraChanged();
         emit streamChanged();
@@ -88,414 +94,391 @@ void QGCCameraManager::setCurrentCamera(int sel)
 
 void QGCCameraManager::_vehicleReady(bool ready)
 {
-    qCDebug(CameraManagerLog) << "_vehicleReady(" << ready << ")";
-    if(ready) {
-        if(MultiVehicleManager::instance()->activeVehicle() == _vehicle) {
-            _vehicleReadyState = true;
-            _activeJoystickChanged(JoystickManager::instance()->activeJoystick());
-            connect(JoystickManager::instance(), &JoystickManager::activeJoystickChanged, this, &QGCCameraManager::_activeJoystickChanged);
-        }
+    qCDebug(CameraManagerLog) << ready;
+    if (!ready) {
+        return;
+    }
+    if (MultiVehicleManager::instance()->activeVehicle() != _vehicle) {
+        return;
     }
+
+    _vehicleReadyState = true;
+    _activeJoystickChanged(JoystickManager::instance()->activeJoystick());
+    (void) connect(JoystickManager::instance(), &JoystickManager::activeJoystickChanged, this, &QGCCameraManager::_activeJoystickChanged, Qt::UniqueConnection);
 }
 
-void QGCCameraManager::_mavlinkMessageReceived(const mavlink_message_t& message)
+void QGCCameraManager::_mavlinkMessageReceived(const mavlink_message_t &message)
 {
-    //-- Only pay attention to the camera components, as identified by their compId,
-    //   as well as the autopilot, as it might have a non-MAVLink camera connected.
-    if(message.sysid == _vehicle->id() && (message.compid == MAV_COMP_ID_AUTOPILOT1 ||
-        (message.compid >= MAV_COMP_ID_CAMERA && message.compid <= MAV_COMP_ID_CAMERA6))) {
+    // Only pay attention to camera components (MAV_COMP_ID_CAMERA..CAMERA6)
+    // and the autopilot (it might proxy a non-MAVLink camera).
+    const bool fromAutopilot = message.compid == MAV_COMP_ID_AUTOPILOT1;
+    const bool fromCamera = (message.compid >= MAV_COMP_ID_CAMERA) && (message.compid <= MAV_COMP_ID_CAMERA6);
+    if ((message.sysid == _vehicle->id()) && (fromAutopilot || fromCamera)) {
         switch (message.msgid) {
-            case MAVLINK_MSG_ID_CAMERA_CAPTURE_STATUS:
-                _handleCaptureStatus(message);
-                break;
-            case MAVLINK_MSG_ID_STORAGE_INFORMATION:
-                _handleStorageInfo(message);
-                break;
-            case MAVLINK_MSG_ID_HEARTBEAT:
-                _handleHeartbeat(message);
-                break;
-            case MAVLINK_MSG_ID_CAMERA_INFORMATION:
-                _handleCameraInfo(message);
-                break;
-            case MAVLINK_MSG_ID_CAMERA_SETTINGS:
-                _handleCameraSettings(message);
-                break;
-            case MAVLINK_MSG_ID_PARAM_EXT_ACK:
-                _handleParamAck(message);
-                break;
-            case MAVLINK_MSG_ID_PARAM_EXT_VALUE:
-                _handleParamValue(message);
-                break;
-            case MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION:
-                _handleVideoStreamInfo(message);
-                break;
-            case MAVLINK_MSG_ID_VIDEO_STREAM_STATUS:
-                _handleVideoStreamStatus(message);
-                break;
-            case MAVLINK_MSG_ID_BATTERY_STATUS:
-                _handleBatteryStatus(message);
-                break;
-            case MAVLINK_MSG_ID_CAMERA_TRACKING_IMAGE_STATUS:
-                _handleTrackingImageStatus(message);
-                break;
+        case MAVLINK_MSG_ID_CAMERA_CAPTURE_STATUS:
+            _handleCaptureStatus(message);
+            break;
+        case MAVLINK_MSG_ID_STORAGE_INFORMATION:
+            _handleStorageInfo(message);
+            break;
+        case MAVLINK_MSG_ID_HEARTBEAT:
+            _handleHeartbeat(message);
+            break;
+        case MAVLINK_MSG_ID_CAMERA_INFORMATION:
+            _handleCameraInfo(message);
+            break;
+        case MAVLINK_MSG_ID_CAMERA_SETTINGS:
+            _handleCameraSettings(message);
+            break;
+        case MAVLINK_MSG_ID_PARAM_EXT_ACK:
+            _handleParamAck(message);
+            break;
+        case MAVLINK_MSG_ID_PARAM_EXT_VALUE:
+            _handleParamValue(message);
+            break;
+        case MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION:
+            _handleVideoStreamInfo(message);
+            break;
+        case MAVLINK_MSG_ID_VIDEO_STREAM_STATUS:
+            _handleVideoStreamStatus(message);
+            break;
+        case MAVLINK_MSG_ID_BATTERY_STATUS:
+            _handleBatteryStatus(message);
+            break;
+        case MAVLINK_MSG_ID_CAMERA_TRACKING_IMAGE_STATUS:
+            _handleTrackingImageStatus(message);
+            break;
+        default:
+            break;
         }
     }
 }
 
 void QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
 {
-    QString sCompID = QString::number(message.compid);
+    const QString sCompID = QString::number(message.compid);
 
     if (!_cameraInfoRequest.contains(sCompID)) {
-        // This is the first time we are heading from this camera
-        qCDebug(CameraManagerLog) << "Hearbeat from " << message.compid;
-        CameraStruct* pInfo = new CameraStruct(this, message.compid, _vehicle);
+        qCDebug(CameraManagerLog) << "Heartbeat from" << QGCMAVLink::compIdToString(message.compid);
+        CameraStruct *pInfo = new CameraStruct(this, message.compid, _vehicle);
         pInfo->lastHeartbeat.start();
         _cameraInfoRequest[sCompID] = pInfo;
         _requestCameraInfo(pInfo);
-    } else {
-        if (_cameraInfoRequest[sCompID]) {
-            CameraStruct* pInfo = _cameraInfoRequest[sCompID];
-            //-- Check if we have indeed received the camera info
-            if (pInfo->infoReceived) {
-                //-- We have it. Just update the heartbeat timeout
-                pInfo->lastHeartbeat.start();
-            } else {
-                //-- Camera info not received yet. Check if camera was silent and is now back
-                if (pInfo->lastHeartbeat.elapsed() > 5000) {
-                    qCDebug(CameraManagerLog) << "Camera" << message.compid << "reappeared after being silent. Resetting retry count and requesting info.";
-                    pInfo->retryCount = 0;  // Reset retry count for fresh attempts
-                    pInfo->backoffTimer->stop();  // Stop any pending backoff timer
-                    pInfo->lastHeartbeat.start();
-                    _requestCameraInfo(pInfo);
-                } else {
-                    //-- Just update heartbeat
-                    pInfo->lastHeartbeat.start();
-                }
-            }
-        } else {
-            qWarning() << Q_FUNC_INFO << "_cameraInfoRequest[" << sCompID << "] is null";
-        }
+        return;
+    }
+
+    CameraStruct *pInfo = _cameraInfoRequest[sCompID];
+    if (!pInfo) {
+        qCWarning(CameraManagerLog) << sCompID << "is null";
+        return;
     }
+
+    if (pInfo->infoReceived) {
+        pInfo->lastHeartbeat.start();
+        return;
+    }
+
+    if (pInfo->lastHeartbeat.elapsed() > kSilentTimeoutMs) {
+        qCDebug(CameraManagerLog) << "Camera" << QGCMAVLink::compIdToString(message.compid) << "reappeared after being silent. Resetting retry count and requesting info.";
+        pInfo->retryCount = 0;
+        pInfo->backoffTimer.stop();
+        pInfo->lastHeartbeat.start();
+        _requestCameraInfo(pInfo);
+        return;
+    }
+
+    pInfo->lastHeartbeat.start();
 }
 
-MavlinkCameraControl* QGCCameraManager::currentCameraInstance()
+MavlinkCameraControl *QGCCameraManager::currentCameraInstance()
 {
-    if(_currentCameraIndex < _cameras.count() && _cameras.count()) {
-        auto pCamera = qobject_cast<MavlinkCameraControl*>(_cameras[_currentCameraIndex]);
+    if ((_currentCameraIndex < _cameras.count()) && !_cameras.isEmpty()) {
+        MavlinkCameraControl *pCamera = qobject_cast<MavlinkCameraControl*>(_cameras[_currentCameraIndex]);
         return pCamera;
     }
     return nullptr;
 }
 
-QGCVideoStreamInfo* QGCCameraManager::currentStreamInstance()
+QGCVideoStreamInfo *QGCCameraManager::currentStreamInstance()
 {
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
-        QGCVideoStreamInfo* pInfo = pCamera->currentStreamInstance();
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
+        QGCVideoStreamInfo *pInfo = pCamera->currentStreamInstance();
         return pInfo;
     }
     return nullptr;
 }
 
-QGCVideoStreamInfo* QGCCameraManager::thermalStreamInstance()
+QGCVideoStreamInfo *QGCCameraManager::thermalStreamInstance()
 {
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
-        QGCVideoStreamInfo* pInfo = pCamera->thermalStreamInstance();
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
+        QGCVideoStreamInfo *pInfo = pCamera->thermalStreamInstance();
         return pInfo;
     }
     return nullptr;
 }
 
-MavlinkCameraControl* QGCCameraManager::_findCamera(int id)
+MavlinkCameraControl *QGCCameraManager::_findCamera(int id)
 {
-    for(int i = 0; i < _cameras.count(); i++) {
-        if(_cameras[i]) {
-            auto pCamera = qobject_cast<MavlinkCameraControl*>(_cameras[i]);
-            if(pCamera) {
-                if(pCamera->compID() == id) {
-                    return pCamera;
-                }
-            } else {
-                qCritical() << "Null MavlinkCameraControl instance";
-            }
+    for (int i = 0; i < _cameras.count(); i++) {
+        if (!_cameras[i]) {
+            continue;
+        }
+        MavlinkCameraControl *pCamera = qobject_cast<MavlinkCameraControl*>(_cameras[i]);
+        if (!pCamera) {
+            qCCritical(CameraManagerLog) << "Invalid MavlinkCameraControl instance";
+            continue;
+        }
+        if (pCamera->compID() == id) {
+            return pCamera;
         }
     }
-    //qWarning() << "Camera component id not found:" << id;
+
+    // qCWarning(CameraManagerLog) << "Camera component id not found:" << id;
     return nullptr;
 }
 
-void QGCCameraManager::_addCameraControlToLists(MavlinkCameraControl* cameraControl)
+void QGCCameraManager::_addCameraControlToLists(MavlinkCameraControl *cameraControl)
 {
-    QQmlEngine::setObjectOwnership(cameraControl, QQmlEngine::CppOwnership);
+    if (qobject_cast<SimulatedCameraControl*>(cameraControl)) {
+        qCDebug(CameraManagerLog) << "Adding simulated camera to list";
+    } else {
+        qCDebug(CameraManagerLog) << "Adding real camera to list - simulated camera will be removed if present";
+    }
+
     _cameras.append(cameraControl);
     _cameraLabels.append(cameraControl->modelName());
     emit camerasChanged();
     emit cameraLabelsChanged();
 
-    // If the simulated camera is already in the list, remove it since we have a real camera now
-    if (_cameras.count() == 2 && _cameras[0] == _simulatedCameraControl) {
-        _cameras.removeAt(0);
-        _cameraLabels.removeAt(0);
+    // If simulated camera is in list, remove it when a real camera appears
+    if ((_cameras.count() == 2) && (_cameras[0] == _simulatedCameraControl)) {
+        (void) _cameras.removeAt(0);
+        (void) _cameraLabels.removeAt(0);
         emit camerasChanged();
         emit cameraLabelsChanged();
         emit currentCameraChanged();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleCameraInfo(const mavlink_message_t& message)
+void QGCCameraManager::_handleCameraInfo(const mavlink_message_t& message)
 {
-    qCDebug(CameraManagerLog) << "_handleCameraInfo";
-    //-- Have we requested it?
-    QString sCompID = QString::number(message.compid);
-    if(_cameraInfoRequest.contains(sCompID) && !_cameraInfoRequest[sCompID]->infoReceived) {
-        //-- Flag it as done
+    const QString sCompID = QString::number(message.compid);
+    if (!_cameraInfoRequest.contains(sCompID)) {
+        qCDebug(CameraManagerLog) << "Ignoring - Camera info not requested for component" << QGCMAVLink::compIdToString(message.compid);
+        return;
+    }
+    if (_cameraInfoRequest[sCompID]->infoReceived) {
+        qCDebug(CameraManagerLog) << "Ignoring - Already received camera info for component" << QGCMAVLink::compIdToString(message.compid);
+        return;
+    }
+
+    mavlink_camera_information_t info{};
+    mavlink_msg_camera_information_decode(&message, &info);
+    qCDebug(CameraManagerLog) << "Camera information received from" << QGCMAVLink::compIdToString(message.compid)
+                          << "Model:" << reinterpret_cast<const char*>(info.model_name);
+    qCDebug(CameraManagerLog) << "Creating MavlinkCameraControl for camera";
+
+    MavlinkCameraControl *pCamera = _vehicle->firmwarePlugin()->createCameraControl(&info, _vehicle, message.compid, this);
+    if (pCamera) {
+        _addCameraControlToLists(pCamera);
+
         _cameraInfoRequest[sCompID]->infoReceived = true;
-        _cameraInfoRequest[sCompID]->retryCount = 0;  // Reset retry counter on success
-        _cameraInfoRequest[sCompID]->backoffTimer->stop();  // Stop any pending backoff timer
-        qCDebug(CameraManagerLog) << "_handleCameraInfo: Success for compId" << message.compid << "- reset retry counter";
-        mavlink_camera_information_t info;
-        mavlink_msg_camera_information_decode(&message, &info);
-        qCDebug(CameraManagerLog) << "_handleCameraInfo:" << reinterpret_cast<const char*>(info.model_name) << reinterpret_cast<const char*>(info.vendor_name) << "Comp ID:" << message.compid;
-        auto pCamera = _vehicle->firmwarePlugin()->createCameraControl(&info, _vehicle, message.compid, this);
-        if(pCamera) {
-            _addCameraControlToLists(pCamera);
-        }
+        _cameraInfoRequest[sCompID]->retryCount = 0;
+        _cameraInfoRequest[sCompID]->backoffTimer.stop();
+        qCDebug(CameraManagerLog) << "Success for compId" << QGCMAVLink::compIdToString(message.compid) << "- reset retry counter";
     }
 }
 
-/// Called to check for cameras which are no longer sending a heartbeat
 void QGCCameraManager::_checkForLostCameras()
 {
-    //-- Iterate cameras
-    for (auto it = _cameraInfoRequest.constBegin(); it != _cameraInfoRequest.constEnd(); ++it) {
-        const QString &sCompID = it.key();
-        if (_cameraInfoRequest[sCompID]) {
-            CameraStruct* pInfo = _cameraInfoRequest[sCompID];
-            //-- Have we received a camera info message?
-            if (pInfo->infoReceived) {
-                //-- Has the camera stopped talking to us?
-                if (pInfo->lastHeartbeat.elapsed() > 5000) {
-                    auto pCamera = _findCamera(pInfo->compID);
-
-                    if (pCamera) {
-                        // Before removing the current camera from the list add the simulated camera back into the list if thera are no other cameras.
-                        // This way we smaoothly transition from a real camera to the simulated camera.
-                        if (_cameras.count() == 1) {
-                            qCDebug(CameraManagerLog) << "Adding simulated camera back to list.";
-                            _addCameraControlToLists(_simulatedCameraControl);
-                        }
-
-                        qWarning() << "Camera" << pCamera->modelName() << "stopped transmitting. Removing from list.";
-                        _cameraLabels.removeOne(pCamera->modelName());
-                        _cameras.removeOne(pCamera);
-                        emit cameraLabelsChanged();
-                        emit camerasChanged();
-
-                        pCamera->deleteLater();
-                        delete pInfo;
-
-                        // There will always be at least one camera in the list, so we don't need to check if the list is empty.
-                        // We specifically don't use setCurrentCamera since that checks for a index change. But in this case we may be using the same index.
-                        _currentCameraIndex = 0;
-                        emit currentCameraChanged();
-                        emit streamChanged();
-                    }
-
-                    _cameraInfoRequest.remove(sCompID);
-
-                    //-- Exit loop.
-                    return;
-                }
+    QList<QString> stale;
+    for (auto it = _cameraInfoRequest.cbegin(), end = _cameraInfoRequest.cend(); it != end; ++it) {
+        const auto *info = it.value();
+        if (info && info->infoReceived && (info->lastHeartbeat.elapsed() > kSilentTimeoutMs)) {
+            stale.push_back(it.key());
+        }
+    }
+    if (stale.isEmpty()) {
+        return;
+    }
+
+    bool removedAny = false;
+    for (const QString& key : std::as_const(stale)) {
+        CameraStruct* pInfo = _cameraInfoRequest.take(key);
+        if (!pInfo) {
+            continue;
+        }
+
+        MavlinkCameraControl* pCamera = _findCamera(pInfo->compID);
+        if (pCamera) {
+            const int idx = _cameras.indexOf(pCamera);
+            if (idx >= 0) {
+                qCDebug(CameraManagerLog) << "Removing lost camera" << QGCMAVLink::compIdToString(pInfo->compID);
+                removedAny = true;
+                (void) _cameraLabels.removeAt(idx);
+                (void) _cameras.removeAt(idx);
+                pCamera->deleteLater();
             }
         }
+
+        delete pInfo;
     }
+
+    if (!removedAny) {
+        return;
+    }
+
+    if (_cameras.isEmpty()) {
+        _addCameraControlToLists(_simulatedCameraControl);
+    }
+
+    emit cameraLabelsChanged();
+    emit camerasChanged();
+
+    if (_currentCameraIndex != 0) {
+        _currentCameraIndex = 0;
+        emit currentCameraChanged();
+    }
+    emit streamChanged();
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleCaptureStatus(const mavlink_message_t &message)
+void QGCCameraManager::_handleCaptureStatus(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_camera_capture_status_t cap;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_camera_capture_status_t cap{};
         mavlink_msg_camera_capture_status_decode(&message, &cap);
         pCamera->handleCaptureStatus(cap);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleStorageInfo(const mavlink_message_t& message)
+void QGCCameraManager::_handleStorageInfo(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_storage_information_t st;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_storage_information_t st{};
         mavlink_msg_storage_information_decode(&message, &st);
         pCamera->handleStorageInfo(st);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleCameraSettings(const mavlink_message_t& message)
+void QGCCameraManager::_handleCameraSettings(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_camera_settings_t settings;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_camera_settings_t settings{};
         mavlink_msg_camera_settings_decode(&message, &settings);
         pCamera->handleSettings(settings);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleParamAck(const mavlink_message_t& message)
+void QGCCameraManager::_handleParamAck(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_param_ext_ack_t ack;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_param_ext_ack_t ack{};
         mavlink_msg_param_ext_ack_decode(&message, &ack);
         pCamera->handleParamAck(ack);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleParamValue(const mavlink_message_t& message)
+void QGCCameraManager::_handleParamValue(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_param_ext_value_t value;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_param_ext_value_t value{};
         mavlink_msg_param_ext_value_decode(&message, &value);
         pCamera->handleParamValue(value);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleVideoStreamInfo(const mavlink_message_t& message)
+void QGCCameraManager::_handleVideoStreamInfo(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_video_stream_information_t streamInfo;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_video_stream_information_t streamInfo{};
         mavlink_msg_video_stream_information_decode(&message, &streamInfo);
         pCamera->handleVideoInfo(&streamInfo);
         emit streamChanged();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleVideoStreamStatus(const mavlink_message_t& message)
+void QGCCameraManager::_handleVideoStreamStatus(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_video_stream_status_t streamStatus;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_video_stream_status_t streamStatus{};
         mavlink_msg_video_stream_status_decode(&message, &streamStatus);
         pCamera->handleVideoStatus(&streamStatus);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleBatteryStatus(const mavlink_message_t& message)
+void QGCCameraManager::_handleBatteryStatus(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_battery_status_t batteryStatus;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_battery_status_t batteryStatus{};
         mavlink_msg_battery_status_decode(&message, &batteryStatus);
         pCamera->handleBatteryStatus(batteryStatus);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_handleTrackingImageStatus(const mavlink_message_t& message)
+void QGCCameraManager::_handleTrackingImageStatus(const mavlink_message_t &message)
 {
-    auto pCamera = _findCamera(message.compid);
-    if(pCamera) {
-        mavlink_camera_tracking_image_status_t tis;
+    MavlinkCameraControl *pCamera = _findCamera(message.compid);
+    if (pCamera) {
+        mavlink_camera_tracking_image_status_t tis{};
         mavlink_msg_camera_tracking_image_status_decode(&message, &tis);
         pCamera->handleTrackingImageStatus(&tis);
     }
 }
 
-// Forward declarations for mutually recursive handler functions
-static void _requestCameraInfoCommandResultHandler(void* resultHandlerData, int compId, const mavlink_command_ack_t& ack, Vehicle::MavCmdResultFailureCode_t failureCode);
-static void _requestCameraInfoMessageResultHandler(void* resultHandlerData, MAV_RESULT result, Vehicle::RequestMessageResultHandlerFailureCode_t failureCode, const mavlink_message_t& message);
-static void _requestCameraInfoHelper(QGCCameraManager* manager, QGCCameraManager::CameraStruct* pInfo);
-
+static void _handleCameraInfoRetry(QGCCameraManager::CameraStruct *cameraInfo);
 
-static void _handleCameraInfoRetry(QGCCameraManager::CameraStruct* cameraInfo)
+static void _requestCameraInfoCommandResultHandler(void *resultHandlerData, int /*compId*/, const mavlink_command_ack_t &ack, Vehicle::MavCmdResultFailureCode_t failureCode)
 {
-    cameraInfo->retryCount++;
-    auto manager = static_cast<QGCCameraManager*>(cameraInfo->parent());
-
-    // For even attempts >= 2, use exponential backoff
-    if (cameraInfo->retryCount >= 2 && cameraInfo->retryCount % 2 == 0) {
-        // Calculate delay: 2^(retryCount/2) seconds
-        int delaySeconds = 1 << (cameraInfo->retryCount / 2);
-        int delayMs = delaySeconds * 1000;
-
-        qCDebug(CameraManagerLog) << "Waiting" << delaySeconds << "seconds before retry for compId" << cameraInfo->compID;
-
-        // Stop any existing timer and set up new one
-        cameraInfo->backoffTimer->stop();
-        QObject::disconnect(cameraInfo->backoffTimer, nullptr, nullptr, nullptr);
-        QObject::connect(cameraInfo->backoffTimer, &QTimer::timeout, manager, [=]() {
-            _requestCameraInfoHelper(manager, cameraInfo);
-        });
-
-        cameraInfo->backoffTimer->start(delayMs);
-    } else {
-        // Make immediate retry
-        _requestCameraInfoHelper(manager, cameraInfo);
-    }
-}
-
-static void _requestCameraInfoCommandResultHandler(void* resultHandlerData, int compId, const mavlink_command_ack_t& ack, Vehicle::MavCmdResultFailureCode_t failureCode)
-{
-    auto  cameraInfo = static_cast<QGCCameraManager::CameraStruct*>(resultHandlerData);
+    auto *cameraInfo = static_cast<QGCCameraManager::CameraStruct*>(resultHandlerData);
 
     if (ack.result != MAV_RESULT_ACCEPTED) {
-        qCDebug(CameraManagerLog) << "MAV_CMD_REQUEST_CAMERA_INFORMATION failed. compId" << cameraInfo->compID << "Result:" << ack.result << "FailureCode:" << failureCode << "retryCount:" << cameraInfo->retryCount;
-
+        qCDebug(CameraManagerLog) << "MAV_CMD_REQUEST_CAMERA_INFORMATION failed. compId" << QGCMAVLink::compIdToString(cameraInfo->compID)
+                                    << "Result:" << QGCMAVLink::mavResultToString(ack.result)
+                                    << "FailureCode:" << Vehicle::mavCmdResultFailureCodeToString(failureCode)
+                                    << "retryCount:" << cameraInfo->retryCount;
         _handleCameraInfoRetry(cameraInfo);
     }
 }
 
-static void _requestCameraInfoMessageResultHandler(void* resultHandlerData, MAV_RESULT result, Vehicle::RequestMessageResultHandlerFailureCode_t failureCode, [[maybe_unused]] const mavlink_message_t& message)
+static void _requestCameraInfoMessageResultHandler(void *resultHandlerData, MAV_RESULT result, Vehicle::RequestMessageResultHandlerFailureCode_t failureCode, [[maybe_unused]] const mavlink_message_t &message)
 {
-    auto cameraInfo = static_cast<QGCCameraManager::CameraStruct*>(resultHandlerData);
+    auto *cameraInfo = static_cast<QGCCameraManager::CameraStruct*>(resultHandlerData);
 
     if (result != MAV_RESULT_ACCEPTED) {
-        qCDebug(CameraManagerLog) << "MAV_CMD_REQUEST_MESSAGE:MAVLINK_MSG_ID_CAMERA_INFORMATION failed. compId" << cameraInfo->compID << "Result:" << result << "FailureCode:" << failureCode << "retryCount:" << cameraInfo->retryCount;
-
+        qCDebug(CameraManagerLog) << "MAV_CMD_REQUEST_MESSAGE:MAVLINK_MSG_ID_CAMERA_INFORMATION failed. compId" << QGCMAVLink::compIdToString(cameraInfo->compID)
+                                    << "Result:" << QGCMAVLink::mavResultToString(result)
+                                    << "FailureCode:" << Vehicle::requestMessageResultHandlerFailureCodeToString(failureCode)
+                                    << "retryCount:" << cameraInfo->retryCount;
         _handleCameraInfoRetry(cameraInfo);
     }
 }
 
-//-----------------------------------------------------------------------------
-static void _requestCameraInfoHelper(QGCCameraManager* manager, QGCCameraManager::CameraStruct* pInfo)
+static void _requestCameraInfoHelper(QGCCameraManager *manager, QGCCameraManager::CameraStruct *pInfo)
 {
-    // Give up after 10 attempts
-    if (pInfo->retryCount >= 10) {
-        qCWarning(CameraManagerLog) << "Giving up requesting camera info after" << pInfo->retryCount << "attempts for compId" << pInfo->compID;
+    // Give up after max attempts
+    if (pInfo->retryCount >= kMaxRetryCount) {
+        qCDebug(CameraManagerLog) << "Giving up requesting camera info after" << pInfo->retryCount << "attempts for compId" << QGCMAVLink::compIdToString(pInfo->compID);
         return;
     }
 
-    // Make immediate request - alternate between REQUEST_MESSAGE and REQUEST_CAMERA_INFORMATION
-    if (pInfo->retryCount % 2 == 0) {
-        qCDebug(CameraManagerLog) << "Using MAV_CMD_REQUEST_MESSAGE for compId" << pInfo->compID;
+    // Alternate between REQUEST_MESSAGE and REQUEST_CAMERA_INFORMATION
+    if ((pInfo->retryCount % 2) == 0) {
+        qCDebug(CameraManagerLog) << "Using MAV_CMD_REQUEST_MESSAGE:CAMERA_INFORMATION for compId" << QGCMAVLink::compIdToString(pInfo->compID);
         manager->vehicle()->requestMessage(_requestCameraInfoMessageResultHandler, pInfo, pInfo->compID, MAVLINK_MSG_ID_CAMERA_INFORMATION);
     } else {
-        qCDebug(CameraManagerLog) << "Using MAV_CMD_REQUEST_CAMERA_INFORMATION for compId" << pInfo->compID;
+        qCDebug(CameraManagerLog) << "Using MAV_CMD_REQUEST_CAMERA_INFORMATION for compId" << QGCMAVLink::compIdToString(pInfo->compID);
 
-        Vehicle::MavCmdAckHandlerInfo_t ackHandlerInfo;
+        Vehicle::MavCmdAckHandlerInfo_t ackHandlerInfo{};
         ackHandlerInfo.resultHandler        = _requestCameraInfoCommandResultHandler;
         ackHandlerInfo.resultHandlerData    = pInfo;
         ackHandlerInfo.progressHandler      = nullptr;
@@ -505,230 +488,195 @@ static void _requestCameraInfoHelper(QGCCameraManager* manager, QGCCameraManager
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_requestCameraInfo(CameraStruct* pInfo)
+static void _handleCameraInfoRetry(QGCCameraManager::CameraStruct *cameraInfo)
+{
+    if (!cameraInfo) {
+        return;
+    }
+
+    QGCCameraManager *manager = cameraInfo->manager;
+    if (!manager) {
+        qCDebug(CameraManagerLog) << "manager is unavailable for compId" << QGCMAVLink::compIdToString(cameraInfo->compID);
+        return;
+    }
+
+    cameraInfo->retryCount++;
+
+    // For even attempts >= 2, use exponential backoff
+    if ((cameraInfo->retryCount >= 2) && ((cameraInfo->retryCount % 2) == 0)) {
+        const int delaySeconds = 1 << (cameraInfo->retryCount / 2);
+        const int delayMs = delaySeconds * 1000;
+
+        qCDebug(CameraManagerLog) << "Waiting" << delaySeconds << "seconds before retry for compId" << QGCMAVLink::compIdToString(cameraInfo->compID);
+
+        cameraInfo->backoffTimer.stop();
+        (void) QObject::disconnect(&cameraInfo->backoffTimer, nullptr, nullptr, nullptr);
+
+        // Capture compID by value and look up the struct
+        const uint8_t compId = cameraInfo->compID;
+        QPointer<QGCCameraManager> mgrGuard(manager);
+
+        (void) QObject::connect(&cameraInfo->backoffTimer, &QTimer::timeout,
+                                &cameraInfo->backoffTimer,  // context ensures timer is still alive
+                                [mgrGuard, compId]() {
+            if (!mgrGuard) {
+                return;
+            }
+
+            auto* info = mgrGuard->findCameraStruct(compId);
+            if (info) {
+                _requestCameraInfoHelper(mgrGuard.data(), info);
+            }
+        });
+
+        cameraInfo->backoffTimer.start(delayMs);
+    } else {
+        _requestCameraInfoHelper(manager, cameraInfo);
+    }
+}
+
+void QGCCameraManager::_requestCameraInfo(CameraStruct *pInfo)
 {
+    if (!pInfo) {
+        return;
+    }
     _requestCameraInfoHelper(this, pInfo);
 }
 
-//----------------------------------------------------------------------------------------
-void
-QGCCameraManager::_activeJoystickChanged(Joystick* joystick)
+void QGCCameraManager::_activeJoystickChanged(Joystick *joystick)
 {
     qCDebug(CameraManagerLog) << "Joystick changed";
-    if(_activeJoystick) {
-        disconnect(_activeJoystick, &Joystick::stepZoom,            this, &QGCCameraManager::_stepZoom);
-        disconnect(_activeJoystick, &Joystick::startContinuousZoom, this, &QGCCameraManager::_startZoom);
-        disconnect(_activeJoystick, &Joystick::stopContinuousZoom,  this, &QGCCameraManager::_stopZoom);
-        disconnect(_activeJoystick, &Joystick::stepCamera,          this, &QGCCameraManager::_stepCamera);
-        disconnect(_activeJoystick, &Joystick::stepStream,          this, &QGCCameraManager::_stepStream);
-        disconnect(_activeJoystick, &Joystick::triggerCamera,       this, &QGCCameraManager::_triggerCamera);
-        disconnect(_activeJoystick, &Joystick::startVideoRecord,    this, &QGCCameraManager::_startVideoRecording);
-        disconnect(_activeJoystick, &Joystick::stopVideoRecord,     this, &QGCCameraManager::_stopVideoRecording);
-        disconnect(_activeJoystick, &Joystick::toggleVideoRecord,   this, &QGCCameraManager::_toggleVideoRecording);
+    if (_activeJoystick) {
+        (void) disconnect(_activeJoystick, &Joystick::stepZoom,            this, &QGCCameraManager::_stepZoom);
+        (void) disconnect(_activeJoystick, &Joystick::startContinuousZoom, this, &QGCCameraManager::_startZoom);
+        (void) disconnect(_activeJoystick, &Joystick::stopContinuousZoom,  this, &QGCCameraManager::_stopZoom);
+        (void) disconnect(_activeJoystick, &Joystick::stepCamera,          this, &QGCCameraManager::_stepCamera);
+        (void) disconnect(_activeJoystick, &Joystick::stepStream,          this, &QGCCameraManager::_stepStream);
+        (void) disconnect(_activeJoystick, &Joystick::triggerCamera,       this, &QGCCameraManager::_triggerCamera);
+        (void) disconnect(_activeJoystick, &Joystick::startVideoRecord,    this, &QGCCameraManager::_startVideoRecording);
+        (void) disconnect(_activeJoystick, &Joystick::stopVideoRecord,     this, &QGCCameraManager::_stopVideoRecording);
+        (void) disconnect(_activeJoystick, &Joystick::toggleVideoRecord,   this, &QGCCameraManager::_toggleVideoRecording);
     }
+
     _activeJoystick = joystick;
-    if(_activeJoystick) {
-        connect(_activeJoystick, &Joystick::stepZoom,               this, &QGCCameraManager::_stepZoom);
-        connect(_activeJoystick, &Joystick::startContinuousZoom,    this, &QGCCameraManager::_startZoom);
-        connect(_activeJoystick, &Joystick::stopContinuousZoom,     this, &QGCCameraManager::_stopZoom);
-        connect(_activeJoystick, &Joystick::stepCamera,             this, &QGCCameraManager::_stepCamera);
-        connect(_activeJoystick, &Joystick::stepStream,             this, &QGCCameraManager::_stepStream);
-        connect(_activeJoystick, &Joystick::triggerCamera,          this, &QGCCameraManager::_triggerCamera);
-        connect(_activeJoystick, &Joystick::startVideoRecord,       this, &QGCCameraManager::_startVideoRecording);
-        connect(_activeJoystick, &Joystick::stopVideoRecord,        this, &QGCCameraManager::_stopVideoRecording);
-        connect(_activeJoystick, &Joystick::toggleVideoRecord,      this, &QGCCameraManager::_toggleVideoRecording);
+
+    if (_activeJoystick) {
+        (void) connect(_activeJoystick, &Joystick::stepZoom,            this, &QGCCameraManager::_stepZoom, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::startContinuousZoom, this, &QGCCameraManager::_startZoom, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::stopContinuousZoom,  this, &QGCCameraManager::_stopZoom, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::stepCamera,          this, &QGCCameraManager::_stepCamera, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::stepStream,          this, &QGCCameraManager::_stepStream, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::triggerCamera,       this, &QGCCameraManager::_triggerCamera, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::startVideoRecord,    this, &QGCCameraManager::_startVideoRecording, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::stopVideoRecord,     this, &QGCCameraManager::_stopVideoRecording, Qt::UniqueConnection);
+        (void) connect(_activeJoystick, &Joystick::toggleVideoRecord,   this, &QGCCameraManager::_toggleVideoRecording, Qt::UniqueConnection);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_triggerCamera()
+void QGCCameraManager::_triggerCamera()
 {
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
         pCamera->takePhoto();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_startVideoRecording()
+void QGCCameraManager::_startVideoRecording()
 {
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
         pCamera->startVideoRecording();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_stopVideoRecording()
+void QGCCameraManager::_stopVideoRecording()
 {
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
         pCamera->stopVideoRecording();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_toggleVideoRecording()
+void QGCCameraManager::_toggleVideoRecording()
 {
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
         pCamera->toggleVideoRecording();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_stepZoom(int direction)
+void QGCCameraManager::_stepZoom(int direction)
 {
-    if(_lastZoomChange.elapsed() > 40) {
+    if (_lastZoomChange.elapsed() > 40) {
         _lastZoomChange.start();
         qCDebug(CameraManagerLog) << "Step Camera Zoom" << direction;
-        auto pCamera = currentCameraInstance();
-        if(pCamera) {
+        MavlinkCameraControl *pCamera = currentCameraInstance();
+        if (pCamera) {
             pCamera->stepZoom(direction);
         }
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_startZoom(int direction)
+void QGCCameraManager::_startZoom(int direction)
 {
     qCDebug(CameraManagerLog) << "Start Camera Zoom" << direction;
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
         pCamera->startZoom(direction);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_stopZoom()
+void QGCCameraManager::_stopZoom()
 {
     qCDebug(CameraManagerLog) << "Stop Camera Zoom";
-    auto pCamera = currentCameraInstance();
-    if(pCamera) {
+    MavlinkCameraControl *pCamera = currentCameraInstance();
+    if (pCamera) {
         pCamera->stopZoom();
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_stepCamera(int direction)
+void QGCCameraManager::_stepCamera(int direction)
 {
-    if(_lastCameraChange.elapsed() > 1000) {
+    if (_lastCameraChange.elapsed() > 1000) {
         _lastCameraChange.start();
         qCDebug(CameraManagerLog) << "Step Camera" << direction;
-        int c = _currentCameraIndex + direction;
-        if(c < 0) c = _cameras.count() - 1;
-        if(c >= _cameras.count()) c = 0;
-        setCurrentCamera(c);
+        int camera = _currentCameraIndex + direction;
+        if (camera < 0) {
+            camera = _cameras.count() - 1;
+        } else if (camera >= _cameras.count()) {
+            camera = 0;
+        }
+        setCurrentCamera(camera);
     }
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCCameraManager::_stepStream(int direction)
+void QGCCameraManager::_stepStream(int direction)
 {
-    if(_lastCameraChange.elapsed() > 1000) {
+    if (_lastCameraChange.elapsed() > 1000) {
         _lastCameraChange.start();
-        auto pCamera = currentCameraInstance();
-        if(pCamera) {
+        MavlinkCameraControl *pCamera = currentCameraInstance();
+        if (pCamera) {
             qCDebug(CameraManagerLog) << "Step Camera Stream" << direction;
-            int c = pCamera->currentStream() + direction;
-            if(c < 0) c = pCamera->streams()->count() - 1;
-            if(c >= pCamera->streams()->count()) c = 0;
-            pCamera->setCurrentStream(c);
+            int stream = pCamera->currentStream() + direction;
+            if (stream < 0) {
+                stream = pCamera->streams()->count() - 1;
+            } else if (stream >= pCamera->streams()->count()) {
+                stream = 0;
+            }
+            pCamera->setCurrentStream(stream);
         }
     }
 }
 
-const QVariantList &QGCCameraManager::cameraList()
+const QVariantList &QGCCameraManager::cameraList() const
 {
     if (_cameraList.isEmpty()) {
-        const QList<CameraMetaData*> cams = _parseCameraMetaData(QStringLiteral(":/json/CameraMetaData.json"));
+        const QList<CameraMetaData*> cams = CameraMetaData::parseCameraMetaData();
         _cameraList.reserve(cams.size());
 
-        for (CameraMetaData* cam : cams) {
+        for (CameraMetaData *cam : cams) {
             _cameraList << QVariant::fromValue(cam);
         }
     }
-
     return _cameraList;
 }
-
-QList<CameraMetaData*> QGCCameraManager::_parseCameraMetaData(const QString &jsonFilePath)
-{
-    QList<CameraMetaData*> cameraList;
-
-    QString errorString;
-    int version;
-    const QJsonObject jsonObject = JsonHelper::openInternalQGCJsonFile(jsonFilePath, "CameraMetaData", 1, 1, version, errorString);
-    if (!errorString.isEmpty()) {
-        qCWarning(CameraManagerLog) << "Internal Error:" << errorString;
-        return cameraList;
-    }
-
-    static const QList<JsonHelper::KeyValidateInfo> rootKeyInfoList = {
-        { "cameraMetaData", QJsonValue::Array, true }
-    };
-    if (!JsonHelper::validateKeys(jsonObject, rootKeyInfoList, errorString)) {
-        qCWarning(CameraManagerLog) << errorString;
-        return cameraList;
-    }
-
-    static const QList<JsonHelper::KeyValidateInfo> cameraKeyInfoList = {
-        { "canonicalName", QJsonValue::String, true },
-        { "brand", QJsonValue::String, true },
-        { "model", QJsonValue::String, true },
-        { "sensorWidth", QJsonValue::Double, true },
-        { "sensorHeight", QJsonValue::Double, true },
-        { "imageWidth", QJsonValue::Double, true },
-        { "imageHeight", QJsonValue::Double, true },
-        { "focalLength", QJsonValue::Double, true },
-        { "landscape", QJsonValue::Bool, true },
-        { "fixedOrientation", QJsonValue::Bool, true },
-        { "minTriggerInterval", QJsonValue::Double, true },
-        { "deprecatedTranslatedName", QJsonValue::String, true },
-    };
-    const QJsonArray cameraInfo = jsonObject["cameraMetaData"].toArray();
-    for (const QJsonValue &jsonValue : cameraInfo) {
-        if (!jsonValue.isObject()) {
-            qCWarning(CameraManagerLog) << "Entry in CameraMetaData array is not object";
-            return cameraList;
-        }
-
-        const QJsonObject obj = jsonValue.toObject();
-        if (!JsonHelper::validateKeys(obj, cameraKeyInfoList, errorString)) {
-            qCWarning(CameraManagerLog) << errorString;
-            return cameraList;
-        }
-
-        const QString canonicalName = obj["canonicalName"].toString();
-        const QString brand = obj["brand"].toString();
-        const QString model = obj["model"].toString();
-        const double sensorWidth = obj["sensorWidth"].toDouble();
-        const double sensorHeight = obj["sensorHeight"].toDouble();
-        const double imageWidth = obj["imageWidth"].toDouble();
-        const double imageHeight = obj["imageHeight"].toDouble();
-        const double focalLength = obj["focalLength"].toDouble();
-        const bool landscape = obj["landscape"].toBool();
-        const bool fixedOrientation = obj["fixedOrientation"].toBool();
-        const double minTriggerInterval = obj["minTriggerInterval"].toDouble();
-        const QString deprecatedTranslatedName = obj["deprecatedTranslatedName"].toString();
-
-        CameraMetaData *const metaData = new CameraMetaData(
-            canonicalName, brand, model, sensorWidth, sensorHeight,
-            imageWidth, imageHeight, focalLength, landscape,
-            fixedOrientation, minTriggerInterval, deprecatedTranslatedName);
-        cameraList.append(metaData);
-    }
-
-    return cameraList;
-}
diff --git a/src/Camera/QGCCameraManager.h b/src/Camera/QGCCameraManager.h
index 74c658cbc567..4aa7aa1f23b1 100644
--- a/src/Camera/QGCCameraManager.h
+++ b/src/Camera/QGCCameraManager.h
@@ -9,27 +9,28 @@
 
 #pragma once
 
-#include "QmlObjectListModel.h"
-#include "MavlinkCameraControl.h"
-
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QMap>
 #include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <QtCore/QTimer>
 #include <QtCore/QVariantList>
 #include <QtQmlIntegration/QtQmlIntegration>
 
+#include "MAVLinkLib.h"
+#include "QmlObjectListModel.h"
+#include "Vehicle.h"
+
 Q_DECLARE_LOGGING_CATEGORY(CameraManagerLog)
 
-class Joystick;
-class SimulatedCameraControl;
-class QGCVideoStreamInfo;
-class Vehicle;
 class CameraMetaData;
+class Joystick;
+class MavlinkCameraControl;
 class QGCCameraManagerTest;
+class QGCVideoStreamInfo;
+class SimulatedCameraControl;
 
-//-----------------------------------------------------------------------------
 /// Camera Manager
 class QGCCameraManager : public QObject
 {
@@ -37,92 +38,98 @@ class QGCCameraManager : public QObject
     QML_ELEMENT
     QML_UNCREATABLE("")
     Q_MOC_INCLUDE("Joystick.h")
+    Q_MOC_INCLUDE("MavlinkCameraControl.h")
+
+    Q_PROPERTY(QmlObjectListModel* cameras READ cameras NOTIFY camerasChanged)
+    Q_PROPERTY(QStringList cameraLabels READ cameraLabels NOTIFY cameraLabelsChanged)
+    Q_PROPERTY(MavlinkCameraControl* currentCameraInstance READ currentCameraInstance NOTIFY currentCameraChanged)
+    Q_PROPERTY(int currentCamera READ currentCamera WRITE setCurrentCamera NOTIFY currentCameraChanged)
+
     friend class QGCCameraManagerTest;
+
 public:
-    QGCCameraManager(Vehicle* vehicle);
-    virtual ~QGCCameraManager();
-
-    Q_PROPERTY(QmlObjectListModel*      cameras                 READ cameras                                        NOTIFY camerasChanged)
-    Q_PROPERTY(QStringList              cameraLabels            READ cameraLabels                                   NOTIFY cameraLabelsChanged)
-    Q_PROPERTY(MavlinkCameraControl*    currentCameraInstance   READ currentCameraInstance                          NOTIFY currentCameraChanged)
-    Q_PROPERTY(int                      currentCamera           READ currentCamera      WRITE  setCurrentCamera     NOTIFY currentCameraChanged)
-
-    virtual QmlObjectListModel*     cameras             ()          { return &_cameras; }       ///< List of cameras provided by current vehicle
-    virtual QStringList             cameraLabels        ()          { return _cameraLabels; }   ///< Camera names to show the user (for selection)
-    virtual int                     currentCamera       ()          { return _currentCameraIndex; }  ///< Current selected camera
-    virtual MavlinkCameraControl*   currentCameraInstance();
-    virtual void                    setCurrentCamera    (int sel);
-    virtual QGCVideoStreamInfo*     currentStreamInstance();
-    virtual QGCVideoStreamInfo*     thermalStreamInstance();
-
-    /// Returns a list of CameraMetaData objects for available cameras on the vehicle.
-    virtual const QVariantList &cameraList();
-
-    // Helper method for static functions to access vehicle
-    Vehicle* vehicle() const { return _vehicle; }
+    explicit QGCCameraManager(Vehicle* vehicle);
+    ~QGCCameraManager();
 
-    // This is public to avoid some circular include problems caused by statics
-    class CameraStruct : public QObject {
-    public:
-        CameraStruct(QObject* parent, uint8_t compID_, Vehicle* vehicle);
+    struct CameraStruct {
+        CameraStruct(QGCCameraManager* manager_, uint8_t compID_, Vehicle* vehicle_);
+        ~CameraStruct();
+
+        bool infoReceived = false;
+        uint8_t compID = 0;
+        int retryCount = 0;
         QElapsedTimer lastHeartbeat;
-        bool        infoReceived    = false;
-        uint8_t     compID          = 0;
-        Vehicle*    vehicle         = nullptr;
-        int         retryCount      = 0;
-        QTimer*     backoffTimer    = nullptr;
+        QTimer backoffTimer;
+        QPointer<Vehicle> vehicle;
+        QPointer<QGCCameraManager> manager;
+
+    private:
+        Q_DISABLE_COPY_MOVE(CameraStruct)
     };
 
+    QmlObjectListModel* cameras() { return &_cameras; }
+    const QmlObjectListModel* cameras() const { return &_cameras; }
+    QStringList cameraLabels() const { return _cameraLabels; }
+    int currentCamera() const { return _currentCameraIndex; }
+    MavlinkCameraControl* currentCameraInstance();
+    void setCurrentCamera(int sel);
+    QGCVideoStreamInfo* currentStreamInstance();
+    QGCVideoStreamInfo* thermalStreamInstance();
+
+    const QVariantList& cameraList() const;
+
+    Vehicle* vehicle() const { return _vehicle; }
+
+    CameraStruct* findCameraStruct(uint8_t compId) const { return _cameraInfoRequest.value(QString::number(compId), nullptr); }
+
 signals:
-    void    camerasChanged          ();
-    void    cameraLabelsChanged     ();
-    void    currentCameraChanged    ();
-    void    streamChanged           ();
+    void camerasChanged();
+    void cameraLabelsChanged();
+    void currentCameraChanged();
+    void streamChanged();
 
 protected slots:
-    virtual void    _vehicleReady           (bool ready);
-    virtual void    _mavlinkMessageReceived (const mavlink_message_t& message);
-    virtual void    _activeJoystickChanged  (Joystick* joystick);
-    virtual void    _stepZoom               (int direction);
-    virtual void    _startZoom              (int direction);
-    virtual void    _stopZoom               ();
-    virtual void    _stepCamera             (int direction);
-    virtual void    _stepStream             (int direction);
-    virtual void    _checkForLostCameras    ();
-    virtual void    _triggerCamera          ();
-    virtual void    _startVideoRecording    ();
-    virtual void    _stopVideoRecording     ();
-    virtual void    _toggleVideoRecording   ();
-
-protected:
-    virtual MavlinkCameraControl* _findCamera(int id);
-    virtual void    _requestCameraInfo      (CameraStruct* cameraInfo);
-    virtual void    _handleHeartbeat        (const mavlink_message_t& message);
-    virtual void    _handleCameraInfo       (const mavlink_message_t& message);
-    virtual void    _handleStorageInfo      (const mavlink_message_t& message);
-    virtual void    _handleCameraSettings   (const mavlink_message_t& message);
-    virtual void    _handleParamAck         (const mavlink_message_t& message);
-    virtual void    _handleParamValue       (const mavlink_message_t& message);
-    virtual void    _handleCaptureStatus    (const mavlink_message_t& message);
-    virtual void    _handleVideoStreamInfo  (const mavlink_message_t& message);
-    virtual void    _handleVideoStreamStatus(const mavlink_message_t& message);
-    virtual void    _handleBatteryStatus    (const mavlink_message_t& message);
-    virtual void    _handleTrackingImageStatus(const mavlink_message_t& message);
-    virtual void    _addCameraControlToLists(MavlinkCameraControl* cameraControl);
-
-    static QList<CameraMetaData*> _parseCameraMetaData(const QString &jsonFilePath);
-
-    Vehicle*            _vehicle            = nullptr;
-    Joystick*           _activeJoystick     = nullptr;
-    bool                _vehicleReadyState  = false;
-    int                 _currentTask        = 0;
-    QmlObjectListModel  _cameras;
-    QStringList         _cameraLabels;
-    int                 _currentCameraIndex = 0;
-    QElapsedTimer       _lastZoomChange;
-    QElapsedTimer       _lastCameraChange;
-    QTimer              _camerasLostHeartbeatTimer;
+    void _vehicleReady(bool ready);
+    void _mavlinkMessageReceived(const mavlink_message_t& message);
+    void _activeJoystickChanged(Joystick* joystick);
+    void _stepZoom(int direction);
+    void _startZoom(int direction);
+    void _stopZoom();
+    void _stepCamera(int direction);
+    void _stepStream(int direction);
+    void _checkForLostCameras();
+    void _triggerCamera();
+    void _startVideoRecording();
+    void _stopVideoRecording();
+    void _toggleVideoRecording();
+
+private:
+    MavlinkCameraControl* _findCamera(int id);
+    void _requestCameraInfo(CameraStruct* cameraInfo);
+    void _handleHeartbeat(const mavlink_message_t& message);
+    void _handleCameraInfo(const mavlink_message_t& message);
+    void _handleStorageInfo(const mavlink_message_t& message);
+    void _handleCameraSettings(const mavlink_message_t& message);
+    void _handleParamAck(const mavlink_message_t& message);
+    void _handleParamValue(const mavlink_message_t& message);
+    void _handleCaptureStatus(const mavlink_message_t& message);
+    void _handleVideoStreamInfo(const mavlink_message_t& message);
+    void _handleVideoStreamStatus(const mavlink_message_t& message);
+    void _handleBatteryStatus(const mavlink_message_t& message);
+    void _handleTrackingImageStatus(const mavlink_message_t& message);
+    void _addCameraControlToLists(MavlinkCameraControl* cameraControl);
+
+    QPointer<Vehicle> _vehicle;
+    QPointer<SimulatedCameraControl> _simulatedCameraControl;
+    QPointer<Joystick> _activeJoystick;
+    bool _vehicleReadyState = false;
+    int _currentTask = 0;
+    QmlObjectListModel _cameras;
+    QStringList _cameraLabels;
+    int _currentCameraIndex = 0;
+    QElapsedTimer _lastZoomChange;
+    QElapsedTimer _lastCameraChange;
+    QTimer _camerasLostHeartbeatTimer;
     QMap<QString, CameraStruct*> _cameraInfoRequest;
-    SimulatedCameraControl* _simulatedCameraControl = nullptr;
-    static QVariantList _cameraList; ///< Standard QGC camera list
+    static QVariantList _cameraList;
 };
diff --git a/src/Camera/QGCVideoStreamInfo.cc b/src/Camera/QGCVideoStreamInfo.cc
index ae30ac24e6fa..1cd2ce892d2f 100644
--- a/src/Camera/QGCVideoStreamInfo.cc
+++ b/src/Camera/QGCVideoStreamInfo.cc
@@ -10,7 +10,7 @@
 #include "QGCVideoStreamInfo.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(QGCVideoStreamInfoLog, "qgc.camera.qgcvideostreaminfo")
+QGC_LOGGING_CATEGORY(QGCVideoStreamInfoLog, "Camera.QGCVideoStreamInfo")
 
 QGCVideoStreamInfo::QGCVideoStreamInfo(const mavlink_video_stream_information_t &info, QObject *parent)
     : QObject(parent)
diff --git a/src/Camera/SimulatedCameraControl.cc b/src/Camera/SimulatedCameraControl.cc
index cbb3e0072991..8e6a6c39cdae 100644
--- a/src/Camera/SimulatedCameraControl.cc
+++ b/src/Camera/SimulatedCameraControl.cc
@@ -15,17 +15,19 @@
 #include "Vehicle.h"
 #include "VideoManager.h"
 
-QGC_LOGGING_CATEGORY(SimulatedCameraControlLog, "qgc.camera.simulatedcameracontrol")
+QGC_LOGGING_CATEGORY(SimulatedCameraControlLog, "Camera.SimulatedCameraControl")
 
 SimulatedCameraControl::SimulatedCameraControl(Vehicle *vehicle, QObject *parent)
     : MavlinkCameraControl(vehicle, parent)
 {
     qCDebug(SimulatedCameraControlLog) << this;
 
-    (void) connect(VideoManager::instance(), &VideoManager::recordingChanged, this, [this](bool recording) {
+    auto videoManager = VideoManager::instance();
+    (void) connect(videoManager, &VideoManager::recordingChanged, this, [this](bool recording) {
         _videoCaptureStatus = recording ? VIDEO_CAPTURE_STATUS_RUNNING : VIDEO_CAPTURE_STATUS_STOPPED;
         emit videoCaptureStatusChanged();
     });
+    connect(videoManager, &VideoManager::hasVideoChanged, this, &SimulatedCameraControl::infoChanged);
 
     (void) connect(SettingsManager::instance()->flyViewSettings()->showSimpleCameraControl(), &Fact::rawValueChanged, this, &SimulatedCameraControl::infoChanged);
 
diff --git a/src/Camera/VehicleCameraControl.cc b/src/Camera/VehicleCameraControl.cc
index 02a5851e5e47..4360aa8a672c 100644
--- a/src/Camera/VehicleCameraControl.cc
+++ b/src/Camera/VehicleCameraControl.cc
@@ -28,6 +28,7 @@
 #include "LinkInterface.h"
 #include "MAVLinkProtocol.h"
 #include "QGCVideoStreamInfo.h"
+#include "MissionCommandTree.h"
 
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtCore/QDir>
@@ -636,14 +637,14 @@ VehicleCameraControl::_requestCaptureStatus()
     qCDebug(CameraControlLog) << "_requestCaptureStatus() - retries:" << _cameraCaptureStatusRetries;
 
     if(_cameraCaptureStatusRetries++ % 2 == 0) {
-        qCDebug(CameraControlLog) << "_requestCaptureStatus() - using REQUEST_MESSAGE";
+        qCDebug(CameraControlLog) << "  Sending REQUEST_MESSAGE:MAVLINK_MSG_ID_CAMERA_CAPTURE_STATUS";
         _vehicle->sendMavCommand(
             _compID,                                // target component
             MAV_CMD_REQUEST_MESSAGE,                // command id
             false,                                  // showError
             MAVLINK_MSG_ID_CAMERA_CAPTURE_STATUS);  // msgid
     } else {
-        qCDebug(CameraControlLog) << "_requestCaptureStatus() - using legacy MAV_CMD_REQUEST_CAMERA_CAPTURE_STATUS";
+        qCDebug(CameraControlLog) << "  Sending MAV_CMD_REQUEST_CAMERA_CAPTURE_STATUS (legacy)";
         _vehicle->sendMavCommand(
             _compID,                                // target component
             MAV_CMD_REQUEST_CAMERA_CAPTURE_STATUS,  // command id
@@ -739,7 +740,7 @@ VehicleCameraControl::_mavCommandResult(int vehicleId, int component, int comman
                     break;
             }
         } else {
-            qCDebug(CameraControlLog) << "Bad response for" << command << result;
+            qCDebug(CameraControlLog) << "Bad response for" << MissionCommandTree::instance()->rawName(static_cast<MAV_CMD>(command)) << QGCMAVLink::mavResultToString(result);
         }
     }
 }
@@ -1429,14 +1430,14 @@ VehicleCameraControl::_requestCameraSettings()
         // first time and every other time after that.
 
         if(_cameraSettingsRetries % 2 == 0) {
-            qCDebug(CameraControlLog) << "_requestCameraSettings() - using REQUEST_MESSAGE";
+            qCDebug(CameraControlLog) << "  Sending REQUEST_MESSAGE:MAVLINK_MSG_ID_CAMERA_SETTINGS";
             _vehicle->sendMavCommand(
                 _compID,                                 // target component
                 MAV_CMD_REQUEST_MESSAGE,                // command id
                 false,                                  // showError
                 MAVLINK_MSG_ID_CAMERA_SETTINGS);        // msgid
         } else {
-            qCDebug(CameraControlLog) << "_requestCameraSettings() - using legacy MAV_CMD_REQUEST_CAMERA_SETTINGS";
+            qCDebug(CameraControlLog) << "  Sending MAV_CMD_REQUEST_CAMERA_SETTINGS (legacy)";
             _vehicle->sendMavCommand(
                 _compID,                                // Target component
                 MAV_CMD_REQUEST_CAMERA_SETTINGS,        // command id
@@ -1462,7 +1463,7 @@ VehicleCameraControl::_requestStorageInfo()
         // Use REQUEST_MESSAGE instead of deprecated REQUEST_STORAGE_INFORMATION
         // first time and every other time after that.
         if(_storageInfoRetries % 2 == 0) {
-            qCDebug(CameraControlLog) << "_requestStorageInfo() - using REQUEST_MESSAGE";
+            qCDebug(CameraControlLog) << "  Sending REQUEST_MESSAGE:MAVLINK_MSG_ID_STORAGE_INFORMATION";
             _vehicle->sendMavCommand(
                 _compID,                                 // target component
                 MAV_CMD_REQUEST_MESSAGE,                // command id
@@ -1470,7 +1471,7 @@ VehicleCameraControl::_requestStorageInfo()
                 MAVLINK_MSG_ID_STORAGE_INFORMATION,     // msgid
                 0);                                     // storage ID
         } else {
-            qCDebug(CameraControlLog) << "_requestStorageInfo() - using legacy MAV_CMD_REQUEST_STORAGE_INFORMATION";
+            qCDebug(CameraControlLog) << "  Sending MAV_CMD_REQUEST_STORAGE_INFORMATION (legacy)";
             _vehicle->sendMavCommand(
                 _compID,                                // Target component
                 MAV_CMD_REQUEST_STORAGE_INFORMATION,    // command id
@@ -1487,7 +1488,7 @@ VehicleCameraControl::_requestStorageInfo()
 void
 VehicleCameraControl::handleSettings(const mavlink_camera_settings_t& settings)
 {
-    qCDebug(CameraControlLog) << "handleSettings() Mode:" << settings.mode_id << "- stopping timer, resetting retries";
+    qCDebug(CameraControlLog) << "Received CAMERA_SETTINGS Mode:" << settings.mode_id << "- stopping timer, resetting retries";
     _cameraSettingsTimer.stop();
     _cameraSettingsRetries = 0;
     _setCameraMode(static_cast<CameraMode>(settings.mode_id));
@@ -1507,7 +1508,7 @@ VehicleCameraControl::handleSettings(const mavlink_camera_settings_t& settings)
 void
 VehicleCameraControl::handleStorageInfo(const mavlink_storage_information_t& st)
 {
-    qCDebug(CameraControlLog) << "handleStorageInfo() - stopping timer, resetting retries";
+    qCDebug(CameraControlLog) << "Received STORAGE_INFORMATION - stopping timer, resetting retries";
     _storageInfoTimer.stop();
     _storageInfoRetries = 0;
     qCDebug(CameraControlLog) << "handleStorageInfo:"
@@ -1540,7 +1541,7 @@ VehicleCameraControl::handleStorageInfo(const mavlink_storage_information_t& st)
 void
 VehicleCameraControl::handleBatteryStatus(const mavlink_battery_status_t& bs)
 {
-    qCDebug(CameraControlLog) << "handleBatteryStatus:" << bs.battery_remaining;
+    qCDebug(CameraControlLog) << "Received BATTERY_STATUS:" << bs.battery_remaining;
     if(bs.battery_remaining >= 0 && _batteryRemaining != static_cast<int>(bs.battery_remaining)) {
         _batteryRemaining = static_cast<int>(bs.battery_remaining);
         emit batteryRemainingChanged();
@@ -1552,7 +1553,7 @@ void
 VehicleCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap)
 {
     //-- This is a response to MAV_CMD_REQUEST_CAMERA_CAPTURE_STATUS
-    qCDebug(CameraControlLog) << "handleCaptureStatus() - stopping timer, resetting retries";
+    qCDebug(CameraControlLog) << "Received CAMERA_CAPTURE_STATUS - stopping timer, resetting retries";
     _captureStatusTimer.stop();
     _cameraCaptureStatusRetries = 0;
     qCDebug(CameraControlLog).noquote() << "handleCaptureStatus:"
@@ -1600,7 +1601,7 @@ VehicleCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t&
 void
 VehicleCameraControl::handleVideoInfo(const mavlink_video_stream_information_t* vi)
 {
-    qCDebug(CameraControlLog) << "handleVideoInfo:" << vi->stream_id << vi->uri;
+    qCDebug(CameraControlLog) << "Received VIDEO_STREAM_INFORMATION:" << vi->stream_id << vi->uri;
     _expectedCount = vi->count;
     if(!_findStream(vi->stream_id, false)) {
         qCDebug(CameraControlLog) << "Create stream handler for stream ID:" << vi->stream_id;
@@ -1633,7 +1634,7 @@ VehicleCameraControl::handleVideoInfo(const mavlink_video_stream_information_t*
 void
 VehicleCameraControl::handleVideoStatus(const mavlink_video_stream_status_t* vs)
 {
-    qCDebug(CameraControlLog) << "handleVideoStatus() - stopping timer, resetting retries";
+    qCDebug(CameraControlLog) << "Received VIDEO_STREAM_STATUS - stopping timer, resetting retries";
     _streamStatusTimer.stop();
     _videoStreamStatusRetries = 0;
     qCDebug(CameraControlLog) << "handleVideoStatus:" << vs->stream_id;
@@ -1792,7 +1793,7 @@ VehicleCameraControl::_requestStreamInfo(uint8_t streamID)
     // By default, try to use new REQUEST_MESSAGE command instead of
     // deprecated MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION.
     if (_videoStreamInfoRetries % 2 == 0) {
-        qCDebug(CameraControlLog) << "_requestStreamInfo() - using REQUEST_MESSAGE";
+        qCDebug(CameraControlLog) << "  Sending REQUEST_MESSAGE:MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION";
         _vehicle->sendMavCommand(
             _compID,                                         // target component
             MAV_CMD_REQUEST_MESSAGE,                        // command id
@@ -1800,7 +1801,7 @@ VehicleCameraControl::_requestStreamInfo(uint8_t streamID)
             MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION,        // msgid
             streamID);                                      // stream ID
     } else {
-        qCDebug(CameraControlLog) << "_requestStreamInfo() - using legacy MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION";
+        qCDebug(CameraControlLog) << "  Sending MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION (legacy)";
         _vehicle->sendMavCommand(
             _compID,                                            // Target component
             MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION,           // Command id
@@ -1818,7 +1819,7 @@ VehicleCameraControl::_requestStreamStatus(uint8_t streamID)
     // By default, try to use new REQUEST_MESSAGE command instead of
     // deprecated MAV_CMD_REQUEST_VIDEO_STREAM_STATUS.
     if (_videoStreamStatusRetries % 2 == 0) {
-        qCDebug(CameraControlLog) << "_requestStreamStatus() - using REQUEST_MESSAGE";
+        qCDebug(CameraControlLog) << "  Sending REQUEST_MESSAGE:MAVLINK_MSG_ID_VIDEO_STREAM_STATUS";
         _vehicle->sendMavCommand(
             _compID,                                         // target component
             MAV_CMD_REQUEST_MESSAGE,                        // command id
@@ -1826,7 +1827,7 @@ VehicleCameraControl::_requestStreamStatus(uint8_t streamID)
             MAVLINK_MSG_ID_VIDEO_STREAM_STATUS,             // msgid
             streamID);                                      // stream id
     } else {
-        qCDebug(CameraControlLog) << "_requestStreamStatus() - using legacy MAV_CMD_REQUEST_VIDEO_STREAM_STATUS";
+        qCDebug(CameraControlLog) << "  Sending MAV_CMD_REQUEST_VIDEO_STREAM_STATUS (legacy)";
         _vehicle->sendMavCommand(
             _compID,                                            // Target component
             MAV_CMD_REQUEST_VIDEO_STREAM_STATUS,                // Command id
@@ -2378,6 +2379,9 @@ VehicleCameraControl::startTracking(QRectF rec)
                                  static_cast<float>(rec.y()),
                                  static_cast<float>(rec.x() + rec.width()),
                                  static_cast<float>(rec.y() + rec.height()));
+
+        // Request tracking status
+        _requestTrackingStatus();
     }
 }
 
@@ -2400,6 +2404,9 @@ VehicleCameraControl::startTracking(QPointF point, double radius)
                                  static_cast<float>(point.x()),
                                  static_cast<float>(point.y()),
                                  static_cast<float>(radius));
+
+        // Request tracking status
+        _requestTrackingStatus();
     }
 }
 
diff --git a/src/Camera/camera_definition_example.xml b/src/Camera/camera_definition_example.xml
index fa8fd9eee635..c2400f44e822 100644
--- a/src/Camera/camera_definition_example.xml
+++ b/src/Camera/camera_definition_example.xml
@@ -260,7 +260,7 @@
     <localization>
         <!-- If no appropriate locale is found, the original (above) will be used -->
         <!-- At runtime, the code will go through every "description" and "option name" looking for "original" and replace it with "translated" -->
-        <locale name="pt_BR"> 
+        <locale name="pt_BR">
             <strings original="Aperture" translated="Abertura" />
             <strings original="Auto" translated="Automático" />
             <strings original="Average" translated="Média" />
diff --git a/src/CmdLineOptParser.cc b/src/CmdLineOptParser.cc
deleted file mode 100644
index 5e4b26a411c7..000000000000
--- a/src/CmdLineOptParser.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-
-/// @file
-/// @brief Command line option parser implementation
-/// @author Don Gagne <don@thegagnes.com>
-
-#include "CmdLineOptParser.h"
-
-/// @brief Implements a simple command line parser which sets booleans to true if the option is found.
-void ParseCmdLineOptions(int&           argc,                   ///< count of arguments in argv
-                         char*          argv[],                 ///< command line arguments
-                         CmdLineOpt_t*  prgOpts,                ///< command line options
-                         size_t         cOpts,                  ///< count of command line options
-                         bool           removeParsedOptions)    ///< true: remove parsed option from argc/argv
-{
-    // Start with all options off
-    for (size_t iOption=0; iOption<cOpts; iOption++) {
-        *prgOpts[iOption].optionFound = false;
-    }
-    
-    for (int iArg=1; iArg<argc; iArg++) {
-        for (size_t iOption=0; iOption<cOpts; iOption++) {
-            bool found = false;
-            
-            QString arg(argv[iArg]);
-            QString optionStr(prgOpts[iOption].optionStr);
-            
-            if (arg.startsWith(QString("%1:").arg(optionStr), Qt::CaseInsensitive)) {
-                found = true;
-                if (prgOpts[iOption].optionArg) {
-                    *prgOpts[iOption].optionArg = arg.right(arg.length() - (optionStr.length() + 1));
-                }
-            } else if (arg.compare(optionStr, Qt::CaseInsensitive) == 0) {
-                found = true;
-            }
-            if (found) {
-                *prgOpts[iOption].optionFound = true;
-                if (removeParsedOptions) {
-                    for (int iShift=iArg; iShift<argc-1; iShift++) {
-                        argv[iShift] = argv[iShift+1];
-                    }
-                    argc--;
-                    iArg--;
-                }
-            }
-        }
-    }
-}
diff --git a/src/CmdLineOptParser.h b/src/CmdLineOptParser.h
deleted file mode 100644
index f1161ce1aad6..000000000000
--- a/src/CmdLineOptParser.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-
-/// @file
-/// @brief  Command line option parser declaration
-/// @author Don Gagne <don@thegagnes.com>
-
-#pragma once
-
-#include <QtCore/QString>
-
-/// @brief Structure used to pass command line options to the ParseCmdLineOptions function.
-typedef struct {
-    const char* optionStr;      ///< Command line option, for example "--foo"
-    bool*       optionFound;    ///< If option is found this variable will be set to true
-    QString*    optionArg;      ///< Option has additional argument, form is option:arg
-} CmdLineOpt_t;
-
-void ParseCmdLineOptions(int&           argc,
-                         char*          argv[],
-                         CmdLineOpt_t*  prgOpts,
-                         size_t         cOpts,
-                         bool           removeParsedOptions);
-
diff --git a/src/Comms/AirLink/AirLinkLink.cc b/src/Comms/AirLink/AirLinkLink.cc
index 2a4330bc6dab..70610bd2671e 100644
--- a/src/Comms/AirLink/AirLinkLink.cc
+++ b/src/Comms/AirLink/AirLinkLink.cc
@@ -17,7 +17,7 @@
 #include <QtCore/QTimer>
 #include <QtNetwork/QUdpSocket>
 
-QGC_LOGGING_CATEGORY(AirLinkLinkLog, "qgc.AirLink.AirLinklink");
+QGC_LOGGING_CATEGORY(AirLinkLinkLog, "AirLink.AirLinkLink");
 
 /*===========================================================================*/
 
diff --git a/src/Comms/AirLink/AirLinkManager.cc b/src/Comms/AirLink/AirLinkManager.cc
index a55289524ecc..bc4284fa8d07 100644
--- a/src/Comms/AirLink/AirLinkManager.cc
+++ b/src/Comms/AirLink/AirLinkManager.cc
@@ -18,7 +18,7 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 
-QGC_LOGGING_CATEGORY(AirLinkManagerLog, "qgc.airlink.airlinkmanager");
+QGC_LOGGING_CATEGORY(AirLinkManagerLog, "AirLink.AirLinkManager");
 
 Q_APPLICATION_STATIC(AirLinkManager, _airLinkManager);
 
diff --git a/src/Comms/BluetoothLink.cc b/src/Comms/BluetoothLink.cc
index eff6c6c148b4..8116ff29f0aa 100644
--- a/src/Comms/BluetoothLink.cc
+++ b/src/Comms/BluetoothLink.cc
@@ -16,7 +16,7 @@
 #include <QtCore/QPermissions>
 #include <QtCore/QThread>
 
-QGC_LOGGING_CATEGORY(BluetoothLinkLog, "qgc.comms.bluetoothlink")
+QGC_LOGGING_CATEGORY(BluetoothLinkLog, "Comms.BluetoothLink")
 
 /*===========================================================================*/
 
@@ -24,7 +24,7 @@ BluetoothConfiguration::BluetoothConfiguration(const QString &name, QObject *par
     : LinkConfiguration(name, parent)
     , _deviceDiscoveryAgent(new QBluetoothDeviceDiscoveryAgent(this))
 {
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 
     _initDeviceDiscoveryAgent();
 }
@@ -34,7 +34,7 @@ BluetoothConfiguration::BluetoothConfiguration(const BluetoothConfiguration *cop
     , _device(copy->device())
     , _deviceDiscoveryAgent(new QBluetoothDeviceDiscoveryAgent(this))
 {
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 
     BluetoothConfiguration::copyFrom(copy);
 
@@ -45,7 +45,7 @@ BluetoothConfiguration::~BluetoothConfiguration()
 {
     stopScan();
 
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 }
 
 void BluetoothConfiguration::_initDeviceDiscoveryAgent()
@@ -64,11 +64,9 @@ void BluetoothConfiguration::_initDeviceDiscoveryAgent()
 
 void BluetoothConfiguration::copyFrom(const LinkConfiguration *source)
 {
-    Q_ASSERT(source);
     LinkConfiguration::copyFrom(source);
 
-    const BluetoothConfiguration *const bluetoothSource = qobject_cast<const BluetoothConfiguration*>(source);
-    Q_ASSERT(bluetoothSource);
+    const BluetoothConfiguration *bluetoothSource = qobject_cast<const BluetoothConfiguration*>(source);
 
     _device = bluetoothSource->device();
     emit deviceChanged();
@@ -177,14 +175,14 @@ BluetoothWorker::BluetoothWorker(const BluetoothConfiguration *config, QObject *
     : QObject(parent)
     , _config(config)
 {
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 }
 
 BluetoothWorker::~BluetoothWorker()
 {
     disconnectLink();
 
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 }
 
 bool BluetoothWorker::isConnected() const
@@ -194,12 +192,14 @@ bool BluetoothWorker::isConnected() const
 
 void BluetoothWorker::setupSocket()
 {
-    Q_ASSERT(!_socket);
-    _socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol, this);
+    if (!_socket) {
+        _socket = new QBluetoothSocket(QBluetoothServiceInfo::RfcommProtocol, this);
+    }
 
 #ifdef Q_OS_IOS
-    Q_ASSERT(!_serviceDiscoveryAgent);
-    _serviceDiscoveryAgent = new QBluetoothServiceDiscoveryAgent(this);
+    if (!_serviceDiscoveryAgent) {
+        _serviceDiscoveryAgent = new QBluetoothServiceDiscoveryAgent(this);
+    }
 #endif
 
     (void) connect(_socket, &QBluetoothSocket::connected, this, &BluetoothWorker::_onSocketConnected);
@@ -256,6 +256,7 @@ void BluetoothWorker::disconnectLink()
         _serviceDiscoveryAgent->stop();
     }
 #endif
+
     _socket->disconnectFromService();
 }
 
@@ -366,7 +367,7 @@ BluetoothLink::BluetoothLink(SharedLinkConfigurationPtr &config, QObject *parent
     , _worker(new BluetoothWorker(_bluetoothConfig))
     , _workerThread(new QThread(this))
 {
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 
     _checkPermission();
 
@@ -390,19 +391,22 @@ BluetoothLink::BluetoothLink(SharedLinkConfigurationPtr &config, QObject *parent
 
 BluetoothLink::~BluetoothLink()
 {
-    BluetoothLink::disconnect();
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectLink", Qt::BlockingQueuedConnection);
+        _onDisconnected();
+    }
 
     _workerThread->quit();
     if (!_workerThread->wait()) {
         qCWarning(BluetoothLinkLog) << "Failed to wait for Bluetooth Thread to close";
     }
 
-    // qCDebug(BluetoothLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(BluetoothLinkLog) << this;
 }
 
 bool BluetoothLink::isConnected() const
 {
-    return _worker->isConnected();
+    return _worker && _worker->isConnected();
 }
 
 bool BluetoothLink::_connect()
@@ -412,17 +416,22 @@ bool BluetoothLink::_connect()
 
 void BluetoothLink::disconnect()
 {
-    (void) QMetaObject::invokeMethod(_worker, "disconnectLink", Qt::QueuedConnection);
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectLink", Qt::QueuedConnection);
+    }
 }
 
 void BluetoothLink::_onConnected()
 {
+    _disconnectedEmitted = false;
     emit connected();
 }
 
 void BluetoothLink::_onDisconnected()
 {
-    emit disconnected();
+    if (!_disconnectedEmitted.exchange(true)) {
+        emit disconnected();
+    }
 }
 
 void BluetoothLink::_onErrorOccurred(const QString &errorString)
diff --git a/src/Comms/BluetoothLink.h b/src/Comms/BluetoothLink.h
index f72d31bfa51c..c18f690b8317 100644
--- a/src/Comms/BluetoothLink.h
+++ b/src/Comms/BluetoothLink.h
@@ -9,6 +9,9 @@
 
 #pragma once
 
+#include "LinkConfiguration.h"
+#include "LinkInterface.h"
+
 #include <QtBluetooth/QBluetoothAddress>
 #include <QtBluetooth/QBluetoothDeviceDiscoveryAgent>
 #include <QtBluetooth/QBluetoothDeviceInfo>
@@ -22,8 +25,7 @@
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QString>
 
-#include "LinkConfiguration.h"
-#include "LinkInterface.h"
+#include <atomic>
 
 class QThread;
 
@@ -207,4 +209,5 @@ private slots:
     const BluetoothConfiguration *_bluetoothConfig = nullptr;
     BluetoothWorker *_worker = nullptr;
     QThread *_workerThread = nullptr;
+    std::atomic<bool> _disconnectedEmitted{false};
 };
diff --git a/src/Comms/CMakeLists.txt b/src/Comms/CMakeLists.txt
index 62ce9307cc1c..858a43dc06af 100644
--- a/src/Comms/CMakeLists.txt
+++ b/src/Comms/CMakeLists.txt
@@ -1,3 +1,11 @@
+# ============================================================================
+# Communications Module
+# Handles all communication links (TCP, UDP, Serial, Bluetooth, etc.)
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Core Communication Sources
+# ----------------------------------------------------------------------------
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         LinkConfiguration.cc
@@ -18,7 +26,7 @@ target_sources(${CMAKE_PROJECT_NAME}
         UDPLink.h
 )
 
-# Add JSON files
+# USB board information JSON data
 qt_add_resources(${CMAKE_PROJECT_NAME} json_comm
     PREFIX "/json"
     FILES USBBoardInfo.json
@@ -26,9 +34,16 @@ qt_add_resources(${CMAKE_PROJECT_NAME} json_comm
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# Uncomment to enable Qt socket debugging
 # target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QABSTRACTSOCKET_DEBUG)
 
-#===========================================================================#
+# ============================================================================
+# Optional Communication Features
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Serial Port Communication
+# ----------------------------------------------------------------------------
 
 if(QGC_NO_SERIAL_LINK)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_NO_SERIAL_LINK)
@@ -43,13 +58,15 @@ else()
             UdpIODevice.h
     )
 
+    # Qt SerialPort not available on mobile platforms
     if(NOT ANDROID AND NOT IOS)
         target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::SerialPort)
     endif()
 endif()
 
-#===========================================================================#
-
+# ----------------------------------------------------------------------------
+# Bluetooth Communication
+# ----------------------------------------------------------------------------
 if(QGC_ENABLE_BLUETOOTH)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Bluetooth)
     target_sources(${CMAKE_PROJECT_NAME}
@@ -60,8 +77,9 @@ if(QGC_ENABLE_BLUETOOTH)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_ENABLE_BLUETOOTH)
 endif()
 
-#===========================================================================#
-
+# ----------------------------------------------------------------------------
+# ZeroConf/mDNS Service Discovery
+# ----------------------------------------------------------------------------
 if(QGC_ZEROCONF_ENABLED)
     CPMAddPackage(
         NAME qmdnsengine
@@ -76,10 +94,14 @@ if(QGC_ZEROCONF_ENABLED)
     if(TARGET qmdnsengine)
         target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE qmdnsengine)
         target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_ZEROCONF_ENABLED)
+    else()
+        message(WARNING "QGC: qmdnsengine target not created, ZeroConf will be disabled")
     endif()
 endif()
 
-#===========================================================================#
+# ============================================================================
+# Communication Link Subdirectories
+# ============================================================================
 
 add_subdirectory(AirLink)
 add_subdirectory(MockLink)
diff --git a/src/Comms/LinkConfiguration.cc b/src/Comms/LinkConfiguration.cc
index 422b5aa1817a..d36d3f964265 100644
--- a/src/Comms/LinkConfiguration.cc
+++ b/src/Comms/LinkConfiguration.cc
@@ -8,6 +8,7 @@
  ****************************************************************************/
 
 #include "LinkConfiguration.h"
+#include "QGCLoggingCategory.h"
 #ifndef QGC_NO_SERIAL_LINK
 #include "SerialLink.h"
 #endif
@@ -24,11 +25,13 @@
 #include "AirLinkLink.h"
 #endif
 
+QGC_LOGGING_CATEGORY(LinkConfigurationLog, "Comms.LinkConfiguration")
+
 LinkConfiguration::LinkConfiguration(const QString &name, QObject *parent)
     : QObject(parent)
     , _name(name)
 {
-    // qCDebug(AudioOutputLog) << Q_FUNC_INFO << this;
+    qCDebug(LinkConfigurationLog) << this;
 }
 
 LinkConfiguration::LinkConfiguration(const LinkConfiguration *copy, QObject *parent)
@@ -39,14 +42,14 @@ LinkConfiguration::LinkConfiguration(const LinkConfiguration *copy, QObject *par
     , _autoConnect(copy->isAutoConnect())
     , _highLatency(copy->isHighLatency())
 {
-    // qCDebug(AudioOutputLog) << Q_FUNC_INFO << this;
+    qCDebug(LinkConfigurationLog) << this;
 
     Q_ASSERT(!_name.isEmpty());
 }
 
 LinkConfiguration::~LinkConfiguration()
 {
-    // qCDebug(AudioOutputLog) << Q_FUNC_INFO << this;
+    qCDebug(LinkConfigurationLog) << this;
 }
 
 void LinkConfiguration::copyFrom(const LinkConfiguration *source)
@@ -158,7 +161,9 @@ void LinkConfiguration::setLink(const SharedLinkInterfacePtr link)
         _link = link;
         emit linkChanged();
 
-        (void) connect(link.get(), &LinkInterface::disconnected, this, &LinkConfiguration::linkChanged, Qt::QueuedConnection);
+        if (link.get()) {
+            (void) connect(link.get(), &LinkInterface::disconnected, this, &LinkConfiguration::linkChanged, Qt::QueuedConnection);
+        }
     }
 }
 
diff --git a/src/Comms/LinkConfiguration.h b/src/Comms/LinkConfiguration.h
index fb122f729640..01cb1775b0c0 100644
--- a/src/Comms/LinkConfiguration.h
+++ b/src/Comms/LinkConfiguration.h
@@ -9,12 +9,15 @@
 
 #pragma once
 
+#include <QtCore/QLoggingCategory>
 #include <QtCore/QSettings>
 #include <QtCore/QString>
 #include <QtQmlIntegration/QtQmlIntegration>
 
 class LinkInterface;
 
+Q_DECLARE_LOGGING_CATEGORY(LinkConfigurationLog)
+
 /// Interface holding link specific settings.
 class LinkConfiguration : public QObject
 {
diff --git a/src/Comms/LinkInterface.cc b/src/Comms/LinkInterface.cc
index c75d9903fce3..7eb7e01c7dde 100644
--- a/src/Comms/LinkInterface.cc
+++ b/src/Comms/LinkInterface.cc
@@ -17,7 +17,7 @@
 
 #include <QtQml/QQmlEngine>
 
-QGC_LOGGING_CATEGORY(LinkInterfaceLog, "qgc.comms.linkinterface")
+QGC_LOGGING_CATEGORY(LinkInterfaceLog, "Comms.LinkInterface")
 
 LinkInterface::LinkInterface(SharedLinkConfigurationPtr &config, QObject *parent)
     : QObject(parent)
@@ -29,7 +29,7 @@ LinkInterface::LinkInterface(SharedLinkConfigurationPtr &config, QObject *parent
 LinkInterface::~LinkInterface()
 {
     if (_vehicleReferenceCount != 0) {
-        qCWarning(LinkInterfaceLog) << Q_FUNC_INFO << "still have vehicle references:" << _vehicleReferenceCount;
+        qCWarning(LinkInterfaceLog) << "still have vehicle references:" << _vehicleReferenceCount;
     }
 
     _config.reset();
@@ -38,7 +38,7 @@ LinkInterface::~LinkInterface()
 uint8_t LinkInterface::mavlinkChannel() const
 {
     if (!mavlinkChannelIsSet()) {
-        qCWarning(LinkInterfaceLog) << Q_FUNC_INFO << "mavlinkChannelIsSet() == false";
+        qCWarning(LinkInterfaceLog) << "mavlinkChannelIsSet() == false";
     }
 
     return _mavlinkChannel;
@@ -61,7 +61,7 @@ bool LinkInterface::initMavlinkSigning()
                 qCDebug(LinkInterfaceLog) << "Signing enabled on channel" << _mavlinkChannel;
             }
         } else {
-            qCWarning(LinkInterfaceLog) << Q_FUNC_INFO << "Failed To enable Signing on channel" << _mavlinkChannel;
+            qCWarning(LinkInterfaceLog) << "Failed To enable Signing on channel" << _mavlinkChannel;
             // FIXME: What should we do here?
             return false;
         }
@@ -75,19 +75,20 @@ bool LinkInterface::_allocateMavlinkChannel()
     Q_ASSERT(!mavlinkChannelIsSet());
 
     if (mavlinkChannelIsSet()) {
-        qCWarning(LinkInterfaceLog) << Q_FUNC_INFO << "already have" << _mavlinkChannel;
+        qCWarning(LinkInterfaceLog) << "already have" << _mavlinkChannel;
         return true;
     }
 
     _mavlinkChannel = LinkManager::instance()->allocateMavlinkChannel();
 
     if (!mavlinkChannelIsSet()) {
-        qCWarning(LinkInterfaceLog) << Q_FUNC_INFO << "failed";
+        qCWarning(LinkInterfaceLog) << "failed";
         return false;
     }
 
     qCDebug(LinkInterfaceLog) << "_allocateMavlinkChannel" << _mavlinkChannel;
 
+    mavlink_set_proto_version(_mavlinkChannel, MAVLINK_VERSION); // We only support v2 protcol
     initMavlinkSigning();
 
     return true;
@@ -95,7 +96,7 @@ bool LinkInterface::_allocateMavlinkChannel()
 
 void LinkInterface::_freeMavlinkChannel()
 {
-    qCDebug(LinkInterfaceLog) << Q_FUNC_INFO << _mavlinkChannel;
+    qCDebug(LinkInterfaceLog) << _mavlinkChannel;
 
     if (!mavlinkChannelIsSet()) {
         return;
@@ -117,7 +118,7 @@ void LinkInterface::removeVehicleReference()
         _vehicleReferenceCount--;
         _connectionRemoved();
     } else {
-        qCWarning(LinkInterfaceLog) << Q_FUNC_INFO << "called with no vehicle references";
+        qCWarning(LinkInterfaceLog) << "called with no vehicle references";
     }
 }
 
@@ -140,3 +141,19 @@ void LinkInterface::setSigningSignatureFailure(bool failure)
         }
     }
 }
+
+void LinkInterface::reportMavlinkV1Traffic()
+{
+    if (!_mavlinkV1TrafficReported) {
+        _mavlinkV1TrafficReported = true;
+
+        const SharedLinkConfigurationPtr linkConfig = linkConfiguration();
+        const QString linkName = linkConfig ? linkConfig->name() : QStringLiteral("unknown");
+        qCWarning(LinkInterfaceLog) << "MAVLink v1 traffic detected on link" << linkName;
+        const QString message = tr("MAVLink v1 traffic detected on link '%1'. "
+                                   "%2 only supports MAVLink v2. "
+                                   "Please ensure your vehicle is configured to use MAVLink v2.")
+                                    .arg(linkName).arg(qgcApp()->applicationName());
+        qgcApp()->showAppMessage(message);
+    }
+}
diff --git a/src/Comms/LinkInterface.h b/src/Comms/LinkInterface.h
index 645f747a8d7c..1837449c8d26 100644
--- a/src/Comms/LinkInterface.h
+++ b/src/Comms/LinkInterface.h
@@ -29,7 +29,7 @@ class LinkInterface : public QObject
 public:
     virtual ~LinkInterface();
 
-    Q_INVOKABLE virtual void disconnect() = 0; // FIXME: This gets called 3x when closing link
+    Q_INVOKABLE virtual void disconnect() = 0; // Implementations should guard against multiple calls
 
     virtual bool isConnected() const = 0;
     virtual bool isLogReplay() const { return false; }
@@ -46,6 +46,7 @@ class LinkInterface : public QObject
     void removeVehicleReference();
     bool initMavlinkSigning();
     void setSigningSignatureFailure(bool failure);
+    void reportMavlinkV1Traffic();
 
 signals:
     void bytesReceived(LinkInterface *link, const QByteArray &data);
@@ -80,6 +81,7 @@ private slots:
     bool _decodedFirstMavlinkPacket = false;
     int _vehicleReferenceCount = 0;
     bool _signingSignatureFailure = false;
+    bool _mavlinkV1TrafficReported = false;
 };
 
 typedef std::shared_ptr<LinkInterface> SharedLinkInterfacePtr;
diff --git a/src/Comms/LinkManager.cc b/src/Comms/LinkManager.cc
index d3796dbbf800..187bfe2a39c4 100644
--- a/src/Comms/LinkManager.cc
+++ b/src/Comms/LinkManager.cc
@@ -52,8 +52,8 @@
 #include <QtCore/QApplicationStatic>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(LinkManagerLog, "qgc.comms.linkmanager")
-QGC_LOGGING_CATEGORY(LinkManagerVerboseLog, "qgc.comms.linkmanager:verbose")
+QGC_LOGGING_CATEGORY(LinkManagerLog, "Comms.LinkManager")
+QGC_LOGGING_CATEGORY(LinkManagerVerboseLog, "Comms.LinkManager:verbose")
 
 Q_APPLICATION_STATIC(LinkManager, _linkManagerInstance);
 
@@ -94,6 +94,12 @@ void LinkManager::init()
     }
 }
 
+QList<SharedLinkInterfacePtr> LinkManager::links()
+{
+    QMutexLocker locker(&_linksMutex);
+    return _rgLinks;
+}
+
 QmlObjectListModel *LinkManager::_qmlLinkConfigurations()
 {
     return _qmlConfigurations;
@@ -156,24 +162,31 @@ bool LinkManager::createConnectedLink(SharedLinkConfigurationPtr &config)
         return false;
     }
 
-    _rgLinks.append(link);
-    config->setLink(link);
-
+    // Set up signal connections before adding to list, so link is fully initialized
     (void) connect(link.get(), &LinkInterface::communicationError, this, &LinkManager::_communicationError);
     (void) connect(link.get(), &LinkInterface::bytesReceived, MAVLinkProtocol::instance(), &MAVLinkProtocol::receiveBytes);
     (void) connect(link.get(), &LinkInterface::bytesSent, MAVLinkProtocol::instance(), &MAVLinkProtocol::logSentBytes);
     (void) connect(link.get(), &LinkInterface::disconnected, this, &LinkManager::_linkDisconnected);
 
     MAVLinkProtocol::instance()->resetMetadataForLink(link.get());
-    MAVLinkProtocol::instance()->setVersion(MAVLinkProtocol::instance()->getCurrentVersion());
 
+    // Try to connect before adding to active links list
     if (!link->_connect()) {
+        (void) disconnect(link.get(), &LinkInterface::communicationError, this, &LinkManager::_communicationError);
+        (void) disconnect(link.get(), &LinkInterface::bytesReceived, MAVLinkProtocol::instance(), &MAVLinkProtocol::receiveBytes);
+        (void) disconnect(link.get(), &LinkInterface::bytesSent, MAVLinkProtocol::instance(), &MAVLinkProtocol::logSentBytes);
+        (void) disconnect(link.get(), &LinkInterface::disconnected, this, &LinkManager::_linkDisconnected);
         link->_freeMavlinkChannel();
-        _rgLinks.removeAt(_rgLinks.indexOf(link));
         config->setLink(nullptr);
         return false;
     }
 
+    {
+        QMutexLocker locker(&_linksMutex);
+        _rgLinks.append(link);
+    }
+    config->setLink(link);
+
     return true;
 }
 
@@ -184,9 +197,11 @@ void LinkManager::_communicationError(const QString &title, const QString &error
 
 SharedLinkInterfacePtr LinkManager::mavlinkForwardingLink()
 {
-    for (SharedLinkInterfacePtr &link : _rgLinks) {
+    QMutexLocker locker(&_linksMutex);
+
+    for (const SharedLinkInterfacePtr &link : _rgLinks) {
         const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
-        if ((linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _mavlinkForwardingLinkName)) {
+        if (linkConfig && (linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _mavlinkForwardingLinkName)) {
             return link;
         }
     }
@@ -196,9 +211,11 @@ SharedLinkInterfacePtr LinkManager::mavlinkForwardingLink()
 
 SharedLinkInterfacePtr LinkManager::mavlinkForwardingSupportLink()
 {
-    for (SharedLinkInterfacePtr &link : _rgLinks) {
+    QMutexLocker locker(&_linksMutex);
+
+    for (const SharedLinkInterfacePtr &link : _rgLinks) {
         const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
-        if ((linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _mavlinkForwardingSupportLinkName)) {
+        if (linkConfig && (linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _mavlinkForwardingSupportLinkName)) {
             return link;
         }
     }
@@ -208,7 +225,12 @@ SharedLinkInterfacePtr LinkManager::mavlinkForwardingSupportLink()
 
 void LinkManager::disconnectAll()
 {
-    const QList<SharedLinkInterfacePtr> links = _rgLinks;
+    QList<SharedLinkInterfacePtr> links;
+    {
+        QMutexLocker locker(&_linksMutex);
+        links = _rgLinks;
+    }
+
     for (const SharedLinkInterfacePtr &sharedLink: links) {
         sharedLink->disconnect();
     }
@@ -218,35 +240,57 @@ void LinkManager::_linkDisconnected()
 {
     LinkInterface* const link = qobject_cast<LinkInterface*>(sender());
 
-    if (!link || !containsLink(link)) {
+    if (!link) {
+        return;
+    }
+
+    SharedLinkInterfacePtr linkToCleanup;
+    SharedLinkConfigurationPtr config;
+    {
+        QMutexLocker locker(&_linksMutex);
+
+        for (auto it = _rgLinks.begin(); it != _rgLinks.end(); ++it) {
+            if (it->get() == link) {
+                config = it->get()->linkConfiguration();
+                const QString linkName = config ? config->name() : QStringLiteral("<null config>");
+                qCDebug(LinkManagerLog) << linkName << "use_count:" << it->use_count();
+                linkToCleanup = *it;
+                (void) _rgLinks.erase(it);
+                break;
+            }
+        }
+    }
+
+    if (!linkToCleanup) {
+        qCDebug(LinkManagerLog) << "link already removed";
         return;
     }
 
-    (void) disconnect(link, &LinkInterface::communicationError, qgcApp(), &QGCApplication::showAppMessage);
+    if (config) {
+        config->setLink(nullptr);
+    }
+
+    (void) disconnect(link, &LinkInterface::communicationError, this, &LinkManager::_communicationError);
     (void) disconnect(link, &LinkInterface::bytesReceived, MAVLinkProtocol::instance(), &MAVLinkProtocol::receiveBytes);
     (void) disconnect(link, &LinkInterface::bytesSent, MAVLinkProtocol::instance(), &MAVLinkProtocol::logSentBytes);
     (void) disconnect(link, &LinkInterface::disconnected, this, &LinkManager::_linkDisconnected);
 
     link->_freeMavlinkChannel();
-
-    for (auto it = _rgLinks.begin(); it != _rgLinks.end(); ++it) {
-        if (it->get() == link) {
-            qCDebug(LinkManagerLog) << Q_FUNC_INFO << it->get()->linkConfiguration()->name() << it->use_count();
-            (void) _rgLinks.erase(it);
-            return;
-        }
-    }
 }
 
 SharedLinkInterfacePtr LinkManager::sharedLinkInterfacePointerForLink(const LinkInterface *link)
 {
-    for (SharedLinkInterfacePtr &sharedLink: _rgLinks) {
+    QMutexLocker locker(&_linksMutex);
+
+    for (const SharedLinkInterfacePtr &sharedLink: _rgLinks) {
         if (sharedLink.get() == link) {
             return sharedLink;
         }
     }
 
-    qCWarning(LinkManagerLog) << "returning nullptr";
+    // Link not found - this is normal during disconnect when queued signals are still processing.
+    // Callers should check for nullptr return value.
+    qCDebug(LinkManagerLog) << "link not in list (likely disconnected)";
     return SharedLinkInterfacePtr(nullptr);
 }
 
@@ -377,10 +421,13 @@ void LinkManager::_addUDPAutoConnectLink()
         return;
     }
 
-    for (SharedLinkInterfacePtr &link : _rgLinks) {
-        const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
-        if ((linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _defaultUDPLinkName)) {
-            return;
+    {
+        QMutexLocker locker(&_linksMutex);
+        for (const SharedLinkInterfacePtr &link : _rgLinks) {
+            const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
+            if (linkConfig && (linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _defaultUDPLinkName)) {
+                return;
+            }
         }
     }
 
@@ -398,11 +445,14 @@ void LinkManager::_addMAVLinkForwardingLink()
         return;
     }
 
-    for (const SharedLinkInterfacePtr &link : _rgLinks) {
-        const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
-        if ((linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _mavlinkForwardingLinkName)) {
-            // TODO: should we check if the host/port matches the mavlinkForwardHostName setting and update if it does not match?
-            return;
+    {
+        QMutexLocker locker(&_linksMutex);
+        for (const SharedLinkInterfacePtr &link : _rgLinks) {
+            const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
+            if (linkConfig && (linkConfig->type() == LinkConfiguration::TypeUdp) && (linkConfig->name() == _mavlinkForwardingLinkName)) {
+                // TODO: should we check if the host/port matches the mavlinkForwardHostName setting and update if it does not match?
+                return;
+            }
         }
     }
 
@@ -423,9 +473,10 @@ void LinkManager::_addZeroConfAutoConnectLink()
     browser.reset(new QMdnsEngine::Browser(server.get(), QMdnsEngine::MdnsBrowseType));
 
     const auto checkIfConnectionLinkExist = [this](LinkConfiguration::LinkType linkType, const QString &linkName) {
+        QMutexLocker locker(&_linksMutex);
         for (const SharedLinkInterfacePtr &link : std::as_const(_rgLinks)) {
             const SharedLinkConfigurationPtr linkConfig = link->linkConfiguration();
-            if ((linkConfig->type() == linkType) && (linkConfig->name() == linkName)) {
+            if (linkConfig && (linkConfig->type() == linkType) && (linkConfig->name() == linkName)) {
                 return true;
             }
         }
@@ -650,7 +701,7 @@ void LinkManager::_removeConfiguration(const LinkConfiguration *config)
         }
     }
 
-    qCWarning(LinkManagerLog) << Q_FUNC_INFO << "called with unknown config";
+    qCWarning(LinkManagerLog) << "called with unknown config";
 }
 
 bool LinkManager::isBluetoothAvailable()
@@ -658,8 +709,10 @@ bool LinkManager::isBluetoothAvailable()
     return QGCDeviceInfo::isBluetoothAvailable();
 }
 
-bool LinkManager::containsLink(const LinkInterface *link) const
+bool LinkManager::containsLink(const LinkInterface *link)
 {
+    QMutexLocker locker(&_linksMutex);
+
     for (const SharedLinkInterfacePtr &sharedLink : _rgLinks) {
         if (sharedLink.get() == link) {
             return true;
@@ -768,7 +821,14 @@ bool LinkManager::isLinkUSBDirect(const LinkInterface *link)
 
 void LinkManager::resetMavlinkSigning()
 {
-    for (const SharedLinkInterfacePtr &sharedLink: _rgLinks) {
+    // Make a copy under mutex protection to avoid holding lock during signing initialization
+    QList<SharedLinkInterfacePtr> links;
+    {
+        QMutexLocker locker(&_linksMutex);
+        links = _rgLinks;
+    }
+
+    for (const SharedLinkInterfacePtr &sharedLink: links) {
         sharedLink->initMavlinkSigning();
     }
 }
@@ -789,7 +849,7 @@ void LinkManager::_filterCompositePorts(QList<QGCSerialPortInfo> &portList)
                 // Some boards are a composite USB device, with the first port being mavlink and the second something else. We only expose to first mavlink port.
                 // However internal NMEA devices can present like this, so dont skip anything with NMEA in description
                 if(!portInfo.description().contains("NMEA")) {
-                    qCDebug(LinkManagerVerboseLog) << QStringLiteral("Removing secondary port on same device - port:%1 vid:%2 pid%3 sn:%4").arg(portInfo.portName()).arg(portInfo.vendorIdentifier()).arg(portInfo.productIdentifier()).arg(portInfo.serialNumber()) << Q_FUNC_INFO;
+                    qCDebug(LinkManagerVerboseLog) << QStringLiteral("Removing secondary port on same device - port:%1 vid:%2 pid%3 sn:%4").arg(portInfo.portName()).arg(portInfo.vendorIdentifier()).arg(portInfo.productIdentifier()).arg(portInfo.serialNumber());
                     it = portList.erase(it);
                     continue;
                 }
@@ -948,8 +1008,10 @@ bool LinkManager::_allowAutoConnectToBoard(QGCSerialPortInfo::BoardType_t boardT
     return false;
 }
 
-bool LinkManager::_portAlreadyConnected(const QString &portName) const
+bool LinkManager::_portAlreadyConnected(const QString &portName)
 {
+    QMutexLocker locker(&_linksMutex);
+
     const QString searchPort = portName.trimmed();
     for (const SharedLinkInterfacePtr &linkInterface : _rgLinks) {
         const SharedLinkConfigurationPtr linkConfig = linkInterface->linkConfiguration();
@@ -997,8 +1059,10 @@ QStringList LinkManager::serialBaudRates()
     return SerialConfiguration::supportedBaudRates();
 }
 
-bool LinkManager::_isSerialPortConnected() const
+bool LinkManager::_isSerialPortConnected()
 {
+    QMutexLocker locker(&_linksMutex);
+
     for (const SharedLinkInterfacePtr &link: _rgLinks) {
         if (qobject_cast<const SerialLink*>(link.get())) {
             return true;
diff --git a/src/Comms/LinkManager.h b/src/Comms/LinkManager.h
index 30ee45584c84..c4e621f70310 100644
--- a/src/Comms/LinkManager.h
+++ b/src/Comms/LinkManager.h
@@ -11,6 +11,8 @@
 
 #include <QtCore/QList>
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QMutex>
+#include <QtCore/QMutexLocker>
 #include <QtCore/QStringList>
 #include <QtQmlIntegration/QtQmlIntegration>
 
@@ -72,7 +74,7 @@ class LinkManager : public QObject
     Q_INVOKABLE void shutdown();
     Q_INVOKABLE LogReplayLink *startLogReplay(const QString &logFile);
 
-    QList<SharedLinkInterfacePtr> links() { return _rgLinks; }
+    QList<SharedLinkInterfacePtr> links();
     QStringList linkTypeStrings() const;
     bool mavlinkSupportForwardingEnabled() const { return _mavlinkSupportForwardingEnabled; }
 
@@ -109,7 +111,7 @@ class LinkManager : public QObject
     /// by using this method to get access to the shared pointer.
     SharedLinkInterfacePtr sharedLinkInterfacePointerForLink(const LinkInterface *link);
 
-    bool containsLink(const LinkInterface *link) const;
+    bool containsLink(const LinkInterface *link);
 
     SharedLinkConfigurationPtr addConfiguration(LinkConfiguration *config);
 
@@ -153,6 +155,7 @@ private slots:
     uint32_t _mavlinkChannelsUsedBitMask = 1;
     QString _connectionsSuspendedReason;            ///< User visible reason for suspension
 
+    QMutex _linksMutex;                             ///< Protects _rgLinks access from multiple threads
     QList<SharedLinkInterfacePtr> _rgLinks;
     QList<SharedLinkConfigurationPtr> _rgLinkConfigs;
 
@@ -184,11 +187,11 @@ private slots:
     void commPortsChanged();
 
 private:
-    bool _isSerialPortConnected() const;
+    bool _isSerialPortConnected();
     void _updateSerialPorts();
     bool _allowAutoConnectToBoard(QGCSerialPortInfo::BoardType_t boardType) const;
     void _addSerialAutoConnectLink();
-    bool _portAlreadyConnected(const QString &portName) const;
+    bool _portAlreadyConnected(const QString &portName);
     void _filterCompositePorts(QList<QGCSerialPortInfo> &portList);
 
     UdpIODevice *_nmeaSocket = nullptr;
diff --git a/src/Comms/LogReplayLink.cc b/src/Comms/LogReplayLink.cc
index e5cd0bcfb49b..af74b1462ac4 100644
--- a/src/Comms/LogReplayLink.cc
+++ b/src/Comms/LogReplayLink.cc
@@ -18,35 +18,33 @@
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(LogReplayLinkLog, "qgc.comms.logreplaylink")
+QGC_LOGGING_CATEGORY(LogReplayLinkLog, "Comms.LogReplayLink")
 
 /*===========================================================================*/
 
 LogReplayConfiguration::LogReplayConfiguration(const QString &name, QObject *parent)
     : LinkConfiguration(name, parent)
 {
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
 }
 
 LogReplayConfiguration::LogReplayConfiguration(const LogReplayConfiguration *copy, QObject *parent)
     : LinkConfiguration(copy, parent)
     , _logFilename(copy->logFilename())
 {
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
 }
 
 LogReplayConfiguration::~LogReplayConfiguration()
 {
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
 }
 
 void LogReplayConfiguration::copyFrom(const LinkConfiguration *source)
 {
-    Q_ASSERT(source);
     LinkConfiguration::copyFrom(source);
 
-    const LogReplayConfiguration *const logReplaySource = qobject_cast<const LogReplayConfiguration*>(source);
-    Q_ASSERT(logReplaySource);
+    const LogReplayConfiguration *logReplaySource = qobject_cast<const LogReplayConfiguration*>(source);
 
     setLogFilename(logReplaySource->logFilename());
 }
@@ -88,20 +86,21 @@ LogReplayWorker::LogReplayWorker(const LogReplayConfiguration *config, QObject *
     : QObject(parent)
     , _logReplayConfig(config)
 {
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
 }
 
 LogReplayWorker::~LogReplayWorker()
 {
     disconnectFromLog();
 
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
 }
 
 void LogReplayWorker::setup()
 {
-    Q_ASSERT(!_readTickTimer);
-    _readTickTimer = new QTimer(this);
+    if (!_readTickTimer) {
+        _readTickTimer = new QTimer(this);
+    }
 
     (void) connect(_readTickTimer, &QTimer::timeout, this, &LogReplayWorker::_readNextLogEntry);
 }
@@ -136,10 +135,18 @@ void LogReplayWorker::disconnectFromLog()
         return;
     }
 
+    qCDebug(LogReplayLinkLog) << "Disconnecting from log";
+
+    if (_readTickTimer) {
+        _readTickTimer->stop();
+    }
+
+    if (_logFile.isOpen()) {
+        _logFile.close();
+    }
+
     _isConnected = false;
     emit disconnected();
-
-    _readTickTimer->stop();
 }
 
 bool LogReplayWorker::isPlaying() const
@@ -403,7 +410,7 @@ LogReplayLink::LogReplayLink(SharedLinkConfigurationPtr &config, QObject *parent
     , _worker(new LogReplayWorker(_logReplayConfig))
     , _workerThread(new QThread(this))
 {
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
 
     _workerThread->setObjectName(QStringLiteral("LogReplay_%1").arg(_logReplayConfig->name()));
 
@@ -429,14 +436,22 @@ LogReplayLink::LogReplayLink(SharedLinkConfigurationPtr &config, QObject *parent
 
 LogReplayLink::~LogReplayLink()
 {
-    LogReplayLink::disconnect();
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectFromLog", Qt::BlockingQueuedConnection);
+        _onDisconnected();
+    }
 
     _workerThread->quit();
     if (!_workerThread->wait()) {
         qCWarning(LogReplayLinkLog) << "Failed to wait for LogReplay Thread to close";
     }
 
-    // qCDebug(LogReplayLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkLog) << this;
+}
+
+bool LogReplayLink::isConnected() const
+{
+    return _worker && _worker->isConnected();
 }
 
 bool LogReplayLink::_connect()
@@ -446,7 +461,22 @@ bool LogReplayLink::_connect()
 
 void LogReplayLink::disconnect()
 {
-    (void) QMetaObject::invokeMethod(_worker, "disconnectFromLog", Qt::QueuedConnection);
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectFromLog", Qt::QueuedConnection);
+    }
+}
+
+void LogReplayLink::_onConnected()
+{
+    _disconnectedEmitted = false;
+    emit connected();
+}
+
+void LogReplayLink::_onDisconnected()
+{
+    if (!_disconnectedEmitted.exchange(true)) {
+        emit disconnected();
+    }
 }
 
 void LogReplayLink::_onErrorOccurred(const QString &errorString)
@@ -460,6 +490,11 @@ void LogReplayLink::_onDataReceived(const QByteArray &data)
     emit bytesReceived(this, data);
 }
 
+bool LogReplayLink::isPlaying() const
+{
+    return _worker && _worker->isPlaying();
+}
+
 void LogReplayLink::play()
 {
     (void) QMetaObject::invokeMethod(_worker, "play", Qt::QueuedConnection);
diff --git a/src/Comms/LogReplayLink.h b/src/Comms/LogReplayLink.h
index cf58b780ddf4..51eb874eb45d 100644
--- a/src/Comms/LogReplayLink.h
+++ b/src/Comms/LogReplayLink.h
@@ -9,12 +9,14 @@
 
 #pragma once
 
+#include "LinkConfiguration.h"
+#include "LinkInterface.h"
+
 #include <QtCore/QFile>
 #include <QtCore/QLoggingCategory>
 #include <QtQmlIntegration/QtQmlIntegration>
 
-#include "LinkConfiguration.h"
-#include "LinkInterface.h"
+#include <atomic>
 
 class QTimer;
 
@@ -131,11 +133,11 @@ class LogReplayLink : public LinkInterface
     explicit LogReplayLink(SharedLinkConfigurationPtr &config, QObject *parent = nullptr);
     virtual ~LogReplayLink();
 
-    bool isConnected() const override { return _worker->isConnected(); }
+    bool isConnected() const override;
     void disconnect() override;
     bool isLogReplay() const final { return true; }
 
-    bool isPlaying() const { return _worker->isPlaying(); }
+    bool isPlaying() const;
     void play();
     void pause();
     void setPlaybackSpeed(qreal playbackSpeed);
@@ -151,8 +153,8 @@ class LogReplayLink : public LinkInterface
 
 private slots:
     void _writeBytes(const QByteArray &bytes) override { Q_UNUSED(bytes); }
-    void _onConnected() { emit connected(); }
-    void _onDisconnected() { emit disconnected(); }
+    void _onConnected();
+    void _onDisconnected();
     void _onErrorOccurred(const QString &errorString);
     void _onDataReceived(const QByteArray &data);
 
@@ -162,4 +164,5 @@ private slots:
     const LogReplayConfiguration *_logReplayConfig = nullptr;
     LogReplayWorker *_worker = nullptr;
     QThread *_workerThread = nullptr;
+    std::atomic<bool> _disconnectedEmitted{false};
 };
diff --git a/src/Comms/LogReplayLinkController.cc b/src/Comms/LogReplayLinkController.cc
index e89ee2c92015..878720d228a8 100644
--- a/src/Comms/LogReplayLinkController.cc
+++ b/src/Comms/LogReplayLinkController.cc
@@ -10,17 +10,17 @@
 #include "LogReplayLinkController.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(LogReplayLinkControllerLog, "qgc.comms.logreplaylink")
+QGC_LOGGING_CATEGORY(LogReplayLinkControllerLog, "Comms.LogReplayLinkController")
 
 LogReplayLinkController::LogReplayLinkController(QObject *parent)
     : QObject(parent)
 {
-    // qCDebug(LogReplayLinkControllerLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkControllerLog) << this;
 }
 
 LogReplayLinkController::~LogReplayLinkController()
 {
-    // qCDebug(LogReplayLinkControllerLog) << Q_FUNC_INFO << this;
+    qCDebug(LogReplayLinkControllerLog) << this;
 }
 
 void LogReplayLinkController::setLink(LogReplayLink *link)
@@ -63,6 +63,10 @@ void LogReplayLinkController::setLink(LogReplayLink *link)
 
 void LogReplayLinkController::setIsPlaying(bool isPlaying) const
 {
+    if (!_link) {
+        return;
+    }
+
     if (isPlaying) {
         _link->play();
     } else {
@@ -72,6 +76,10 @@ void LogReplayLinkController::setIsPlaying(bool isPlaying) const
 
 void LogReplayLinkController::setPercentComplete(qreal percentComplete) const
 {
+    if (!_link) {
+        return;
+    }
+
     _link->movePlayhead(percentComplete);
 }
 
diff --git a/src/Comms/LogReplayLinkController.h b/src/Comms/LogReplayLinkController.h
index 574e275f1598..18d2c5d50d8d 100644
--- a/src/Comms/LogReplayLinkController.h
+++ b/src/Comms/LogReplayLinkController.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QPointer>
 #include <QtQmlIntegration/QtQmlIntegration>
 
 #include "LogReplayLink.h"
@@ -66,5 +67,5 @@ private slots:
     qreal _playbackSpeed = 1;
     QString _playheadTime;
     QString _totalTime;
-    LogReplayLink *_link = nullptr;
+    QPointer<LogReplayLink> _link;
 };
diff --git a/src/Comms/MAVLinkProtocol.cc b/src/Comms/MAVLinkProtocol.cc
index 560032b88290..320808f63177 100644
--- a/src/Comms/MAVLinkProtocol.cc
+++ b/src/Comms/MAVLinkProtocol.cc
@@ -24,8 +24,9 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QSettings>
 #include <QtCore/QStandardPaths>
+#include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(MAVLinkProtocolLog, "qgc.comms.mavlinkprotocol")
+QGC_LOGGING_CATEGORY(MAVLinkProtocolLog, "Comms.MAVLinkProtocol")
 
 Q_APPLICATION_STATIC(MAVLinkProtocol, _mavlinkProtocolInstance);
 
@@ -33,14 +34,14 @@ MAVLinkProtocol::MAVLinkProtocol(QObject *parent)
     : QObject(parent)
     , _tempLogFile(new QGCTemporaryFile(QStringLiteral("%2.%3").arg(_tempLogFileTemplate, _logFileExtension), this))
 {
-    // qCDebug(MAVLinkProtocolLog) << Q_FUNC_INFO << this;
+    qCDebug(MAVLinkProtocolLog) << this;
 }
 
 MAVLinkProtocol::~MAVLinkProtocol()
 {
     _closeLogFile();
 
-    // qCDebug(MAVLinkProtocolLog) << Q_FUNC_INFO << this;
+    qCDebug(MAVLinkProtocolLog) << this;
 }
 
 MAVLinkProtocol *MAVLinkProtocol::instance()
@@ -59,16 +60,6 @@ void MAVLinkProtocol::init()
     _initialized = true;
 }
 
-void MAVLinkProtocol::setVersion(unsigned version)
-{
-    const QList<SharedLinkInterfacePtr> sharedLinks = LinkManager::instance()->links();
-    for (const SharedLinkInterfacePtr &interface : sharedLinks) {
-        mavlink_set_proto_version(interface.get()->mavlinkChannel(), version / 100);
-    }
-
-    _currentVersion = version;
-}
-
 void MAVLinkProtocol::resetMetadataForLink(LinkInterface *link)
 {
     const uint8_t channel = link->mavlinkChannel();
@@ -119,7 +110,11 @@ void MAVLinkProtocol::receiveBytes(LinkInterface *link, const QByteArray &data)
             continue;
         }
 
-        _updateVersion(link, mavlinkChannel);
+        if (status.flags & MAVLINK_STATUS_FLAG_IN_MAVLINK1) {
+            link->reportMavlinkV1Traffic();
+            continue;
+        }
+
         _updateCounters(mavlinkChannel, message);
         if (!linkPtr->linkConfiguration()->isForwarding()) {
             _forward(message);
@@ -133,25 +128,6 @@ void MAVLinkProtocol::receiveBytes(LinkInterface *link, const QByteArray &data)
     }
 }
 
-void MAVLinkProtocol::_updateVersion(LinkInterface *link, uint8_t mavlinkChannel)
-{
-    if (link->decodedFirstMavlinkPacket()) {
-        return;
-    }
-
-    link->setDecodedFirstMavlinkPacket(true);
-    const mavlink_status_t *const mavlinkStatus = mavlink_get_channel_status(mavlinkChannel);
-
-    if (mavlinkStatus->flags & MAVLINK_STATUS_FLAG_IN_MAVLINK1) {
-        return;
-    }
-
-    if (mavlink_get_proto_version(mavlinkChannel) == 1) {
-        qCDebug(MAVLinkProtocolLog) << "Switching outbound to mavlink 2.0 due to incoming mavlink 2.0 packet:" << mavlinkChannel;
-        setVersion(200);
-    }
-}
-
 void MAVLinkProtocol::_updateCounters(uint8_t mavlinkChannel, const mavlink_message_t &message)
 {
     _totalReceiveCounter[mavlinkChannel]++;
@@ -349,8 +325,8 @@ void MAVLinkProtocol::_stopLogging()
     if (_tempLogFile->isOpen() && _closeLogFile()) {
         auto appSettings = SettingsManager::instance()->appSettings();
         auto mavlinkSettings = SettingsManager::instance()->mavlinkSettings();
-        if ((_vehicleWasArmed || mavlinkSettings->telemetrySaveNotArmed()->rawValue().toBool()) && 
-                mavlinkSettings->telemetrySave()->rawValue().toBool() && 
+        if ((_vehicleWasArmed || mavlinkSettings->telemetrySaveNotArmed()->rawValue().toBool()) &&
+                mavlinkSettings->telemetrySave()->rawValue().toBool() &&
                 !appSettings->disableAllPersistence()->rawValue().toBool()) {
             _saveTelemetryLog(_tempLogFile->fileName());
         } else {
@@ -404,17 +380,68 @@ void MAVLinkProtocol::_saveTelemetryLog(const QString &tempLogfile)
         const QString dtFormat("yyyy-MM-dd hh-mm-ss");
 
         int tryIndex = 1;
-        QString saveFileName = nameFormat.arg(QDateTime::currentDateTime().toString(dtFormat), QStringLiteral(""), AppSettings::telemetryFileExtension);
+        QString saveFileName = nameFormat.arg(QDateTime::currentDateTime().toString(dtFormat), QString(), AppSettings::telemetryFileExtension);
         while (saveDir.exists(saveFileName)) {
             saveFileName = nameFormat.arg(QDateTime::currentDateTime().toString(dtFormat), QStringLiteral(".%1").arg(tryIndex++), AppSettings::telemetryFileExtension);
         }
 
         const QString saveFilePath = saveDir.absoluteFilePath(saveFileName);
-        QFile tempFile(tempLogfile);
-        if (!tempFile.copy(saveFilePath)) {
-            const QString error = tr("Unable to save telemetry log. Error copying telemetry to '%1': '%2'.").arg(saveFilePath, tempFile.errorString());
+
+        QFile in(tempLogfile);
+        if (!in.open(QIODevice::ReadOnly)) {
+            const QString error = tr("Unable to save telemetry log. Error opening source '%1': '%2'.").arg(tempLogfile, in.errorString());
             qgcApp()->showAppMessage(error);
+            (void) QFile::remove(tempLogfile);
+            return;
         }
+
+        QSaveFile out(saveFilePath);
+        out.setDirectWriteFallback(true); // allows non-atomic fallback where rename isn’t possible
+
+        if (!out.open(QIODevice::WriteOnly)) {
+            const QString error = tr("Unable to save telemetry log. Error opening destination '%1': '%2'.").arg(saveFilePath, out.errorString());
+            qgcApp()->showAppMessage(error);
+            (void) QFile::remove(tempLogfile);
+            return;
+        }
+
+        // Stream copy to avoid large allocations.
+        QByteArray buffer;
+        constexpr int bufferSize = 256 * 1024; // 256 KiB
+        buffer.resize(bufferSize);
+        while (true) {
+            const qint64 n = in.read(buffer.data(), buffer.size());
+            if (n == 0) {
+                break;
+            }
+            if (n < 0) {
+                const QString error = tr("Unable to save telemetry log. Error reading source '%1': '%2'.").arg(tempLogfile, in.errorString());
+                qgcApp()->showAppMessage(error);
+                out.cancelWriting();
+                (void) QFile::remove(tempLogfile);
+                return;
+            }
+            if (out.write(buffer.constData(), n) != n) {
+                const QString error = tr("Unable to save telemetry log. Error writing destination '%1': '%2'.").arg(saveFilePath, out.errorString());
+                qgcApp()->showAppMessage(error);
+                out.cancelWriting();
+                (void) QFile::remove(tempLogfile);
+                return;
+            }
+        }
+
+        if (!out.commit()) {
+            const QString error = tr("Unable to finalize telemetry log '%1': '%2'.").arg(saveFilePath, out.errorString());
+            qgcApp()->showAppMessage(error);
+            (void) QFile::remove(tempLogfile);
+            return;
+        }
+
+        constexpr QFileDevice::Permissions perms =
+            QFileDevice::ReadOwner | QFileDevice::WriteOwner |
+            QFileDevice::ReadGroup |
+            QFileDevice::ReadOther;
+        (void) out.setPermissions(perms);
     }
 
     (void) QFile::remove(tempLogfile);
@@ -446,7 +473,7 @@ void MAVLinkProtocol::_vehicleCountChanged()
     }
 }
 
-int MAVLinkProtocol::getSystemId() const 
-{ 
-    return SettingsManager::instance()->mavlinkSettings()->gcsMavlinkSystemID()->rawValue().toInt(); 
+int MAVLinkProtocol::getSystemId() const
+{
+    return SettingsManager::instance()->mavlinkSettings()->gcsMavlinkSystemID()->rawValue().toInt();
 }
diff --git a/src/Comms/MAVLinkProtocol.h b/src/Comms/MAVLinkProtocol.h
index 921f74086a13..b3c7fcbb101c 100644
--- a/src/Comms/MAVLinkProtocol.h
+++ b/src/Comms/MAVLinkProtocol.h
@@ -51,21 +51,12 @@ class MAVLinkProtocol : public QObject
     /// Get the component id of this application
     static int getComponentId() { return MAV_COMP_ID_MISSIONPLANNER; }
 
-    /// Get the protocol version
-    static int getVersion() { return MAVLINK_VERSION; }
-
-    /// Get the currently configured protocol version
-    unsigned getCurrentVersion() const { return _currentVersion; }
-
     /// Reset the counters for all metadata for this link.
     void resetMetadataForLink(LinkInterface *link);
 
     /// Suspend/Restart logging during replay.
     void suspendLogForReplay(bool suspend) { _logSuspendReplay = suspend; }
 
-    /// Set protocol version
-    void setVersion(unsigned version);
-
     /// Checks the temp directory for log files which may have been left there.
     /// This could happen if QGC crashes without the temp log file being saved.
     /// Give the user an option to save these orphaned files.
@@ -107,7 +98,6 @@ private slots:
 
     void _updateCounters(uint8_t mavlinkChannel, const mavlink_message_t &message);
     bool _updateStatus(LinkInterface *link, const SharedLinkInterfacePtr linkPtr, uint8_t mavlinkChannel, const mavlink_message_t &message);
-    void _updateVersion(LinkInterface *link, uint8_t mavlinkChannel);
 
     void _saveTelemetryLog(const QString &tempLogfile);
     bool _checkTelemetrySavePath();
@@ -124,7 +114,6 @@ private slots:
     uint64_t _totalLossCounter[MAVLINK_COMM_NUM_BUFFERS]{};     ///< Total messages lost during transmission.
     float _runningLossPercent[MAVLINK_COMM_NUM_BUFFERS]{};      ///< Loss rate
 
-    unsigned _currentVersion = 100;
     bool _initialized = false;
 
     static constexpr const char *_tempLogFileTemplate = "FlightDataXXXXXX"; ///< Template for temporary log file
diff --git a/src/Comms/MockLink/MockConfiguration.cc b/src/Comms/MockLink/MockConfiguration.cc
index 5dbe4377fb8b..9735a3f1333c 100644
--- a/src/Comms/MockLink/MockConfiguration.cc
+++ b/src/Comms/MockLink/MockConfiguration.cc
@@ -10,12 +10,12 @@
 #include "MockConfiguration.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MockConfigurationLog, "qgc.comms.mocklink.mockconfiguration")
+QGC_LOGGING_CATEGORY(MockConfigurationLog, "Comms.MockLink.MockConfiguration")
 
 MockConfiguration::MockConfiguration(const QString &name, QObject *parent)
     : LinkConfiguration(name, parent)
 {
-    // qCDebug(MockConfigurationLog) << Q_FUNC_INFO << this;
+    qCDebug(MockConfigurationLog) << this;
 }
 
 MockConfiguration::MockConfiguration(const MockConfiguration *copy, QObject *parent)
@@ -26,21 +26,19 @@ MockConfiguration::MockConfiguration(const MockConfiguration *copy, QObject *par
     , _incrementVehicleId(copy->incrementVehicleId())
     , _failureMode(copy->failureMode())
 {
-    // qCDebug(MockConfigurationLog) << Q_FUNC_INFO << this;
+    qCDebug(MockConfigurationLog) << this;
 }
 
 MockConfiguration::~MockConfiguration()
 {
-    // qCDebug(MockConfigurationLog) << Q_FUNC_INFO << this;
+    qCDebug(MockConfigurationLog) << this;
 }
 
 void MockConfiguration::copyFrom(const LinkConfiguration *source)
 {
-    Q_ASSERT(source);
     LinkConfiguration::copyFrom(source);
 
-    const MockConfiguration *const mockLinkSource = qobject_cast<const MockConfiguration*>(source);
-    Q_ASSERT(mockLinkSource);
+    const MockConfiguration *mockLinkSource = qobject_cast<const MockConfiguration*>(source);
 
     setFirmwareType(mockLinkSource->firmwareType());
     setVehicleType(mockLinkSource->vehicleType());
diff --git a/src/Comms/MockLink/MockConfiguration.h b/src/Comms/MockLink/MockConfiguration.h
index 1d3523df7195..a6ef65a786d0 100644
--- a/src/Comms/MockLink/MockConfiguration.h
+++ b/src/Comms/MockLink/MockConfiguration.h
@@ -59,8 +59,6 @@ class MockConfiguration : public LinkConfiguration
         FailMissingParamOnAllRequests,                              // Not all params are sent on initial request, QGC retries will fail as well
         FailInitialConnectRequestMessageAutopilotVersionFailure,    // REQUEST_MESSAGE:AUTOPILOT_VERSION returns failure
         FailInitialConnectRequestMessageAutopilotVersionLost,       // REQUEST_MESSAGE:AUTOPILOT_VERSION success, AUTOPILOT_VERSION never sent
-        FailInitialConnectRequestMessageProtocolVersionFailure,     // REQUEST_MESSAGE:PROTOCOL_VERSION returns failure
-        FailInitialConnectRequestMessageProtocolVersionLost,        // REQUEST_MESSAGE:PROTOCOL_VERSION success, PROTOCOL_VERSION never sent
     };
     FailureMode_t failureMode() const { return _failureMode; }
     void setFailureMode(FailureMode_t failureMode) { _failureMode = failureMode; }
diff --git a/src/Comms/MockLink/MockLink.General.MetaData.json b/src/Comms/MockLink/MockLink.General.MetaData.json
index cd76f4b100da..1204020e5f1d 100644
--- a/src/Comms/MockLink/MockLink.General.MetaData.json
+++ b/src/Comms/MockLink/MockLink.General.MetaData.json
@@ -7,4 +7,4 @@
 	"metadataTypes": [
 		{"type": 1, "uri": "mftp://[;comp=1]parameter.json.xz", "fileCrc": 1}
 	]
-} 
+}
diff --git a/src/Comms/MockLink/MockLink.cc b/src/Comms/MockLink/MockLink.cc
index c03ef63a47dc..2a580b070c13 100644
--- a/src/Comms/MockLink/MockLink.cc
+++ b/src/Comms/MockLink/MockLink.cc
@@ -22,8 +22,8 @@
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(MockLinkLog, "qgc.comms.mocklink.mocklink")
-QGC_LOGGING_CATEGORY(MockLinkVerboseLog, "qgc.comms.mocklink.mocklink:verbose")
+QGC_LOGGING_CATEGORY(MockLinkLog, "Comms.MockLink.MockLink")
+QGC_LOGGING_CATEGORY(MockLinkVerboseLog, "Comms.MockLink.MockLink:verbose")
 
 int MockLink::_nextVehicleSystemId = 128;
 
@@ -62,7 +62,7 @@ MockLink::MockLink(SharedLinkConfigurationPtr &config, QObject *parent)
     , _missionItemHandler(new MockLinkMissionItemHandler(this))
     , _mockLinkFTP(new MockLinkFTP(_vehicleSystemId, _vehicleComponentId, this))
 {
-    // qCDebug(MockLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(MockLinkLog) << this;
 
     // Initialize 5 ADS-B vehicles with different starting conditions _numberOfVehicles
     _adsbVehicles.resize(_numberOfVehicles);
@@ -87,6 +87,7 @@ MockLink::MockLink(SharedLinkConfigurationPtr &config, QObject *parent)
     _runningTime.start();
 
     _workerThread = new QThread(this);
+    _workerThread->setObjectName(QStringLiteral("Mock_%1").arg(_mockConfig->name()));
     _worker = new MockLinkWorker(this);
     _worker->moveToThread(_workerThread);
     (void) connect(_workerThread, &QThread::started, _worker, &MockLinkWorker::startWork);
@@ -107,13 +108,14 @@ MockLink::~MockLink()
         _workerThread->wait();
     }
 
-    // qCDebug(MockLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(MockLinkLog) << this;
 }
 
 bool MockLink::_connect()
 {
     if (!_connected) {
         _connected = true;
+        _disconnectedEmitted = false;
         mavlink_status_t *const mavlinkStatus = mavlink_get_channel_status(mavlinkChannel());
         mavlinkStatus->flags &= ~MAVLINK_STATUS_FLAG_OUT_MAVLINK1;
         mavlink_status_t *const auxStatus = mavlink_get_channel_status(_getMavlinkAuxChannel());
@@ -130,7 +132,9 @@ void MockLink::disconnect()
 
     if (_connected) {
         _connected = false;
-        emit disconnected();
+        if (!_disconnectedEmitted.exchange(true)) {
+            emit disconnected();
+        }
     }
 }
 
@@ -149,9 +153,20 @@ void MockLink::run1HzTasks()
     _sendBatteryStatus();
     _sendSysStatus();
     _sendADSBVehicles();
-    _sendRemoteIDArmStatus();
+    if (_vehicleType != MAV_TYPE_SUBMARINE) {
+        _sendRemoteIDArmStatus();
+    }
     _sendAvailableModesMonitor();
+
+    if (_sendGimbalManagerStatusNow) {
+        _sendGimbalManagerStatus();
+    }
+    if (_sendGimbalDeviceAttitudeStatusNow) {
+        _sendGimbalDeviceAttitudeStatus();
+    }
+
     // _sendVideoInfo();
+
     if (!qgcApp()->runningUnitTests()) {
         // Sending RC Channels during unit test breaks RC tests which does it's own RC simulation
         _sendRCChannels();
@@ -182,8 +197,10 @@ void MockLink::run10HzTasks()
             // We delay gps position for better testing
             _sendGPSPositionDelayCount--;
         } else {
-            _sendGpsRawInt();
-            _sendGlobalPositionInt();
+            if (_vehicleType != MAV_TYPE_SUBMARINE) {
+                _sendGpsRawInt();
+                _sendGlobalPositionInt();
+            }
             _sendExtendedSysState();
         }
     }
@@ -202,6 +219,68 @@ void MockLink::run500HzTasks()
     }
 }
 
+void MockLink::_sendGimbalManagerStatus()
+{
+    mavlink_message_t msg{};
+
+    (void) mavlink_msg_gimbal_manager_status_pack_chan(
+        _vehicleSystemId,
+        _vehicleComponentId,
+        mavlinkChannel(),
+        &msg,
+        0, // time_boot_ms
+        0, // flags
+        MAV_COMP_ID_GIMBAL, // gimbal_device_id
+        0, 0, 0, 0);
+    respondWithMavlinkMessage(msg);
+    (void) mavlink_msg_gimbal_manager_status_pack_chan(
+        _vehicleSystemId,
+        _vehicleComponentId,
+        mavlinkChannel(),
+        &msg,
+        0, // time_boot_ms
+        0, // flags
+        MAV_COMP_ID_GIMBAL2, // gimbal_device_id
+        0, 0, 0, 0);
+    respondWithMavlinkMessage(msg);
+}
+
+void MockLink::_sendGimbalDeviceAttitudeStatus()
+{
+    mavlink_message_t msg{};
+
+    float q[4] = {1.0f, 0.0f, 0.0f, 0.0f};
+
+    (void) mavlink_msg_gimbal_device_attitude_status_pack_chan(
+        _vehicleSystemId,
+        MAV_COMP_ID_GIMBAL,
+        mavlinkChannel(),
+        &msg,
+        0, 0, // target system, component
+        0, // time_boot_ms
+        0, // flags
+        (float*)&q,
+        0.0f, 0.0f, 0.0f, // angular_velocity_x, y, z
+        0, // failure flags
+        NAN, NAN,
+        0); // gimbal_device_id
+    respondWithMavlinkMessage(msg);
+    (void) mavlink_msg_gimbal_device_attitude_status_pack_chan(
+        _vehicleSystemId,
+        MAV_COMP_ID_GIMBAL2,
+        mavlinkChannel(),
+        &msg,
+        0, 0, // target system, component
+        0, // time_boot_ms
+        0, // flags
+        (float*)&q,
+        0.0f, 0.0f, 0.0f, // angular_velocity_x, y, z
+        0, // failure flags
+        NAN, NAN,
+        0); // gimbal_device_id
+    respondWithMavlinkMessage(msg);
+}
+
 void MockLink::sendStatusTextMessages()
 {
     _sendStatusTextMessages();
@@ -859,10 +938,21 @@ void MockLink::_handleParamSet(const mavlink_message_t &msg)
     Q_ASSERT(_mapParamName2Value[componentId].contains(paramId));
     Q_ASSERT(request.param_type == _mapParamName2MavParamType[componentId][paramId]);
 
-    // Save the new value
+    // Apply failure behaviors before committing change.
+    if (_paramSetFailureMode == FailParamSetFirstAttemptNoAck && _paramSetFailureFirstAttemptPending) {
+        qCDebug(MockLinkLog) << "Param set failure: first attempt no ack" << paramId;
+        _paramSetFailureFirstAttemptPending = false;
+        return;
+    }
+
+    if (_paramSetFailureMode == FailParamSetNoAck) {
+        qCDebug(MockLinkLog) << "Param set failure: no ack" << paramId;
+        return;
+    }
+
+    // Normal success path
     _setParamFloatUnionIntoMap(componentId, paramId, request.param_value);
 
-    // Respond with a param_value to ack
     mavlink_message_t responseMsg;
     mavlink_msg_param_value_pack_chan(
         _vehicleSystemId,
@@ -936,6 +1026,17 @@ void MockLink::_handleParamRequestRead(const mavlink_message_t &msg)
         return;
     }
 
+    if (_paramRequestReadFailureMode == FailParamRequestReadFirstAttemptNoResponse && _paramRequestReadFailureFirstAttemptPending) {
+        qCDebug(MockLinkLog) << "Param request read failure: first attempt no response" << paramId;
+        _paramRequestReadFailureFirstAttemptPending = false;
+        return;
+    }
+
+    if (_paramRequestReadFailureMode == FailParamRequestReadNoResponse) {
+        qCDebug(MockLinkLog) << "Param request read failure: no response" << paramId;
+        return;
+    }
+
     (void) mavlink_msg_param_value_pack_chan(
         _vehicleSystemId,
         componentId,                                               // component id
@@ -1045,6 +1146,19 @@ void MockLink::_handleInProgressCommandLong(const mavlink_command_long_t &reques
     }
 }
 
+void MockLink::_handleCommandLongSetMessageInterval(const mavlink_command_long_t &request, bool &accepted)
+{
+    accepted = false;
+
+    if (request.param1 == MAVLINK_MSG_ID_GIMBAL_MANAGER_STATUS) {
+        _sendGimbalManagerStatusNow = true;
+        accepted = true;
+    } else if (request.param1 == MAVLINK_MSG_ID_GIMBAL_DEVICE_ATTITUDE_STATUS) {
+        _sendGimbalDeviceAttitudeStatusNow = true;
+        accepted = true;
+    }
+}
+
 void MockLink::_handleCommandLong(const mavlink_message_t &msg)
 {
     static bool firstCmdUser3 = true;
@@ -1091,8 +1205,10 @@ void MockLink::_handleCommandLong(const mavlink_message_t &msg)
         break;
     case MAV_CMD_REQUEST_MESSAGE:
     {
+        bool accepted = false;
         bool noAck = false;
-        if (_handleRequestMessage(request, noAck)) {
+        _handleRequestMessage(request, accepted, noAck);
+        if (accepted) {
             if (noAck) {
                 return;
             }
@@ -1141,6 +1257,16 @@ void MockLink::_handleCommandLong(const mavlink_message_t &msg)
     case MockLink::MAV_CMD_MOCKLINK_RESULT_IN_PROGRESS_NO_ACK:
         _handleInProgressCommandLong(request);
         return;
+    case MAV_CMD_SET_MESSAGE_INTERVAL:
+    {
+        bool accepted = false;
+
+        _handleCommandLongSetMessageInterval(request, accepted);
+        if (accepted) {
+            commandResult = MAV_RESULT_ACCEPTED;
+        }
+        break;
+    }
     }
 
     mavlink_message_t commandAck{};
@@ -1672,112 +1798,137 @@ void MockLink::_moveADSBVehicle(int vehicleIndex)
     coord.setAltitude(100); // Keeping altitude constant for simplicity
 }
 
-bool MockLink::_handleRequestMessage(const mavlink_command_long_t &request, bool &noAck)
+void MockLink::_handleRequestMessageAutopilotVersion(const mavlink_command_long_t &request, bool &accepted)
 {
-    noAck = false;
+    accepted = true;
 
-    switch (static_cast<int>(request.param1)) {
-    case MAVLINK_MSG_ID_AUTOPILOT_VERSION:
-    {
-        switch (_failureMode) {
-        case MockConfiguration::FailNone:
-            break;
-        case MockConfiguration::FailInitialConnectRequestMessageAutopilotVersionFailure:
-            return false;
-        case MockConfiguration::FailInitialConnectRequestMessageAutopilotVersionLost:
-            return true;
-        default:
-            break;
-        }
+    switch (_failureMode) {
+    case MockConfiguration::FailNone:
+        break;
+    case MockConfiguration::FailInitialConnectRequestMessageAutopilotVersionFailure:
+        accepted = false;
+        return;
+    case MockConfiguration::FailInitialConnectRequestMessageAutopilotVersionLost:
+        accepted = true;
+        return;
+    default:
+        break;
+    }
 
-        _respondWithAutopilotVersion();
-        return true;
+    _respondWithAutopilotVersion();
+}
+
+void MockLink::_handleRequestMessageDebug(const mavlink_command_long_t &request, bool &accepted, bool &noAck)
+{
+    accepted = true;
+    noAck = false;
+
+    switch (_requestMessageFailureMode) {
+    case FailRequestMessageNone:
+        break;
+    case FailRequestMessageCommandAcceptedMsgNotSent:
+        return;
+    case FailRequestMessageCommandUnsupported:
+        accepted = false;
+        return;
+    case FailRequestMessageCommandNoResponse:
+        accepted = false;
+        noAck = true;
+        return;
     }
-    case MAVLINK_MSG_ID_PROTOCOL_VERSION:
-    {
-        switch (_failureMode) {
-        case MockConfiguration::FailNone:
-            break;
-        case MockConfiguration::FailInitialConnectRequestMessageProtocolVersionFailure:
-            return false;
-        case MockConfiguration::FailInitialConnectRequestMessageProtocolVersionLost:
-            return true;
-        default:
-            break;
-        }
 
-        const uint8_t nullHash[8]{};
-        mavlink_message_t responseMsg{};
-        (void) mavlink_msg_protocol_version_pack_chan(
-            _vehicleSystemId,
-            _vehicleComponentId,
-            mavlinkChannel(),
-            &responseMsg,
-            200,
-            100,
-            200,
-            nullHash,
-            nullHash
-        );
-        respondWithMavlinkMessage(responseMsg);
-        return true;
+    mavlink_message_t responseMsg{};
+    (void) mavlink_msg_debug_pack_chan(
+        _vehicleSystemId,
+        _vehicleComponentId,
+        mavlinkChannel(),
+        &responseMsg,
+        0, 0, 0
+    );
+    respondWithMavlinkMessage(responseMsg);
+}
+
+void MockLink::_handleRequestMessageAvailableModes(const mavlink_command_long_t &request, bool &accepted)
+{
+    accepted = true;
+
+    if (request.param2 == 0) {
+        // Request for available modes to be streamed out
+        if (_availableModesWorkerNextModeIndex != 0) {
+            qCWarning(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: _availableModesWorker already running - _availableModesWorkerNextModeIndex:" << _availableModesWorkerNextModeIndex;
+            accepted = false;
+            return;
+        }
+        qCDebug(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: starting available modes sequence worker";
+        _availableModesWorkerNextModeIndex = 1; // Start with the first mode in sequence (1-based index)
+    } else {
+        // Request for specific mode
+        if (request.param2 > _availableFlightModes.count()) {
+            qCWarning(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: requested mode index out of range" << request.param2 << _availableFlightModes.count();
+            accepted = false;
+            return;
+        }
+        qCDebug(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: received specific mode request for index" << request.param2;
+        _availableModesWorkerNextModeIndex = -request.param2; // Negative index indicates a specific single mode request
     }
+}
+
+void MockLink::_handleRequestMessageGimbalManagerInformation(const mavlink_command_long_t &request, bool &accepted)
+{
+    accepted = true;
+
+    mavlink_message_t responseMsg{};
+    (void) mavlink_msg_gimbal_manager_information_pack_chan(
+        _vehicleSystemId,
+        _vehicleComponentId,
+        mavlinkChannel(),
+        &responseMsg,
+        0, // time_boot_ms
+        GIMBAL_MANAGER_CAP_FLAGS_HAS_ROLL_AXIS | GIMBAL_MANAGER_CAP_FLAGS_HAS_PITCH_AXIS | GIMBAL_MANAGER_CAP_FLAGS_HAS_YAW_AXIS,
+        MAV_COMP_ID_GIMBAL,
+        -45, 45,
+        -45, 45,
+        -180, 180);
+    respondWithMavlinkMessage(responseMsg);
+    (void) mavlink_msg_gimbal_manager_information_pack_chan(
+        _vehicleSystemId,
+        _vehicleComponentId,
+        mavlinkChannel(),
+        &responseMsg,
+        0, // time_boot_ms
+        GIMBAL_MANAGER_CAP_FLAGS_HAS_ROLL_AXIS | GIMBAL_MANAGER_CAP_FLAGS_HAS_PITCH_AXIS | GIMBAL_MANAGER_CAP_FLAGS_HAS_YAW_AXIS,
+        MAV_COMP_ID_GIMBAL2,
+        -45, 45,
+        -45, 45,
+        -180, 180);
+    respondWithMavlinkMessage(responseMsg);
+}
+
+void MockLink::_handleRequestMessage(const mavlink_command_long_t &request, bool &accepted, bool &noAck)
+{
+    accepted = false;
+    noAck = false;
+
+    switch (static_cast<int>(request.param1)) {
+    case MAVLINK_MSG_ID_AUTOPILOT_VERSION:
+        _handleRequestMessageAutopilotVersion(request, accepted);
+        break;
     case MAVLINK_MSG_ID_COMPONENT_METADATA:
         if (_firmwareType == MAV_AUTOPILOT_PX4) {
             _sendGeneralMetaData();
-            return true;
+            accepted = true;
         }
         break;
     case MAVLINK_MSG_ID_DEBUG:
-    {
-        switch (_requestMessageFailureMode) {
-        case FailRequestMessageNone:
-            break;
-        case FailRequestMessageCommandAcceptedMsgNotSent:
-            return true;
-        case FailRequestMessageCommandUnsupported:
-            return false;
-        case FailRequestMessageCommandNoResponse:
-            noAck = true;
-            return true;
-        }
-
-        mavlink_message_t responseMsg{};
-        (void) mavlink_msg_debug_pack_chan(
-            _vehicleSystemId,
-            _vehicleComponentId,
-            mavlinkChannel(),
-            &responseMsg,
-            0, 0, 0
-        );
-        respondWithMavlinkMessage(responseMsg);
-
-        return true;
-    }
+        _handleRequestMessageDebug(request, accepted, noAck);
+        break;
     case MAVLINK_MSG_ID_AVAILABLE_MODES:
-    {
-        if (request.param2 == 0) {
-            // Request for available modes to be streamed out
-            if (_availableModesWorkerNextModeIndex != 0) {
-                qCWarning(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: _availableModesWorker already running - _availableModesWorkerNextModeIndex:" << _availableModesWorkerNextModeIndex;
-                return false;
-            }
-            qCDebug(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: starting available modes sequence worker";
-            _availableModesWorkerNextModeIndex = 1; // Start with the first mode in sequence (1-based index)
-        } else {
-            // Request for specific mode
-            if (request.param2 > _availableFlightModes.count()) {
-                qCWarning(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: requested mode index out of range" << request.param2 << _availableFlightModes.count();
-                return false;
-            }
-            qCDebug(MockLinkLog) << "MAVLINK_MSG_ID_AVAILABLE_MODES: received specific mode request for index" << request.param2;
-            _availableModesWorkerNextModeIndex = -request.param2; // Negative index indicates a specific single mode request
-        }
-        return true;
-    }
+        _handleRequestMessageAvailableModes(request, accepted);
+        break;
+    case MAVLINK_MSG_ID_GIMBAL_MANAGER_INFORMATION:
+        _handleRequestMessageGimbalManagerInformation(request, accepted);
+        break;
     }
-
-    return false;
 }
 
 void MockLink::_sendGeneralMetaData()
@@ -1909,7 +2060,7 @@ void MockLink::_sendVideoInfo()
     }
 }
 
-void MockLink::_sendAvailableMode(uint8_t modeIndexOneBased) 
+void MockLink::_sendAvailableMode(uint8_t modeIndexOneBased)
 {
     if (modeIndexOneBased > _availableModesCount()) {
         qCWarning(MockLinkLog) << "modeIndexOneBased out of range" << modeIndexOneBased << _availableModesCount();
diff --git a/src/Comms/MockLink/MockLink.h b/src/Comms/MockLink/MockLink.h
index 56a76984ee30..2388daf91a01 100644
--- a/src/Comms/MockLink/MockLink.h
+++ b/src/Comms/MockLink/MockLink.h
@@ -21,6 +21,8 @@
 #include <QtCore/QMutex>
 #include <QtPositioning/QGeoCoordinate>
 
+#include <atomic>
+
 class MockLinkFTP;
 class MockLinkWorker;
 class QThread;
@@ -92,6 +94,26 @@ class MockLink : public LinkInterface
     };
     void setRequestMessageFailureMode(RequestMessageFailureMode_t failureMode) { _requestMessageFailureMode = failureMode; }
 
+    enum ParamSetFailureMode_t {
+        FailParamSetNone,               ///< Normal behavior
+        FailParamSetNoAck,              ///< Do not send PARAM_VALUE ack
+        FailParamSetFirstAttemptNoAck,  ///< Skip ack on first attempt, respond to retry
+    };
+    void setParamSetFailureMode(ParamSetFailureMode_t mode) {
+        _paramSetFailureMode = mode;
+        _paramSetFailureFirstAttemptPending = (mode == FailParamSetFirstAttemptNoAck);
+    }
+
+    enum ParamRequestReadFailureMode_t {
+        FailParamRequestReadNone,               ///< Normal behavior
+        FailParamRequestReadNoResponse,         ///< Do not respond to PARAM_REQUEST_READ
+        FailParamRequestReadFirstAttemptNoResponse, ///< Skip response on first attempt, respond to retry
+    };
+    void setParamRequestReadFailureMode(ParamRequestReadFailureMode_t mode) {
+        _paramRequestReadFailureMode = mode;
+        _paramRequestReadFailureFirstAttemptPending = (mode == FailParamRequestReadFirstAttemptNoResponse);
+    }
+
     static MockLink *startPX4MockLink(bool sendStatusText, MockConfiguration::FailureMode_t failureMode = MockConfiguration::FailNone);
     static MockLink *startGenericMockLink(bool sendStatusText, MockConfiguration::FailureMode_t failureMode = MockConfiguration::FailNone);
     static MockLink *startNoInitialConnectMockLink(bool sendStatusText, MockConfiguration::FailureMode_t failureMode = MockConfiguration::FailNone);
@@ -155,13 +177,18 @@ private slots:
     void _handleFTP(const mavlink_message_t &msg);
     void _handleCommandLong(const mavlink_message_t &msg);
     void _handleInProgressCommandLong(const mavlink_command_long_t &request);
+    void _handleCommandLongSetMessageInterval(const mavlink_command_long_t &request, bool &acccepted);
     void _handleManualControl(const mavlink_message_t &msg);
     void _handlePreFlightCalibration(const mavlink_command_long_t &request);
     void _handleTakeoff(const mavlink_command_long_t &request);
     void _handleLogRequestList(const mavlink_message_t &msg);
     void _handleLogRequestData(const mavlink_message_t &msg);
     void _handleParamMapRC(const mavlink_message_t &msg);
-    bool _handleRequestMessage(const mavlink_command_long_t &request, bool &noAck);
+    void _handleRequestMessage(const mavlink_command_long_t &request, bool &accepted, bool &noAck);
+    void _handleRequestMessageAutopilotVersion(const mavlink_command_long_t &request, bool &accepted);
+    void _handleRequestMessageDebug(const mavlink_command_long_t &request, bool &accepted, bool &noAck);
+    void _handleRequestMessageAvailableModes(const mavlink_command_long_t &request, bool &accepted);
+    void _handleRequestMessageGimbalManagerInformation(const mavlink_command_long_t &request, bool &accepted);
 
     void _sendHeartBeat();
     void _sendHighLatency2();
@@ -172,6 +199,8 @@ private slots:
     void _sendVibration();
     void _sendSysStatus();
     void _sendBatteryStatus();
+    void _sendGimbalManagerStatus();
+    void _sendGimbalDeviceAttitudeStatus();
     void _sendChunkedStatusText(uint16_t chunkId, bool missingChunks);
     void _sendStatusTextMessages();
     void _respondWithAutopilotVersion();
@@ -252,7 +281,14 @@ private slots:
     uint32_t _logDownloadCurrentOffset = 0;             ///< Current offset we are sending from
     uint32_t _logDownloadBytesRemaining = 0;            ///< Number of bytes still to send, 0 = send inactive
 
+    bool _sendGimbalManagerStatusNow = false;
+    bool _sendGimbalDeviceAttitudeStatusNow = false;
+
     RequestMessageFailureMode_t _requestMessageFailureMode = FailRequestMessageNone;
+    ParamSetFailureMode_t _paramSetFailureMode = FailParamSetNone;
+    bool _paramSetFailureFirstAttemptPending = false;
+    ParamRequestReadFailureMode_t _paramRequestReadFailureMode = FailParamRequestReadNone;
+    bool _paramRequestReadFailureFirstAttemptPending = false;
 
     QMap<MAV_CMD, int> _receivedMavCommandCountMap;
     QMap<int, QMap<QString, QVariant>> _mapParamName2Value;
@@ -286,4 +322,6 @@ private slots:
     static constexpr bool _mavlinkStarted = true;
 
     static QList<FlightMode_t> _availableFlightModes;
+
+    std::atomic<bool> _disconnectedEmitted{false};
 };
diff --git a/src/Comms/MockLink/MockLinkFTP.cc b/src/Comms/MockLink/MockLinkFTP.cc
index 68af3ee7c44e..575b16236077 100644
--- a/src/Comms/MockLink/MockLinkFTP.cc
+++ b/src/Comms/MockLink/MockLinkFTP.cc
@@ -12,7 +12,7 @@
 #include "QGCLoggingCategory.h"
 #include "QGCTemporaryFile.h"
 
-QGC_LOGGING_CATEGORY(MockLinkFTPLog, "MockLinkMissionItemHandlerLog")
+QGC_LOGGING_CATEGORY(MockLinkFTPLog, "Comms.MockLink.MockLinkFTP")
 
 MockLinkFTP::MockLinkFTP(uint8_t systemIdServer, uint8_t componentIdServer, MockLink *mockLink)
     : QObject(mockLink)
diff --git a/src/Comms/MockLink/MockLinkFTP.h b/src/Comms/MockLink/MockLinkFTP.h
index 0bdb89378283..b3f79507481d 100644
--- a/src/Comms/MockLink/MockLinkFTP.h
+++ b/src/Comms/MockLink/MockLinkFTP.h
@@ -114,4 +114,3 @@ class MockLinkFTP : public QObject
 
     static constexpr uint8_t _sessionId = 1;    ///< We only support a single fixed session
 };
-
diff --git a/src/Comms/MockLink/MockLinkMissionItemHandler.cc b/src/Comms/MockLink/MockLinkMissionItemHandler.cc
index 53caa78760dc..b6fc6c603c77 100644
--- a/src/Comms/MockLink/MockLinkMissionItemHandler.cc
+++ b/src/Comms/MockLink/MockLinkMissionItemHandler.cc
@@ -13,7 +13,7 @@
 #include "MockLink.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MockLinkMissionItemHandlerLog, "qgc.comms.mocklink.mocklinkmissionitemhandler")
+QGC_LOGGING_CATEGORY(MockLinkMissionItemHandlerLog, "Comms.MockLink.MockLinkMissionItemHandler")
 
 MockLinkMissionItemHandler::MockLinkMissionItemHandler(MockLink *mockLink)
     : QObject(mockLink)
diff --git a/src/Comms/MockLink/MockLinkMissionItemHandler.h b/src/Comms/MockLink/MockLinkMissionItemHandler.h
index 88bcc8be1175..eefd9d43df38 100644
--- a/src/Comms/MockLink/MockLinkMissionItemHandler.h
+++ b/src/Comms/MockLink/MockLinkMissionItemHandler.h
@@ -111,4 +111,3 @@ private slots:
     bool _failReadRequest1FirstResponse = true;
     bool _failWriteMissionCountFirstResponse = true;
 };
-
diff --git a/src/Comms/QGCSerialPortInfo.cc b/src/Comms/QGCSerialPortInfo.cc
index 89ae730b1d7d..e811532dfef9 100644
--- a/src/Comms/QGCSerialPortInfo.cc
+++ b/src/Comms/QGCSerialPortInfo.cc
@@ -17,7 +17,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
-QGC_LOGGING_CATEGORY(QGCSerialPortInfoLog, "qgc.comms.qgcserialportinfo")
+QGC_LOGGING_CATEGORY(QGCSerialPortInfoLog, "Comms.QGCSerialPortInfo")
 
 bool QGCSerialPortInfo::_jsonLoaded = false;
 bool QGCSerialPortInfo::_jsonDataValid = false;
@@ -28,18 +28,18 @@ QList<QGCSerialPortInfo::BoardRegExpFallback_t> QGCSerialPortInfo::_boardManufac
 QGCSerialPortInfo::QGCSerialPortInfo()
     : QSerialPortInfo()
 {
-    // qCDebug(QGCSerialPortInfoLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCSerialPortInfoLog) << this;
 }
 
 QGCSerialPortInfo::QGCSerialPortInfo(const QSerialPort &port)
     : QSerialPortInfo(port)
 {
-    // qCDebug(QGCSerialPortInfoLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCSerialPortInfoLog) << this;
 }
 
 QGCSerialPortInfo::~QGCSerialPortInfo()
 {
-    // qCDebug(QGCSerialPortInfoLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCSerialPortInfoLog) << this;
 }
 
 bool QGCSerialPortInfo::_loadJsonData()
diff --git a/src/Comms/SerialLink.cc b/src/Comms/SerialLink.cc
index 30b71c19cbe5..176888de9e73 100644
--- a/src/Comms/SerialLink.cc
+++ b/src/Comms/SerialLink.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(SerialLinkLog, "qgc.comms.seriallink")
+QGC_LOGGING_CATEGORY(SerialLinkLog, "Comms.SerialLink")
 
 namespace {
     constexpr int CONNECT_TIMEOUT_MS = 1000;
@@ -61,11 +61,9 @@ void SerialConfiguration::setPortName(const QString &name)
 
 void SerialConfiguration::copyFrom(const LinkConfiguration *source)
 {
-    Q_ASSERT(source);
     LinkConfiguration::copyFrom(source);
 
-    const SerialConfiguration* const serialSource = qobject_cast<const SerialConfiguration*>(source);
-    Q_ASSERT(serialSource);
+    const SerialConfiguration* serialSource = qobject_cast<const SerialConfiguration*>(source);
 
     setBaud(serialSource->baud());
     setDataBits(serialSource->dataBits());
@@ -75,6 +73,7 @@ void SerialConfiguration::copyFrom(const LinkConfiguration *source)
     setPortName(serialSource->portName());
     setPortDisplayName(serialSource->portDisplayName());
     setUsbDirect(serialSource->usbDirect());
+    setdtrForceLow(serialSource->dtrForceLow());
 }
 
 void SerialConfiguration::loadSettings(QSettings &settings, const QString &root)
@@ -88,6 +87,7 @@ void SerialConfiguration::loadSettings(QSettings &settings, const QString &root)
     setParity(static_cast<QSerialPort::Parity>(settings.value("parity", _parity).toInt()));
     setPortName(settings.value("portName", _portName).toString());
     setPortDisplayName(settings.value("portDisplayName", _portDisplayName).toString());
+    setdtrForceLow(settings.value("dtrForceLow", _dtrForceLow).toBool());
 
     settings.endGroup();
 }
@@ -103,6 +103,7 @@ void SerialConfiguration::saveSettings(QSettings &settings, const QString &root)
     settings.setValue("parity", _parity);
     settings.setValue("portName", _portName);
     settings.setValue("portDisplayName", _portDisplayName);
+    settings.setValue("dtrForceLow", _dtrForceLow);
 
     settings.endGroup();
 }
@@ -189,7 +190,7 @@ SerialWorker::SerialWorker(const SerialConfiguration *config, QObject *parent)
     : QObject(parent)
     , _serialConfig(config)
 {
-    // qCDebug(SerialLinkLog) << this;
+    qCDebug(SerialLinkLog) << this;
 
     (void) qRegisterMetaType<QSerialPort::SerialPortError>("QSerialPort::SerialPortError");
 }
@@ -198,7 +199,7 @@ SerialWorker::~SerialWorker()
 {
     disconnectFromPort();
 
-    // qCDebug(SerialLinkLog) << this;
+    qCDebug(SerialLinkLog) << this;
 }
 
 bool SerialWorker::isConnected() const
@@ -208,11 +209,13 @@ bool SerialWorker::isConnected() const
 
 void SerialWorker::setupPort()
 {
-    Q_ASSERT(!_port);
-    _port = new QSerialPort(this);
+    if (!_port) {
+        _port = new QSerialPort(this);
+    }
 
-    Q_ASSERT(!_timer);
-    _timer = new QTimer(this);
+    if (!_timer) {
+        _timer = new QTimer(this);
+    }
 
     (void) connect(_port, &QSerialPort::aboutToClose, this, &SerialWorker::_onPortDisconnected);
     (void) connect(_port, &QSerialPort::readyRead, this, &SerialWorker::_onPortReadyRead);
@@ -223,7 +226,6 @@ void SerialWorker::setupPort()
     } */
 
     (void) connect(_timer, &QTimer::timeout, this, &SerialWorker::_checkPortAvailability);
-    _timer->start(CONNECT_TIMEOUT_MS);
 }
 
 void SerialWorker::connectToPort()
@@ -271,6 +273,7 @@ void SerialWorker::disconnectFromPort()
     }
 
     qCDebug(SerialLinkLog) << "Attempting to close port:" << _port->portName();
+
     _port->close();
 }
 
@@ -312,13 +315,17 @@ void SerialWorker::_onPortConnected()
 {
     qCDebug(SerialLinkLog) << "Port connected:" << _port->portName();
 
-    _port->setDataTerminalReady(true);
+    _port->setDataTerminalReady(_serialConfig->dtrForceLow() ? false : true);
     _port->setBaudRate(_serialConfig->baud());
     _port->setDataBits(static_cast<QSerialPort::DataBits>(_serialConfig->dataBits()));
     _port->setFlowControl(static_cast<QSerialPort::FlowControl>(_serialConfig->flowControl()));
     _port->setStopBits(static_cast<QSerialPort::StopBits>(_serialConfig->stopBits()));
     _port->setParity(static_cast<QSerialPort::Parity>(_serialConfig->parity()));
 
+    if (_timer) {
+        _timer->start(CONNECT_TIMEOUT_MS);
+    }
+
     _errorEmitted = false;
     emit connected();
 }
@@ -326,6 +333,11 @@ void SerialWorker::_onPortConnected()
 void SerialWorker::_onPortDisconnected()
 {
     qCDebug(SerialLinkLog) << "Port disconnected:" << _port->portName();
+
+    if (_timer) {
+        _timer->stop();
+    }
+
     _errorEmitted = false;
     emit disconnected();
 }
@@ -399,7 +411,7 @@ SerialLink::SerialLink(SharedLinkConfigurationPtr &config, QObject *parent)
     , _worker(new SerialWorker(_serialConfig))
     , _workerThread(new QThread(this))
 {
-    // qCDebug(SerialLinkLog) << this;
+    qCDebug(SerialLinkLog) << this;
 
     _workerThread->setObjectName(QStringLiteral("Serial_%1").arg(_serialConfig->name()));
 
@@ -419,19 +431,22 @@ SerialLink::SerialLink(SharedLinkConfigurationPtr &config, QObject *parent)
 
 SerialLink::~SerialLink()
 {
-    (void) QMetaObject::invokeMethod(_worker, "disconnectFromPort", Qt::BlockingQueuedConnection);
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectFromPort", Qt::BlockingQueuedConnection);
+        _onDisconnected();
+    }
 
     _workerThread->quit();
     if (!_workerThread->wait(DISCONNECT_TIMEOUT_MS)) {
         qCWarning(SerialLinkLog) << "Failed to wait for Serial Thread to close";
     }
 
-    // qCDebug(SerialLinkLog) << this;
+    qCDebug(SerialLinkLog) << this;
 }
 
 bool SerialLink::isConnected() const
 {
-    return _worker->isConnected();
+    return _worker && _worker->isConnected();
 }
 
 bool SerialLink::_connect()
@@ -441,17 +456,22 @@ bool SerialLink::_connect()
 
 void SerialLink::disconnect()
 {
-    (void) QMetaObject::invokeMethod(_worker, "disconnectFromPort", Qt::QueuedConnection);
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectFromPort", Qt::QueuedConnection);
+    }
 }
 
 void SerialLink::_onConnected()
 {
+    _disconnectedEmitted = false;
     emit connected();
 }
 
 void SerialLink::_onDisconnected()
 {
-    emit disconnected();
+    if (!_disconnectedEmitted.exchange(true)) {
+        emit disconnected();
+    }
 }
 
 void SerialLink::_onErrorOccurred(const QString &errorString)
diff --git a/src/Comms/SerialLink.h b/src/Comms/SerialLink.h
index 80ced02cbfd5..f82e642ee5c3 100644
--- a/src/Comms/SerialLink.h
+++ b/src/Comms/SerialLink.h
@@ -9,17 +9,18 @@
 
 #pragma once
 
+#include "LinkConfiguration.h"
+#include "LinkInterface.h"
+
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QString>
-
 #ifdef Q_OS_ANDROID
 #include "qserialport.h"
 #else
 #include <QtSerialPort/QSerialPort>
 #endif
 
-#include "LinkConfiguration.h"
-#include "LinkInterface.h"
+#include <atomic>
 
 class QThread;
 class QTimer;
@@ -39,6 +40,7 @@ class SerialConfiguration : public LinkConfiguration
     Q_PROPERTY(QString                  portName        READ portName        WRITE setPortName    NOTIFY portNameChanged)
     Q_PROPERTY(QString                  portDisplayName READ portDisplayName                      NOTIFY portDisplayNameChanged)
     Q_PROPERTY(bool                     usbDirect       READ usbDirect       WRITE setUsbDirect   NOTIFY usbDirectChanged)
+    Q_PROPERTY(bool                     dtrForceLow     READ dtrForceLow     WRITE setdtrForceLow NOTIFY dtrForceLowChanged)
 
 public:
     explicit SerialConfiguration(const QString &name, QObject *parent = nullptr);
@@ -76,6 +78,9 @@ class SerialConfiguration : public LinkConfiguration
     bool usbDirect() const { return _usbDirect; }
     void setUsbDirect(bool usbDirect) { if (usbDirect != _usbDirect) { _usbDirect = usbDirect; emit usbDirectChanged(); } }
 
+    bool dtrForceLow() const { return _dtrForceLow; }
+    void setdtrForceLow(bool dtrForceLow) { if (dtrForceLow != _dtrForceLow) { _dtrForceLow = dtrForceLow; emit dtrForceLowChanged(); } }
+
     static QStringList supportedBaudRates();
     static QString cleanPortDisplayName(const QString &name);
 
@@ -88,6 +93,7 @@ class SerialConfiguration : public LinkConfiguration
     void portNameChanged();
     void portDisplayNameChanged();
     void usbDirectChanged();
+    void dtrForceLowChanged();
 
 private:
     qint32 _baud = QSerialPort::Baud57600;
@@ -98,6 +104,7 @@ class SerialConfiguration : public LinkConfiguration
     QString _portName;
     QString _portDisplayName;
     bool _usbDirect = false;
+    bool _dtrForceLow = false;
 };
 
 /*===========================================================================*/
@@ -173,4 +180,5 @@ private slots:
     const SerialConfiguration *_serialConfig = nullptr;
     SerialWorker *_worker = nullptr;
     QThread *_workerThread = nullptr;
+    std::atomic<bool> _disconnectedEmitted{false};
 };
diff --git a/src/Comms/TCPLink.cc b/src/Comms/TCPLink.cc
index 95ace349cf3c..c6dddf1a4ca8 100644
--- a/src/Comms/TCPLink.cc
+++ b/src/Comms/TCPLink.cc
@@ -13,13 +13,15 @@
 
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
+#include <QtNetwork/QHostInfo>
 #include <QtNetwork/QTcpSocket>
 
-QGC_LOGGING_CATEGORY(TCPLinkLog, "qgc.comms.tcplink")
+QGC_LOGGING_CATEGORY(TCPLinkLog, "Comms.TCPLink")
 
 namespace {
-    constexpr int CONNECT_TIMEOUT_MS = 1000;
-    constexpr int TYPE_OF_SERVICE = 32; // Set ToS for low delay
+    constexpr int CONNECT_TIMEOUT_MS = 3000;
+    constexpr int DISCONNECT_TIMEOUT_MS = 3000;
+    constexpr int TYPE_OF_SERVICE = 32; // Set ToS to priority for low delay
 }
 
 /*===========================================================================*/
@@ -27,7 +29,7 @@ namespace {
 TCPConfiguration::TCPConfiguration(const QString &name, QObject *parent)
     : LinkConfiguration(name, parent)
 {
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
 }
 
 TCPConfiguration::TCPConfiguration(const TCPConfiguration *copy, QObject *parent)
@@ -35,21 +37,36 @@ TCPConfiguration::TCPConfiguration(const TCPConfiguration *copy, QObject *parent
     , _host(copy->host())
     , _port(copy->port())
 {
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
 }
 
 TCPConfiguration::~TCPConfiguration()
 {
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
+}
+
+void TCPConfiguration::setHost(const QString &host)
+{
+    const QString cleanHost = host.trimmed();
+    if (cleanHost != _host) {
+        _host = cleanHost;
+        emit hostChanged();
+    }
+}
+
+void TCPConfiguration::setPort(quint16 port)
+{
+    if (port != _port) {
+        _port = port;
+        emit portChanged();
+    }
 }
 
 void TCPConfiguration::copyFrom(const LinkConfiguration *source)
 {
-    Q_ASSERT(source);
     LinkConfiguration::copyFrom(source);
 
-    const TCPConfiguration* const tcpSource = qobject_cast<const TCPConfiguration*>(source);
-    Q_ASSERT(tcpSource);
+    const TCPConfiguration* tcpSource = qobject_cast<const TCPConfiguration*>(source);
 
     setHost(tcpSource->host());
     setPort(tcpSource->port());
@@ -81,14 +98,14 @@ TCPWorker::TCPWorker(const TCPConfiguration *config, QObject *parent)
     : QObject(parent)
     , _config(config)
 {
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
 }
 
 TCPWorker::~TCPWorker()
 {
     disconnectFromHost();
 
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
 }
 
 bool TCPWorker::isConnected() const
@@ -98,8 +115,9 @@ bool TCPWorker::isConnected() const
 
 void TCPWorker::setupSocket()
 {
-    Q_ASSERT(!_socket);
-    _socket = new QTcpSocket(this);
+    if (!_socket) {
+        _socket = new QTcpSocket(this);
+    }
 
     _socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
     _socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
@@ -117,8 +135,8 @@ void TCPWorker::setupSocket()
             qCDebug(TCPLinkLog) << "TCP State Changed:" << state;
         });
 
-        (void) connect(_socket, &QTcpSocket::hostFound, this, []() {
-            qCDebug(TCPLinkLog) << "TCP Host Found";
+        (void) connect(_socket, &QTcpSocket::hostFound, this, [this]() {
+            qCDebug(TCPLinkLog) << "TCP Host Found" << _socket->peerName() << _socket->peerAddress() << _socket->peerPort();
         });
     }
 }
@@ -130,6 +148,11 @@ void TCPWorker::connectToHost()
         return;
     }
 
+    if (_config->host().isEmpty()) {
+        emit errorOccurred(tr("Connection Failed: Host address is empty"));
+        return;
+    }
+
     _errorEmitted = false;
 
     qCDebug(TCPLinkLog) << "Attempting to connect to host:" << _config->host() << "port:" << _config->port();
@@ -138,9 +161,8 @@ void TCPWorker::connectToHost()
     if (!_socket->waitForConnected(CONNECT_TIMEOUT_MS)) {
         qCWarning(TCPLinkLog) << "Connection to" << _config->host() << ":" << _config->port() << "failed:" << _socket->errorString();
 
-        if (!_errorEmitted) {
+        if (!_errorEmitted.exchange(true)) {
             emit errorOccurred(tr("Connection Failed: %1").arg(_socket->errorString()));
-            _errorEmitted = true;
         }
 
         _onSocketDisconnected();
@@ -159,6 +181,10 @@ void TCPWorker::disconnectFromHost()
     qCDebug(TCPLinkLog) << "Attempting to disconnect from host:" << _config->host() << "port:" << _config->port();
 
     _socket->disconnectFromHost();
+
+    if (_socket->state() != QAbstractSocket::UnconnectedState) {
+        _socket->waitForDisconnected(1000);
+    }
 }
 
 void TCPWorker::writeData(const QByteArray &data)
@@ -206,7 +232,9 @@ void TCPWorker::_onSocketDisconnected()
 void TCPWorker::_onSocketReadyRead()
 {
     const QByteArray data = _socket->readAll();
-    emit dataReceived(data);
+    if (!data.isEmpty()) {
+        emit dataReceived(data);
+    }
 }
 
 void TCPWorker::_onSocketBytesWritten(qint64 bytes)
@@ -216,14 +244,11 @@ void TCPWorker::_onSocketBytesWritten(qint64 bytes)
 
 void TCPWorker::_onSocketErrorOccurred(QAbstractSocket::SocketError socketError)
 {
-    Q_UNUSED(socketError);
     const QString errorString = _socket->errorString();
+    qCWarning(TCPLinkLog) << "Socket error:" << socketError << errorString;
 
-    qCWarning(TCPLinkLog) << "Socket error:" << errorString;
-
-    if (!_errorEmitted) {
+    if (!_errorEmitted.exchange(true)) {
         emit errorOccurred(errorString);
-        _errorEmitted = true;
     }
 }
 
@@ -235,7 +260,7 @@ TCPLink::TCPLink(SharedLinkConfigurationPtr &config, QObject *parent)
     , _worker(new TCPWorker(_tcpConfig))
     , _workerThread(new QThread(this))
 {
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
 
     _workerThread->setObjectName(QStringLiteral("TCP_%1").arg(_tcpConfig->name()));
 
@@ -255,19 +280,22 @@ TCPLink::TCPLink(SharedLinkConfigurationPtr &config, QObject *parent)
 
 TCPLink::~TCPLink()
 {
-    TCPLink::disconnect();
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectFromHost", Qt::BlockingQueuedConnection);
+        _onDisconnected();
+    }
 
     _workerThread->quit();
-    if (!_workerThread->wait()) {
+    if (!_workerThread->wait(DISCONNECT_TIMEOUT_MS)) {
         qCWarning(TCPLinkLog) << "Failed to wait for TCP Thread to close";
     }
 
-    // qCDebug(TCPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(TCPLinkLog) << this;
 }
 
 bool TCPLink::isConnected() const
 {
-    return _worker->isConnected();
+    return _worker && _worker->isConnected();
 }
 
 bool TCPLink::_connect()
@@ -277,17 +305,22 @@ bool TCPLink::_connect()
 
 void TCPLink::disconnect()
 {
-    (void) QMetaObject::invokeMethod(_worker, "disconnectFromHost", Qt::QueuedConnection);
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectFromHost", Qt::QueuedConnection);
+    }
 }
 
 void TCPLink::_onConnected()
 {
+    _disconnectedEmitted = false;
     emit connected();
 }
 
 void TCPLink::_onDisconnected()
 {
-    emit disconnected();
+    if (!_disconnectedEmitted.exchange(true)) {
+        emit disconnected();
+    }
 }
 
 void TCPLink::_onErrorOccurred(const QString &errorString)
diff --git a/src/Comms/TCPLink.h b/src/Comms/TCPLink.h
index b77a493551f2..e14e0be30139 100644
--- a/src/Comms/TCPLink.h
+++ b/src/Comms/TCPLink.h
@@ -9,14 +9,15 @@
 
 #pragma once
 
+#include "LinkConfiguration.h"
+#include "LinkInterface.h"
+
 #include <QtCore/QByteArray>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QString>
 #include <QtNetwork/QAbstractSocket>
-#include <QtNetwork/QHostAddress>
 
-#include "LinkConfiguration.h"
-#include "LinkInterface.h"
+#include <atomic>
 
 class QTcpSocket;
 class QThread;
@@ -35,7 +36,7 @@ class TCPConfiguration : public LinkConfiguration
 public:
     explicit TCPConfiguration(const QString &name, QObject *parent = nullptr);
     explicit TCPConfiguration(const TCPConfiguration *copy, QObject *parent = nullptr);
-    virtual ~TCPConfiguration();
+    ~TCPConfiguration() override;
 
     LinkType type() const override { return LinkConfiguration::TypeTcp; }
     void copyFrom(const LinkConfiguration *source) override;
@@ -44,17 +45,17 @@ class TCPConfiguration : public LinkConfiguration
     QString settingsURL() const override { return QStringLiteral("TcpSettings.qml"); }
     QString settingsTitle() const override { return tr("TCP Link Settings"); }
 
-    QString host() const { return _host.toString(); }
-    void setHost(const QString &host) { if (host != _host.toString()) { _host.setAddress(host); emit hostChanged(); } }
+    QString host() const { return _host; }
+    void setHost(const QString &host);
     quint16 port() const { return _port; }
-    void setPort(quint16 port) { if (port != _port) { _port = port; emit portChanged(); } }
+    void setPort(quint16 port);
 
 signals:
     void hostChanged();
     void portChanged();
 
 private:
-    QHostAddress _host;
+    QString _host;
     quint16 _port = 5760;
 };
 
@@ -66,7 +67,7 @@ class TCPWorker : public QObject
 
 public:
     explicit TCPWorker(const TCPConfiguration *config, QObject *parent = nullptr);
-    ~TCPWorker();
+    ~TCPWorker() override;
 
     bool isConnected() const;
 
@@ -93,7 +94,7 @@ private slots:
 private:
     const TCPConfiguration *_config = nullptr;
     QTcpSocket *_socket = nullptr;
-    bool _errorEmitted = false;
+    std::atomic<bool> _errorEmitted{false};
 };
 
 /*===========================================================================*/
@@ -104,7 +105,7 @@ class TCPLink : public LinkInterface
 
 public:
     explicit TCPLink(SharedLinkConfigurationPtr &config, QObject *parent = nullptr);
-    virtual ~TCPLink();
+    ~TCPLink() override;
 
     bool isConnected() const override;
     void disconnect() override;
@@ -124,4 +125,5 @@ private slots:
     const TCPConfiguration *_tcpConfig = nullptr;
     TCPWorker *_worker = nullptr;
     QThread *_workerThread = nullptr;
+    std::atomic<bool> _disconnectedEmitted{false};
 };
diff --git a/src/Comms/UDPLink.cc b/src/Comms/UDPLink.cc
index 34212d889dba..852e7b05c0dc 100644
--- a/src/Comms/UDPLink.cc
+++ b/src/Comms/UDPLink.cc
@@ -21,7 +21,7 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QUdpSocket>
 
-QGC_LOGGING_CATEGORY(UDPLinkLog, "qgc.comms.udplink")
+QGC_LOGGING_CATEGORY(UDPLinkLog, "Comms.UDPLink")
 
 namespace {
     constexpr int BUFFER_TRIGGER_SIZE = 10 * 1024;
@@ -49,7 +49,7 @@ UDPConfiguration::UDPConfiguration(const QString &name, QObject *parent)
 UDPConfiguration::UDPConfiguration(const UDPConfiguration *source, QObject *parent)
     : LinkConfiguration(source, parent)
 {
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(UDPLinkLog) << this;
 
     UDPConfiguration::copyFrom(source);
 }
@@ -58,7 +58,7 @@ UDPConfiguration::~UDPConfiguration()
 {
     _targetHosts.clear();
 
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(UDPLinkLog) << this;
 }
 
 void UDPConfiguration::setAutoConnect(bool autoc)
@@ -68,12 +68,11 @@ void UDPConfiguration::setAutoConnect(bool autoc)
         const QString targetHostIP = settings->udpTargetHostIP()->rawValue().toString();
         const quint16 targetHostPort = settings->udpTargetHostPort()->rawValue().toUInt();
         if (autoc) {
-            setLocalPort(settings->udpListenPort()->rawValue().toInt());    
+            setLocalPort(settings->udpListenPort()->rawValue().toInt());
             if (!targetHostIP.isEmpty()) {
                 addHost(targetHostIP, targetHostPort);
             }
-        }
-        else {
+        } else {
             setLocalPort(0);
             if (!targetHostIP.isEmpty()) {
                 removeHost(targetHostIP, targetHostPort);
@@ -85,11 +84,9 @@ void UDPConfiguration::setAutoConnect(bool autoc)
 
 void UDPConfiguration::copyFrom(const LinkConfiguration *source)
 {
-    Q_ASSERT(source);
     LinkConfiguration::copyFrom(source);
 
-    const UDPConfiguration *const udpSource = qobject_cast<const UDPConfiguration*>(source);
-    Q_ASSERT(udpSource);
+    const UDPConfiguration *udpSource = qobject_cast<const UDPConfiguration*>(source);
 
     setLocalPort(udpSource->localPort());
     _targetHosts.clear();
@@ -269,14 +266,14 @@ UDPWorker::UDPWorker(const UDPConfiguration *config, QObject *parent)
     : QObject(parent)
     , _udpConfig(config)
 {
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(UDPLinkLog) << this;
 }
 
 UDPWorker::~UDPWorker()
 {
     disconnectLink();
 
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(UDPLinkLog) << this;
 }
 
 bool UDPWorker::isConnected() const
@@ -286,8 +283,9 @@ bool UDPWorker::isConnected() const
 
 void UDPWorker::setupSocket()
 {
-    Q_ASSERT(!_socket);
-    _socket = new QUdpSocket(this);
+    if (!_socket) {
+        _socket = new QUdpSocket(this);
+    }
 
     const QList<QHostAddress> localAddresses = QNetworkInterface::allAddresses();
     _localAddresses = QSet(localAddresses.constBegin(), localAddresses.constEnd());
@@ -366,11 +364,16 @@ void UDPWorker::disconnectLink()
     _deregisterZeroconf();
 #endif
 
-    if (isConnected()) {
-        (void) _socket->leaveMulticastGroup(_multicastGroup);
-        _socket->close();
+    if (!isConnected()) {
+        qCDebug(UDPLinkLog) << "Already disconnected";
+        return;
     }
 
+    qCDebug(UDPLinkLog) << "Disconnecting UDP link";
+
+    (void) _socket->leaveMulticastGroup(_multicastGroup);
+    _socket->close();
+
     _sessionTargets.clear();
 }
 
@@ -493,8 +496,6 @@ void UDPWorker::_zeroconfRegisterCallback(DNSServiceRef sdRef, DNSServiceFlags f
 {
     Q_UNUSED(sdRef); Q_UNUSED(flags); Q_UNUSED(name); Q_UNUSED(regtype); Q_UNUSED(domain);
 
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO;
-
     UDPWorker *const worker = static_cast<UDPWorker*>(context);
     if (errorCode != kDNSServiceErr_NoError) {
         emit worker->errorOccurred(tr("Zeroconf Register Error: %1").arg(errorCode));
@@ -564,7 +565,7 @@ UDPLink::UDPLink(SharedLinkConfigurationPtr &config, QObject *parent)
     , _worker(new UDPWorker(_udpConfig))
     , _workerThread(new QThread(this))
 {
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(UDPLinkLog) << this;
 
     _workerThread->setObjectName(QStringLiteral("UDP_%1").arg(_udpConfig->name()));
 
@@ -584,19 +585,22 @@ UDPLink::UDPLink(SharedLinkConfigurationPtr &config, QObject *parent)
 
 UDPLink::~UDPLink()
 {
-    UDPLink::disconnect();
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectLink", Qt::BlockingQueuedConnection);
+        _onDisconnected();
+    }
 
     _workerThread->quit();
     if (!_workerThread->wait()) {
         qCWarning(UDPLinkLog) << "Failed to wait for UDP Thread to close";
     }
 
-    // qCDebug(UDPLinkLog) << Q_FUNC_INFO << this;
+    qCDebug(UDPLinkLog) << this;
 }
 
 bool UDPLink::isConnected() const
 {
-    return _worker->isConnected();
+    return _worker && _worker->isConnected();
 }
 
 bool UDPLink::_connect()
@@ -606,17 +610,22 @@ bool UDPLink::_connect()
 
 void UDPLink::disconnect()
 {
-    (void) QMetaObject::invokeMethod(_worker, "disconnectLink", Qt::QueuedConnection);
+    if (isConnected()) {
+        (void) QMetaObject::invokeMethod(_worker, "disconnectLink", Qt::QueuedConnection);
+    }
 }
 
 void UDPLink::_onConnected()
 {
+    _disconnectedEmitted = false;
     emit connected();
 }
 
 void UDPLink::_onDisconnected()
 {
-    emit disconnected();
+    if (!_disconnectedEmitted.exchange(true)) {
+        emit disconnected();
+    }
 }
 
 void UDPLink::_onErrorOccurred(const QString &errorString)
diff --git a/src/Comms/UDPLink.h b/src/Comms/UDPLink.h
index 6643af1e5cdb..472c7e40053e 100644
--- a/src/Comms/UDPLink.h
+++ b/src/Comms/UDPLink.h
@@ -9,6 +9,9 @@
 
 #pragma once
 
+#include "LinkConfiguration.h"
+#include "LinkInterface.h"
+
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
 #include <QtCore/QLoggingCategory>
@@ -16,6 +19,8 @@
 #include <QtCore/QString>
 #include <QtNetwork/QHostAddress>
 
+#include <atomic>
+
 #ifdef QGC_ZEROCONF_ENABLED
 #ifdef Q_OS_WIN
 #define WIN32_LEAN_AND_MEAN
@@ -23,9 +28,6 @@
 #include <dns_sd.h>
 #endif
 
-#include "LinkConfiguration.h"
-#include "LinkInterface.h"
-
 class QUdpSocket;
 class QThread;
 
@@ -189,4 +191,5 @@ private slots:
     const UDPConfiguration *_udpConfig = nullptr;
     UDPWorker *_worker = nullptr;
     QThread *_workerThread = nullptr;
+    std::atomic<bool> _disconnectedEmitted{false};
 };
diff --git a/src/Comms/USBBoardInfo.json b/src/Comms/USBBoardInfo.json
index 52b137b9dd29..e3945b9b0a08 100644
--- a/src/Comms/USBBoardInfo.json
+++ b/src/Comms/USBBoardInfo.json
@@ -24,6 +24,7 @@
         { "vendorID": 9900, "productID": 1,         "boardClass": "Pixhawk",    "name": "Omnibus F4 SD" },
         { "vendorID": 8137, "productID": 28,        "boardClass": "Pixhawk",    "name": "PX4 FMUK66 v3.x" },
         { "vendorID": 8137, "productID": 36,        "boardClass": "Pixhawk",    "name": "Tropic-Community VMU" },
+        { "vendorID": 8137, "productID": 37,        "boardClass": "Pixhawk",    "name": "MR-TROPIC" },
         { "vendorID": 1155, "productID": 41775,     "boardClass": "Pixhawk",    "name": "PX4 FMU ModalAI FCv1" },
         { "vendorID": 1155, "productID": 41776,     "boardClass": "Pixhawk",    "name": "PX4 FMU ModalAI FCv2" },
         { "vendorID":12642, "productID": 75,        "boardClass": "Pixhawk",    "name": "PX4 DurandalV1" },
@@ -54,6 +55,8 @@
         { "vendorID": 9900, "productID": 4132,      "boardClass": "Pixhawk",    "name": "mRo Control Zero H7 OEM" },
         { "vendorID": 9900, "productID": 4388,      "boardClass": "Pixhawk",    "name": "3DR Control Zero H7 OEM Rev G" },
 
+        { "vendorID": 2106, "productID": 7120,      "boardClass": "Pixhawk",    "name": "PX4 Accton Godwit GA1" },
+
         { "vendorID": 1027, "productID": 24597,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "3DR Radio" },
         { "vendorID": 4292, "productID": 60000,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "SILabs Radio" },
         { "vendorID": 12346, "productID": 4097,     "boardClass": "SiK Radio",  "name": "DroneBridge Radio",    "comment": "ESP32-based telemetry radio" },
@@ -66,12 +69,15 @@
         { "vendorID": 8352, "productID": 16733,     "boardClass": "OpenPilot",  "name": "OpenPilot CC3D" },
         { "vendorID": 8352, "productID": 16734,     "boardClass": "OpenPilot",  "name": "OpenPilot Revolution" },
         { "vendorID": 8352, "productID": 16848,     "boardClass": "OpenPilot",  "name": "Taulabs Sparky2" },
-        { "vendorID": 13891, "productID": 5600,     "boardClass": "Pixhawk",    "name": "ZeroOne X6" }
+        { "vendorID": 13891, "productID": 5600,     "boardClass": "Pixhawk",    "name": "ZeroOne X6" },
+        { "vendorID": 8355, "productID": 16888,     "boardClass": "Pixhawk",    "name": "Svehicle e2" }
     ],
 
     "boardDescriptionFallback": [
         { "regExp": "^ZeroOne x6.x$",       "boardClass": "Pixhawk" },
         { "regExp": "^ZeroOne BL x6.x$",    "boardClass": "Pixhawk" },
+        { "regExp": "^Svehicle e2.x$",      "boardClass": "Pixhawk" },
+        { "regExp": "^Svehicle BL e2.x$",   "boardClass": "Pixhawk" },
         { "regExp": "^PX4 FMU v6U.x$",      "boardClass": "Pixhawk" },
         { "regExp": "^PX4 BL FMU v6U.x$",   "boardClass": "Pixhawk" },
         { "regExp": "^PX4 FMU v6X.x$",      "boardClass": "Pixhawk" },
@@ -111,6 +117,8 @@
         { "regExp": "^ARK Pi6X.x$",         "boardClass": "Pixhawk" },
         { "regExp": "^ARK BL Pi6X.x$",      "boardClass": "Pixhawk" },
         { "regExp": "^PX4 TROPIC Community","boardClass": "Pixhawk" },
+        { "regExp": "^PX4 MR-TROPIC",       "boardClass": "Pixhawk" },
+        { "regExp": "^PX4 BL MR-TROPIC",    "boardClass": "Pixhawk" },
         { "regExp": "^FT231X USB UART$",    "boardClass": "SiK Radio" },
         { "regExp": "USB UART$",            "boardClass": "SiK Radio",  "androidOnly": true, "comment": "Very broad fallback, too dangerous for non-android" }
     ],
diff --git a/src/Comms/UdpIODevice.cc b/src/Comms/UdpIODevice.cc
index a96114744c69..8c256fe8f9a4 100644
--- a/src/Comms/UdpIODevice.cc
+++ b/src/Comms/UdpIODevice.cc
@@ -10,7 +10,7 @@
 #include "UdpIODevice.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(UdpIODeviceLog, "qgc.comms.udpiodevice")
+QGC_LOGGING_CATEGORY(UdpIODeviceLog, "Comms.UdpIODevice")
 
 UdpIODevice::UdpIODevice(QObject *parent)
     : QUdpSocket(parent)
diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt
index dd4efa68c7ff..7f3ec2802efd 100644
--- a/src/FactSystem/CMakeLists.txt
+++ b/src/FactSystem/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Fact System Module
+# Parameter management and data binding infrastructure
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         Fact.cc
@@ -20,4 +25,7 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Fact Controls UI
+# ----------------------------------------------------------------------------
 add_subdirectory(FactControls)
diff --git a/src/FactSystem/Fact.cc b/src/FactSystem/Fact.cc
index 8f81464bb50e..564ed097787d 100644
--- a/src/FactSystem/Fact.cc
+++ b/src/FactSystem/Fact.cc
@@ -12,8 +12,9 @@
 #include "QGCApplication.h"
 #include "QGCCorePlugin.h"
 #include "QGCLoggingCategory.h"
+#include "SettingsManager.h"
 
-QGC_LOGGING_CATEGORY(FactLog, "qgc.factsystem.fact")
+QGC_LOGGING_CATEGORY(FactLog, "FactSystem.Fact")
 
 Fact::Fact(QObject *parent)
     : QObject(parent)
@@ -48,9 +49,17 @@ Fact::Fact(const QString& settingsGroup, FactMetaData *metaData, QObject *parent
 {
     // qCDebug(FactLog) << Q_FUNC_INFO << this;
 
-    QGCCorePlugin::instance()->adjustSettingMetaData(settingsGroup, *metaData);
+    bool visible = true;
+    SettingsManager::adjustSettingMetaData(settingsGroup, *metaData, visible);
     setMetaData(metaData, true /* setDefaultFromMetaData */);
 
+    if (!qgcApp()->runningUnitTests()) {
+        if (metaData->defaultValueAvailable() && !visible) {
+            // If setting is not visible, we force to default value
+            _rawValue = metaData->rawDefaultValue();
+        }
+    }
+
     _init();
 }
 
@@ -312,16 +321,29 @@ QStringList Fact::selectedBitmaskStrings() const
 
 QString Fact::_variantToString(const QVariant &variant, int decimalPlaces) const
 {
+    if (!variant.isValid()) {
+        return invalidValueString(decimalPlaces);
+    }
+
     QString valueString;
 
+    const auto stripNegativeZero = [](QString &candidate) {
+        static const QRegularExpression reNegativeZero(QStringLiteral("^-0\\.0+$"));
+        const auto match = reNegativeZero.match(candidate);
+        if (match.hasMatch() || candidate == QStringLiteral("-0")) {
+            candidate = candidate.mid(1);
+        }
+    };
+
     switch (type()) {
     case FactMetaData::valueTypeFloat:
     {
         const float fValue = variant.toFloat();
         if (qIsNaN(fValue)) {
-            valueString = QStringLiteral("--.--");
+            valueString = invalidValueString(decimalPlaces);
         } else {
             valueString = QStringLiteral("%1").arg(fValue, 0, 'f', decimalPlaces);
+            stripNegativeZero(valueString);
         }
     }
         break;
@@ -329,9 +351,10 @@ QString Fact::_variantToString(const QVariant &variant, int decimalPlaces) const
     {
         const double dValue = variant.toDouble();
         if (qIsNaN(dValue)) {
-            valueString = QStringLiteral("--.--");
+            valueString = invalidValueString(decimalPlaces);
         } else {
             valueString = QStringLiteral("%1").arg(dValue, 0, 'f', decimalPlaces);
+            stripNegativeZero(valueString);
         }
         break;
     }
@@ -342,7 +365,7 @@ QString Fact::_variantToString(const QVariant &variant, int decimalPlaces) const
     {
         const double dValue = variant.toDouble();
         if (qIsNaN(dValue)) {
-            valueString = QStringLiteral("--:--:--");
+            valueString = invalidValueString(decimalPlaces);
         } else {
             QTime time(0, 0, 0, 0);
             time = time.addSecs(dValue);
@@ -358,6 +381,22 @@ QString Fact::_variantToString(const QVariant &variant, int decimalPlaces) const
     return valueString;
 }
 
+QString Fact::invalidValueString(int decimalPlaces) const {
+    switch (type()) {
+    case FactMetaData::valueTypeFloat:
+    case FactMetaData::valueTypeDouble:
+        if (decimalPlaces <= 0) {
+            return QStringLiteral("--");
+        }
+        return QStringLiteral("--.") +
+               QString(decimalPlaces, QLatin1Char('-'));
+    case FactMetaData::valueTypeElapsedTimeInSeconds:
+        return QStringLiteral("--:--:--");
+    default:
+        return QStringLiteral("--");
+    }
+}
+
 QString Fact::rawValueStringFullPrecision() const
 {
     return _variantToString(rawValue(), 18);
diff --git a/src/FactSystem/Fact.h b/src/FactSystem/Fact.h
index 922e0681dd03..ab6409d0931f 100644
--- a/src/FactSystem/Fact.h
+++ b/src/FactSystem/Fact.h
@@ -56,6 +56,7 @@ class Fact : public QObject
     Q_PROPERTY(QVariant     value                   READ cookedValue                WRITE setCookedValue        NOTIFY valueChanged)
     Q_PROPERTY(QVariant     rawValue                READ rawValue                   WRITE setRawValue           NOTIFY rawValueChanged)
     Q_PROPERTY(bool         valueEqualsDefault      READ valueEqualsDefault                                     NOTIFY valueChanged)
+    Q_PROPERTY(QString      invalidValueString      READ invalidValueString                                     CONSTANT)
     Q_PROPERTY(QString      valueString             READ cookedValueString                                      NOTIFY valueChanged)
     Q_PROPERTY(QString      enumOrValueString       READ enumOrValueString                                      NOTIFY valueChanged)
     Q_PROPERTY(double       increment               READ cookedIncrement                                        CONSTANT)
@@ -71,7 +72,7 @@ class Fact : public QObject
     explicit Fact(int componentId, const QString &name, FactMetaData::ValueType_t type, QObject *parent = nullptr);
     explicit Fact(const Fact &other, QObject *parent = nullptr);
 
-    /// Creates a Fact using the name and type from metaData. Also calls QGCCorePlugin::adjustSettingsMetaData allowing
+    /// Creates a Fact using the name and type from metaData. Also calls SettingsManager::adjustSettingMetaData allowing
     /// custom builds to override the metadata.
     explicit Fact(const QString &settingsGroup, FactMetaData *metaData, QObject *parent = nullptr);
     virtual ~Fact();
@@ -116,6 +117,8 @@ class Fact : public QObject
     FactMetaData::ValueType_t type() const { return _type; }
     QString cookedUnits() const;
     QString rawUnits() const;
+    QString invalidValueString(int decimalPlaces) const;
+    QString invalidValueString() const { return invalidValueString(decimalPlaces()); }
     QString rawValueString() const;
     QString cookedValueString() const;
     bool valueEqualsDefault() const;
@@ -191,7 +194,7 @@ class Fact : public QObject
 
     QString _name;
     int _componentId = -1;
-    QVariant _rawValue = 0;
+    QVariant _rawValue; // QVariant::Invalid
     FactMetaData::ValueType_t _type = FactMetaData::valueTypeInt32;
     FactMetaData *_metaData = nullptr;
     bool _sendValueChangedSignals = true;
diff --git a/src/FactSystem/FactControls/FactPanelController.cc b/src/FactSystem/FactControls/FactPanelController.cc
index 89c69efb789b..864ecc6b71a3 100644
--- a/src/FactSystem/FactControls/FactPanelController.cc
+++ b/src/FactSystem/FactControls/FactPanelController.cc
@@ -17,7 +17,7 @@
 
 #include <QtQml/QQmlEngine>
 
-QGC_LOGGING_CATEGORY(FactPanelControllerLog, "qgc.factsystem.factcontrols.factpanelcontroller")
+QGC_LOGGING_CATEGORY(FactPanelControllerLog, "FactSystem.FactPanelController")
 
 FactPanelController::FactPanelController(QObject *parent)
     : QObject(parent)
diff --git a/src/FactSystem/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml
index 32c85c7f6cdc..6884f22c8a9d 100644
--- a/src/FactSystem/FactControls/FactTextField.qml
+++ b/src/FactSystem/FactControls/FactTextField.qml
@@ -21,7 +21,7 @@ QGCTextField {
     property Fact fact: null
 
     onEditingFinished: _onEditingFinished()
-    
+
     function _onEditingFinished() {
         var errorString = fact.validate(text, false /* convertOnly */)
         if (errorString === "") {
diff --git a/src/FactSystem/FactControls/FactTextFieldGrid.qml b/src/FactSystem/FactControls/FactTextFieldGrid.qml
index 38ef9c992d58..edaa9ced24c2 100644
--- a/src/FactSystem/FactControls/FactTextFieldGrid.qml
+++ b/src/FactSystem/FactControls/FactTextFieldGrid.qml
@@ -16,7 +16,7 @@ GridLayout {
     Repeater {
         model: parent.factList
 
-        QGCLabel { 
+        QGCLabel {
             text: {
                 if (factLabels) {
                     return factLabels[index]
diff --git a/src/FactSystem/FactControls/LabelledFactComboBox.qml b/src/FactSystem/FactControls/LabelledFactComboBox.qml
index 93e08a5eb9ab..f865ed96880a 100644
--- a/src/FactSystem/FactControls/LabelledFactComboBox.qml
+++ b/src/FactSystem/FactControls/LabelledFactComboBox.qml
@@ -28,7 +28,7 @@ RowLayout {
     signal activated(int index)
 
     QGCLabel {
-        id:                 label  
+        id:                 label
         Layout.fillWidth:   true
     }
 
@@ -36,8 +36,7 @@ RowLayout {
         id:                     _comboBox
         Layout.preferredWidth:  comboBoxPreferredWidth
         sizeToContents:         true
-        
+
         onActivated: (index) => { parent.activated(index) }
     }
 }
-
diff --git a/src/FactSystem/FactControls/LabelledFactLabel.qml b/src/FactSystem/FactControls/LabelledFactLabel.qml
index 13ab54a19a21..ed020983ded5 100644
--- a/src/FactSystem/FactControls/LabelledFactLabel.qml
+++ b/src/FactSystem/FactControls/LabelledFactLabel.qml
@@ -12,7 +12,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-import QGroundControl.ScreenTools
 
 import QGroundControl.FactControls
 
@@ -35,4 +34,3 @@ RowLayout {
         Layout.preferredWidth:  labelPreferredWidth
     }
 }
-
diff --git a/src/FactSystem/FactControls/LabelledFactTextField.qml b/src/FactSystem/FactControls/LabelledFactTextField.qml
index 9491f55596a2..320526195dd9 100644
--- a/src/FactSystem/FactControls/LabelledFactTextField.qml
+++ b/src/FactSystem/FactControls/LabelledFactTextField.qml
@@ -37,4 +37,3 @@ RowLayout {
         Layout.preferredWidth:  textFieldPreferredWidth
     }
 }
-
diff --git a/src/FactSystem/FactGroup.cc b/src/FactSystem/FactGroup.cc
index a3931d760a11..d330444a1554 100644
--- a/src/FactSystem/FactGroup.cc
+++ b/src/FactSystem/FactGroup.cc
@@ -10,7 +10,7 @@
 #include "FactGroup.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(FactGroupLog, "qgc.factsystem.factgroup")
+QGC_LOGGING_CATEGORY(FactGroupLog, "FactSystem.FactGroup")
 
 FactGroup::FactGroup(int updateRateMsecs, const QString &metaDataFile, QObject *parent, bool ignoreCamelCase)
     : QObject(parent)
diff --git a/src/FactSystem/FactMetaData.cc b/src/FactSystem/FactMetaData.cc
index c1048b53478f..3b816681f010 100644
--- a/src/FactSystem/FactMetaData.cc
+++ b/src/FactSystem/FactMetaData.cc
@@ -16,7 +16,7 @@
 
 #include <QtCore/QtMath>
 
-QGC_LOGGING_CATEGORY(FactMetaDataLog, "qgc.factsystem.factmetadata")
+QGC_LOGGING_CATEGORY(FactMetaDataLog, "FactSystem.FactMetaData")
 
 // Built in translations for all Facts
 const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[] = {
diff --git a/src/FactSystem/FactMetaData.h b/src/FactSystem/FactMetaData.h
index 0db8fc74d7a0..11b89f90e349 100644
--- a/src/FactSystem/FactMetaData.h
+++ b/src/FactSystem/FactMetaData.h
@@ -19,6 +19,8 @@
 
 Q_DECLARE_LOGGING_CATEGORY(FactMetaDataLog)
 
+class SettingsManager;
+
 /// Holds the meta data associated with a Fact. This is kept in a separate object from the Fact itself
 /// since you may have multiple instances of the same Fact. But there is only ever one FactMetaData
 /// instance or each Fact.
@@ -26,6 +28,9 @@ class FactMetaData : public QObject
 {
     Q_OBJECT
     QML_ELEMENT
+
+    friend class SettingsManager;
+
 public:
     enum ValueType_t {
         valueTypeUint8,
diff --git a/src/FactSystem/FactValueSliderListModel.cc b/src/FactSystem/FactValueSliderListModel.cc
index ee0e1f168e1f..eb844a44367b 100644
--- a/src/FactSystem/FactValueSliderListModel.cc
+++ b/src/FactSystem/FactValueSliderListModel.cc
@@ -13,7 +13,7 @@
 
 #include <QtCore/QtMath>
 
-QGC_LOGGING_CATEGORY(FactValueSliderListModelLog, "qgc.factsystem.factvaluesliderlistmodel")
+QGC_LOGGING_CATEGORY(FactValueSliderListModelLog, "FactSystem.FactValueSliderListModel")
 
 FactValueSliderListModel::FactValueSliderListModel(const Fact &fact, QObject *parent)
     : QAbstractListModel(parent)
diff --git a/src/FactSystem/ParameterManager.cc b/src/FactSystem/ParameterManager.cc
index 9f44e8bf0666..0adb1c2fd38c 100644
--- a/src/FactSystem/ParameterManager.cc
+++ b/src/FactSystem/ParameterManager.cc
@@ -19,22 +19,25 @@
 #include "QGCApplication.h"
 #include "QGCLoggingCategory.h"
 #include "Vehicle.h"
+#include "QGCStateMachine.h"
+#include "MultiVehicleManager.h"
 
 #include <QtCore/QEasingCurve>
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QVariantAnimation>
 
-QGC_LOGGING_CATEGORY(ParameterManagerLog, "qgc.factsystem.parametermanager")
-QGC_LOGGING_CATEGORY(ParameterManagerVerbose1Log, "qgc.factsystem.parametermanager1:verbose")
-QGC_LOGGING_CATEGORY(ParameterManagerVerbose2Log, "qgc.factsystem.parametermanager2:verbose")
-QGC_LOGGING_CATEGORY(ParameterManagerDebugCacheFailureLog, "qgc.factsystem.parametermanager.debugcachefailure") // Turn on to debug parameter cache crc misses
+QGC_LOGGING_CATEGORY(ParameterManagerLog, "FactSystem.ParameterManager")
+QGC_LOGGING_CATEGORY(ParameterManagerVerbose1Log, "FactSystem.ParameterManager:verbose1")
+QGC_LOGGING_CATEGORY(ParameterManagerVerbose2Log, "FactSystem.ParameterManager:verbose2")
+QGC_LOGGING_CATEGORY(ParameterManagerDebugCacheFailureLog, "FactSystem.ParameterManager:debugCacheFailure") // Turn on to debug parameter cache crc misses
 
 ParameterManager::ParameterManager(Vehicle *vehicle)
     : QObject(vehicle)
     , _vehicle(vehicle)
     , _logReplay(!vehicle->vehicleLinkManager()->primaryLink().expired() && vehicle->vehicleLinkManager()->primaryLink().lock()->isLogReplay())
     , _tryftp(vehicle->apmFirmware())
+    , _disableAllRetries(_logReplay)
 {
     qCDebug(ParameterManagerLog) << this;
 
@@ -43,13 +46,19 @@ ParameterManager::ParameterManager(Vehicle *vehicle)
         return;
     }
 
+    if (_logReplay) {
+        qCDebug(ParameterManagerLog) << this << "In log replay mode";
+    }
+
     _initialRequestTimeoutTimer.setSingleShot(true);
     _initialRequestTimeoutTimer.setInterval(5000);
     (void) connect(&_initialRequestTimeoutTimer, &QTimer::timeout, this, &ParameterManager::_initialRequestTimeout);
 
     _waitingParamTimeoutTimer.setSingleShot(true);
     _waitingParamTimeoutTimer.setInterval(3000);
-    (void) connect(&_waitingParamTimeoutTimer, &QTimer::timeout, this, &ParameterManager::_waitingParamTimeout);
+    if (!_logReplay) {
+        (void) connect(&_waitingParamTimeoutTimer, &QTimer::timeout, this, &ParameterManager::_waitingParamTimeout);
+    }
 
     // Ensure the cache directory exists
     (void) QFileInfo(QSettings().fileName()).dir().mkdir("ParamCache");
@@ -63,18 +72,11 @@ ParameterManager::~ParameterManager()
 void ParameterManager::_updateProgressBar()
 {
     int waitingReadParamIndexCount = 0;
-    int waitingReadParamNameCount = 0;
     int waitingWriteParamCount = 0;
 
     for (const int compId: _waitingReadParamIndexMap.keys()) {
         waitingReadParamIndexCount += _waitingReadParamIndexMap[compId].count();
     }
-    for (const int compId: _waitingReadParamNameMap.keys()) {
-        waitingReadParamNameCount += _waitingReadParamNameMap[compId].count();
-    }
-    for (const int compId: _waitingWriteParamNameMap.keys()) {
-        waitingWriteParamCount += _waitingWriteParamNameMap[compId].count();
-    }
 
     if (waitingReadParamIndexCount == 0) {
         if (_readParamIndexProgressActive) {
@@ -87,37 +89,8 @@ void ParameterManager::_updateProgressBar()
         _setLoadProgress(static_cast<double>(_totalParamCount - waitingReadParamIndexCount) / static_cast<double>(_totalParamCount));
         return;
     }
-
-    if (waitingWriteParamCount == 0) {
-        if (_writeParamProgressActive) {
-            _writeParamProgressActive = false;
-            _waitingWriteParamBatchCount = 0;
-            _setLoadProgress(0.0);
-            emit pendingWritesChanged(false);
-            return;
-        }
-    } else {
-        _writeParamProgressActive = true;
-        _setLoadProgress(static_cast<double>(qMax(_waitingWriteParamBatchCount - waitingWriteParamCount, 1)) / static_cast<double>(_waitingWriteParamBatchCount + 1));
-        emit pendingWritesChanged(true);
-        return;
-    }
-
-    if (waitingReadParamNameCount == 0) {
-        if (_readParamNameProgressActive) {
-            _readParamNameProgressActive = false;
-            _waitingReadParamNameBatchCount = 0;
-            _setLoadProgress(0.0);
-            return;
-        }
-    } else {
-        _readParamNameProgressActive = true;
-        _setLoadProgress(static_cast<double>(qMax(_waitingReadParamNameBatchCount - waitingReadParamNameCount, 1)) / static_cast<double>(_waitingReadParamNameBatchCount + 1));
-        return;
-    }
 }
 
-
 void ParameterManager::mavlinkMessageReceived(const mavlink_message_t &message)
 {
     if (_tryftp && (message.compid == MAV_COMP_ID_AUTOPILOT1) && !_initialLoadComplete)
@@ -137,32 +110,8 @@ void ParameterManager::mavlinkMessageReceived(const mavlink_message_t &message)
         paramUnion.type = param_value.param_type;
 
         QVariant parameterValue;
-
-        switch (paramUnion.type) {
-        case MAV_PARAM_TYPE_REAL32:
-            parameterValue = QVariant(paramUnion.param_float);
-            break;
-        case MAV_PARAM_TYPE_UINT8:
-            parameterValue = QVariant(paramUnion.param_uint8);
-            break;
-        case MAV_PARAM_TYPE_INT8:
-            parameterValue = QVariant(paramUnion.param_int8);
-            break;
-        case MAV_PARAM_TYPE_UINT16:
-            parameterValue = QVariant(paramUnion.param_uint16);
-            break;
-        case MAV_PARAM_TYPE_INT16:
-            parameterValue = QVariant(paramUnion.param_int16);
-            break;
-        case MAV_PARAM_TYPE_UINT32:
-            parameterValue = QVariant(paramUnion.param_uint32);
-            break;
-        case MAV_PARAM_TYPE_INT32:
-            parameterValue = QVariant(paramUnion.param_int32);
-            break;
-        default:
-            qCCritical(ParameterManagerLog) << "ParameterManager::_handleParamValue - unsupported MAV_PARAM_TYPE" << paramUnion.type;
-            break;
+        if (!_mavlinkParamUnionToVariant(paramUnion, parameterValue)) {
+            return;
         }
 
         _handleParamValue(message.compid, parameterName, param_value.param_count, param_value.param_index, static_cast<MAV_PARAM_TYPE>(param_value.param_type), parameterValue);
@@ -184,7 +133,7 @@ void ParameterManager::_handleParamValue(int componentId, const QString &paramet
     // ArduPilot has this strange behavior of streaming parameters that we didn't ask for. This even happens before it responds to the
     // PARAM_REQUEST_LIST. We disregard any of this until the initial request is responded to.
     if ((parameterIndex == 65535) && (parameterName != QStringLiteral("_HASH_CHECK")) && _initialRequestTimeoutTimer.isActive()) {
-        qCDebug(ParameterManagerVerbose1Log) << "Disregarding unrequested param prior to initial list response" << parameterName;
+        qCDebug(ParameterManagerLog) << "Disregarding unrequested param prior to initial list response" << parameterName;
         return;
     }
 
@@ -232,16 +181,10 @@ void ParameterManager::_handleParamValue(int componentId, const QString &paramet
             _waitingReadParamIndexMap[componentId][waitingIndex] = 0;
         }
 
-        // The read and write waiting lists for this component are initialized the empty
-        _waitingReadParamNameMap[componentId] = QMap<QString, int>();
-        _waitingWriteParamNameMap[componentId] = QMap<QString, int>();
-
         qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "Seeing component for first time - paramcount:" << parameterCount;
     }
 
-    if (!_waitingReadParamIndexMap[componentId].contains(parameterIndex) &&
-            !_waitingReadParamNameMap[componentId].contains(parameterName) &&
-            !_waitingWriteParamNameMap[componentId].contains(parameterName)) {
+    if (!_waitingReadParamIndexMap[componentId].contains(parameterIndex)) {
         qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "Unrequested param update" << parameterName;
     }
 
@@ -252,22 +195,8 @@ void ParameterManager::_handleParamValue(int componentId, const QString &paramet
         _fillIndexBatchQueue(false /* waitingParamTimeout */);
     }
 
-    (void) _waitingReadParamNameMap[componentId].remove(parameterName);
-    (void) _waitingWriteParamNameMap[componentId].remove(parameterName);
-    if (!_waitingReadParamIndexMap[componentId].isEmpty()) {
-        qCDebug(ParameterManagerVerbose2Log) << _logVehiclePrefix(componentId) << "_waitingReadParamIndexMap:" << _waitingReadParamIndexMap[componentId];
-    }
-    if (!_waitingReadParamNameMap[componentId].isEmpty()) {
-        qCDebug(ParameterManagerVerbose2Log) << _logVehiclePrefix(componentId) << "_waitingReadParamNameMap" << _waitingReadParamNameMap[componentId];
-    }
-    if (!_waitingWriteParamNameMap[componentId].isEmpty()) {
-        qCDebug(ParameterManagerVerbose2Log) << _logVehiclePrefix(componentId) << "_waitingWriteParamNameMap" << _waitingWriteParamNameMap[componentId];
-    }
-
     // Track how many parameters we are still waiting for
     int waitingReadParamIndexCount = 0;
-    int waitingReadParamNameCount = 0;
-    int waitingWriteParamNameCount = 0;
 
     for (const int waitingComponentId: _waitingReadParamIndexMap.keys()) {
         waitingReadParamIndexCount += _waitingReadParamIndexMap[waitingComponentId].count();
@@ -276,22 +205,8 @@ void ParameterManager::_handleParamValue(int componentId, const QString &paramet
         qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingReadParamIndexCount:" << waitingReadParamIndexCount;
     }
 
-    for (const int waitingComponentId: _waitingReadParamNameMap.keys()) {
-        waitingReadParamNameCount += _waitingReadParamNameMap[waitingComponentId].count();
-    }
-    if (waitingReadParamNameCount) {
-        qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingReadParamNameCount:" << waitingReadParamNameCount;
-    }
-
-    for (const int waitingComponentId: _waitingWriteParamNameMap.keys()) {
-        waitingWriteParamNameCount += _waitingWriteParamNameMap[waitingComponentId].count();
-    }
-    if (waitingWriteParamNameCount) {
-        qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "waitingWriteParamNameCount:" << waitingWriteParamNameCount;
-    }
-
-    const int readWaitingParamCount = waitingReadParamIndexCount + waitingReadParamNameCount;
-    const int totalWaitingParamCount = readWaitingParamCount + waitingWriteParamNameCount;
+    const int readWaitingParamCount = waitingReadParamIndexCount;
+    const int totalWaitingParamCount = readWaitingParamCount;
     if (totalWaitingParamCount) {
         // More params to wait for, restart timer
         _waitingParamTimeoutTimer.start();
@@ -330,39 +245,239 @@ void ParameterManager::_handleParamValue(int componentId, const QString &paramet
     // which invalidate the cache. The Solo also streams param updates in flight for things like gimbal values
     // which in turn causes a perf problem with all the param cache updates.
     if (!_logReplay && _vehicle->px4Firmware()) {
-        if (((_prevWaitingReadParamIndexCount + _prevWaitingReadParamNameCount) != 0) && (readWaitingParamCount == 0)) {
+        if (_prevWaitingReadParamIndexCount != 0 && readWaitingParamCount == 0) {
             // All reads just finished, update the cache
             _writeLocalParamCache(_vehicle->id(), componentId);
         }
     }
 
     _prevWaitingReadParamIndexCount = waitingReadParamIndexCount;
-    _prevWaitingReadParamNameCount = waitingReadParamNameCount;
-    _prevWaitingWriteParamNameCount = waitingWriteParamNameCount;
 
     _checkInitialLoadComplete();
 
     qCDebug(ParameterManagerVerbose1Log) << _logVehiclePrefix(componentId) << "_parameterUpdate complete";
 }
 
-void ParameterManager::_factRawValueUpdateWorker(int componentId, const QString &name, FactMetaData::ValueType_t valueType, const QVariant &rawValue)
+QString ParameterManager::_vehicleAndComponentString(int componentId) const
 {
-    if (_waitingWriteParamNameMap.contains(componentId)) {
-        if (_waitingWriteParamNameMap[componentId].contains(name)) {
-            (void) _waitingWriteParamNameMap[componentId].remove(name);
+    // If there are multiple vehicles include the vehicle id for disambiguation
+    QString vehicleIdStr;
+    if (MultiVehicleManager::instance()->vehicles()->count() > 1) {
+        vehicleIdStr = QStringLiteral("veh: %1").arg(_vehicle->id());
+    }
+
+    // IF we have parameters for multiple components include the component id for disambiguation
+    QString componentIdStr;
+    if (_mapCompId2FactMap.keys().count() > 1) {
+        componentIdStr = QStringLiteral("comp: %1").arg(componentId);
+    }
+
+    if (!vehicleIdStr.isEmpty() && !componentIdStr.isEmpty()) {
+        return vehicleIdStr + QStringLiteral(" ") + componentIdStr;
+    } else if (!vehicleIdStr.isEmpty()) {
+        return vehicleIdStr;
+    } else if (!componentIdStr.isEmpty()) {
+        return componentIdStr;
+    } else {
+        return QString();
+    }
+}
+
+void ParameterManager::_mavlinkParamSet(int componentId, const QString &paramName, FactMetaData::ValueType_t valueType, const QVariant &rawValue)
+{
+    auto paramSetEncoder = [this, componentId, paramName, valueType, rawValue](uint8_t systemId, uint8_t channel, mavlink_message_t *message) -> void {
+        const MAV_PARAM_TYPE paramType = factTypeToMavType(valueType);
+
+        mavlink_param_union_t union_value{};
+        if (!_fillMavlinkParamUnion(valueType, rawValue, union_value)) {
+            return;
+        }
+
+        char paramId[MAVLINK_MSG_PARAM_SET_FIELD_PARAM_ID_LEN + 1] = {};
+        (void) strncpy(paramId, paramName.toLocal8Bit().constData(), MAVLINK_MSG_PARAM_SET_FIELD_PARAM_ID_LEN);
+
+        (void) mavlink_msg_param_set_pack_chan(
+                    MAVLinkProtocol::instance()->getSystemId(),
+                    MAVLinkProtocol::getComponentId(),
+                    channel,
+                    message,
+                    static_cast<uint8_t>(_vehicle->id()),
+                    static_cast<uint8_t>(componentId),
+                    paramId,
+                    union_value.param_float,
+                    static_cast<uint8_t>(paramType));
+    };
+
+    auto checkForCorrectParamValue = [this, componentId, paramName, rawValue](const mavlink_message_t &message) -> bool {
+        if (message.compid != componentId) {
+            return false;
+        }
+
+        mavlink_param_value_t param_value{};
+        mavlink_msg_param_value_decode(&message, &param_value);
+
+        // This will null terminate the name string
+        char parameterNameWithNull[MAVLINK_MSG_PARAM_VALUE_FIELD_PARAM_ID_LEN + 1] = {};
+        (void) strncpy(parameterNameWithNull, param_value.param_id, MAVLINK_MSG_PARAM_VALUE_FIELD_PARAM_ID_LEN);
+        const QString parameterName(parameterNameWithNull);
+
+        if (parameterName != paramName) {
+            return false;
+        }
+
+        // Check that the value matches what we expect within tolerance, if it doesn't match then this message is not for us
+        QVariant receivedValue;
+        mavlink_param_union_t param_union;
+        param_union.param_float = param_value.param_value;
+        param_union.type = param_value.param_type;
+        if (!_mavlinkParamUnionToVariant(param_union, receivedValue)) {
+            return false;
+        }
+        if (rawValue.typeId() != receivedValue.typeId()) {
+            qCWarning(ParameterManagerLog) << "QVariant type mismatch on PARAM_VALUE ack for" << paramName << ": expected type" << rawValue.typeId() << "got type" << receivedValue.typeId();
+            return false;
+        }
+        if (param_value.param_type == MAV_PARAM_TYPE_REAL32) {
+            // Float comparison must be fuzzy
+            return QGC::fuzzyCompare(rawValue.toFloat(), receivedValue.toFloat());
         } else {
-            _waitingWriteParamBatchCount++;
+            return receivedValue == rawValue;
         }
-        _waitingWriteParamNameMap[componentId][name] = 0; // Add new entry and set retry count
-        _updateProgressBar();
-        _waitingParamTimeoutTimer.start();
-        _saveRequired = true;
-    } else {
-        qCWarning(ParameterManagerLog) << "Internal error ParameterManager::_factValueUpdateWorker: component id not found" << componentId;
+    };
+
+    // State Machine:
+    //  Send PARAM_SET - 2 retries after initial attempt
+    //  Increment pending write count
+    //  Wait for PARAM_VALUE ack
+    //  Decrement pending write count
+    //
+    //  timeout:
+    //      Decrement pending write count
+    //      Back up to PARAM_SET for retries
+    //
+    //  error:
+    //      Refresh parameter from vehicle
+    //      Notify user of failure
+
+    // Create states
+    auto stateMachine = new QGCStateMachine(QStringLiteral("ParameterManager PARAM_SET"), vehicle(), this);
+    auto sendParamSetState = new SendMavlinkMessageState(stateMachine, paramSetEncoder, kParamSetRetryCount);
+    auto incPendingWriteCountState = new FunctionState(QStringLiteral("ParameterManager increment pending write count"), stateMachine, [this]() {
+        _incrementPendingWriteCount();
+    });
+    auto decPendingWriteCountState = new FunctionState(QStringLiteral("ParameterManager decrement pending write count"), stateMachine, [this]() {
+        _decrementPendingWriteCount();
+    });
+    auto retryDecPendingWriteCountState = new FunctionState(QStringLiteral("ParameterManager retry decrement pending write count"), stateMachine, [this]() {
+        _decrementPendingWriteCount();
+    });
+    auto waitAckState = new WaitForMavlinkMessageState(stateMachine, MAVLINK_MSG_ID_PARAM_VALUE, kWaitForParamValueAckMs, checkForCorrectParamValue);
+    auto paramRefreshState = new FunctionState(QStringLiteral("ParameterManager param refresh"), stateMachine, [this, componentId, paramName]() {
+        refreshParameter(componentId, paramName);
+    });
+    auto userNotifyState = new ShowAppMessageState(stateMachine, QStringLiteral("Parameter write failed: param: %1 %2").arg(paramName).arg(_vehicleAndComponentString(componentId)));
+    auto logSuccessState = new FunctionState(QStringLiteral("ParameterManager log success"), stateMachine, [this, componentId, paramName]() {
+        qCDebug(ParameterManagerLog) << "Parameter write succeeded: param:" << paramName << _vehicleAndComponentString(componentId);
+        emit _paramSetSuccess(componentId, paramName);
+    });
+    auto logFailureState = new FunctionState(QStringLiteral("ParameterManager log failure"), stateMachine, [this, componentId, paramName]() {
+        qCDebug(ParameterManagerLog) << "Parameter write failed: param:" << paramName << _vehicleAndComponentString(componentId);
+        emit _paramSetFailure(componentId, paramName);
+    });
+    auto finalState = new QGCFinalState(stateMachine);
+
+    // Successful state machine transitions
+    stateMachine->setInitialState(sendParamSetState);
+    sendParamSetState->addThisTransition        (&QGCState::advance, incPendingWriteCountState);
+    incPendingWriteCountState->addThisTransition(&QGCState::advance, waitAckState);
+    waitAckState->addThisTransition             (&QGCState::advance, decPendingWriteCountState);
+    decPendingWriteCountState->addThisTransition(&QGCState::advance, logSuccessState);
+    logSuccessState->addThisTransition          (&QGCState::advance, finalState);
+
+    // Retry transitions
+    waitAckState->addTransition(waitAckState, &WaitForMavlinkMessageState::timeout, retryDecPendingWriteCountState); // Retry on timeout
+    retryDecPendingWriteCountState->addThisTransition(&QGCState::advance, sendParamSetState);
+
+    // Error transitions
+    sendParamSetState->addThisTransition(&QGCState::error, logFailureState); // Error is signaled after retries exhausted or internal error
+
+    // Error state branching transitions
+    logFailureState->addThisTransition  (&QGCState::advance, userNotifyState);
+    userNotifyState->addThisTransition  (&QGCState::advance, paramRefreshState);
+    paramRefreshState->addThisTransition(&QGCState::advance, finalState);
+
+    qCDebug(ParameterManagerLog) << "Starting state machine for PARAM_SET on: " << paramName << _vehicleAndComponentString(componentId);
+    stateMachine->start();
+}
+
+bool ParameterManager::_fillMavlinkParamUnion(FactMetaData::ValueType_t valueType, const QVariant &rawValue, mavlink_param_union_t &paramUnion) const
+{
+    bool ok = false;
+
+    switch (valueType) {
+    case FactMetaData::valueTypeUint8:
+        paramUnion.param_uint8 = static_cast<uint8_t>(rawValue.toUInt(&ok));
+        break;
+    case FactMetaData::valueTypeInt8:
+        paramUnion.param_int8 = static_cast<int8_t>(rawValue.toInt(&ok));
+        break;
+    case FactMetaData::valueTypeUint16:
+        paramUnion.param_uint16 = static_cast<uint16_t>(rawValue.toUInt(&ok));
+        break;
+    case FactMetaData::valueTypeInt16:
+        paramUnion.param_int16 = static_cast<int16_t>(rawValue.toInt(&ok));
+        break;
+    case FactMetaData::valueTypeUint32:
+        paramUnion.param_uint32 = static_cast<uint32_t>(rawValue.toUInt(&ok));
+        break;
+    case FactMetaData::valueTypeFloat:
+        paramUnion.param_float = rawValue.toFloat(&ok);
+        break;
+    case FactMetaData::valueTypeInt32:
+        paramUnion.param_int32 = static_cast<int32_t>(rawValue.toInt(&ok));
+        break;
+    default:
+        qCCritical(ParameterManagerLog) << "Internal Error: Unsupported fact value type" << valueType;
+        paramUnion.param_int32 = static_cast<int32_t>(rawValue.toInt(&ok));
+        break;
     }
 
-    _sendParamSetToVehicle(componentId, name, valueType, rawValue);
-    qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "Update parameter (_waitingParamTimeoutTimer started) - compId:name:rawValue" << componentId << name << rawValue;
+    if (!ok) {
+        qCCritical(ParameterManagerLog) << "Fact Failed to Convert to Param Type:" << valueType;
+        return false;
+    }
+
+    return true;
+}
+
+bool ParameterManager::_mavlinkParamUnionToVariant(const mavlink_param_union_t &paramUnion, QVariant &outValue) const
+{
+    switch (paramUnion.type) {
+    case MAV_PARAM_TYPE_REAL32:
+        outValue = QVariant(paramUnion.param_float);
+        return true;
+    case MAV_PARAM_TYPE_UINT8:
+        outValue = QVariant(paramUnion.param_uint8);
+        return true;
+    case MAV_PARAM_TYPE_INT8:
+        outValue = QVariant(paramUnion.param_int8);
+        return true;
+    case MAV_PARAM_TYPE_UINT16:
+        outValue = QVariant(paramUnion.param_uint16);
+        return true;
+    case MAV_PARAM_TYPE_INT16:
+        outValue = QVariant(paramUnion.param_int16);
+        return true;
+    case MAV_PARAM_TYPE_UINT32:
+        outValue = QVariant(paramUnion.param_uint32);
+        return true;
+    case MAV_PARAM_TYPE_INT32:
+        outValue = QVariant(paramUnion.param_int32);
+        return true;
+    default:
+        qCCritical(ParameterManagerLog) << "ParameterManager::_mavlinkParamUnionToVariant - unsupported MAV_PARAM_TYPE" << paramUnion.type;
+        return false;
+    }
 }
 
 void ParameterManager::_factRawValueUpdated(const QVariant &rawValue)
@@ -373,7 +488,7 @@ void ParameterManager::_factRawValueUpdated(const QVariant &rawValue)
         return;
     }
 
-    _factRawValueUpdateWorker(fact->componentId(), fact->name(), fact->type(), rawValue);
+    _mavlinkParamSet(fact->componentId(), fact->name(), fact->type(), rawValue);
 }
 
 void ParameterManager::_ftpDownloadComplete(const QString &fileName, const QString &errorMsg)
@@ -510,25 +625,10 @@ int ParameterManager::_actualComponentId(int componentId) const
 void ParameterManager::refreshParameter(int componentId, const QString &paramName)
 {
     componentId = _actualComponentId(componentId);
-    qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "refreshParameter - name:" << paramName << ")";
 
-    if (_waitingReadParamNameMap.contains(componentId)) {
-        const QString mappedParamName = _remapParamNameToVersion(paramName);
-
-        if (_waitingReadParamNameMap[componentId].contains(mappedParamName)) {
-            (void) _waitingReadParamNameMap[componentId].remove(mappedParamName);
-        } else {
-            _waitingReadParamNameBatchCount++;
-        }
-        _waitingReadParamNameMap[componentId][mappedParamName] = 0;     // Add new wait entry and update retry count
-        _updateProgressBar();
-        qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "restarting _waitingParamTimeout";
-        _waitingParamTimeoutTimer.start();
-    } else {
-        qCWarning(ParameterManagerLog) << "Internal error";
-    }
+    qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "refreshParameter - name:" << paramName << ")";
 
-    _readParameterRaw(componentId, paramName, -1);
+    _mavlinkParamRequestRead(componentId, paramName, -1, true /* notifyFailure */);
 }
 
 void ParameterManager::refreshParametersPrefix(int componentId, const QString &namePrefix)
@@ -622,7 +722,7 @@ bool ParameterManager::_fillIndexBatchQueue(bool waitingParamTimeout)
             } else {
                 // Retry again
                 _indexBatchQueue.append(paramIndex);
-                _readParameterRaw(componentId, "", paramIndex);
+                _mavlinkParamRequestRead(componentId, QString(), paramIndex, false /* notifyFailure */);
                 qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "Read re-request for (paramIndex:" << paramIndex << "retryCount:" << _waitingReadParamIndexMap[componentId][paramIndex] << ")";
             }
         }
@@ -656,53 +756,6 @@ void ParameterManager::_waitingParamTimeout()
 
     _checkInitialLoadComplete();
 
-    constexpr int maxBatchSize = 10;
-    int batchCount = 0;
-    if (!paramsRequested) {
-        for (const int componentId: _waitingWriteParamNameMap.keys()) {
-            for (const QString &paramName: _waitingWriteParamNameMap[componentId].keys()) {
-                paramsRequested = true;
-                _waitingWriteParamNameMap[componentId][paramName]++;   // Bump retry count
-                if (_waitingWriteParamNameMap[componentId][paramName] <= _maxReadWriteRetry) {
-                    const Fact *const fact = getParameter(componentId, paramName);
-                    _sendParamSetToVehicle(componentId, paramName, fact->type(), fact->rawValue());
-                    qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "Write resend for (paramName:" << paramName << "retryCount:" << _waitingWriteParamNameMap[componentId][paramName] << ")";
-                    if (++batchCount > maxBatchSize) {
-                        goto Out;
-                    }
-                } else {
-                    // Exceeded max retry count, notify user
-                    _waitingWriteParamNameMap[componentId].remove(paramName);
-                    const QString errorMsg = tr("Parameter write failed: veh:%1 comp:%2 param:%3").arg(_vehicle->id()).arg(componentId).arg(paramName);
-                    qCDebug(ParameterManagerLog) << errorMsg;
-                    qgcApp()->showAppMessage(errorMsg);
-                }
-            }
-        }
-    }
-
-    if (!paramsRequested) {
-        for (const int componentId: _waitingReadParamNameMap.keys()) {
-            for (const QString &paramName: _waitingReadParamNameMap[componentId].keys()) {
-                paramsRequested = true;
-                _waitingReadParamNameMap[componentId][paramName]++;   // Bump retry count
-                if (_waitingReadParamNameMap[componentId][paramName] <= _maxReadWriteRetry) {
-                    _readParameterRaw(componentId, paramName, -1);
-                    qCDebug(ParameterManagerLog) << _logVehiclePrefix(componentId) << "Read re-request for (paramName:" << paramName << "retryCount:" << _waitingReadParamNameMap[componentId][paramName] << ")";
-                    if (++batchCount > maxBatchSize) {
-                        goto Out;
-                    }
-                } else {
-                    // Exceeded max retry count, notify user
-                    (void) _waitingReadParamNameMap[componentId].remove(paramName);
-                    const QString errorMsg = tr("Parameter read failed: veh:%1 comp:%2 param:%3").arg(_vehicle->id()).arg(componentId).arg(paramName);
-                    qCDebug(ParameterManagerLog) << errorMsg;
-                    qgcApp()->showAppMessage(errorMsg);
-                }
-            }
-        }
-    }
-
 Out:
     if (paramsRequested) {
         qCDebug(ParameterManagerLog) << _logVehiclePrefix(-1) << "Restarting _waitingParamTimeoutTimer - re-request";
@@ -710,85 +763,98 @@ void ParameterManager::_waitingParamTimeout()
     }
 }
 
-void ParameterManager::_readParameterRaw(int componentId, const QString &paramName, int paramIndex) const
+void ParameterManager::_mavlinkParamRequestRead(int componentId, const QString &paramName, int paramIndex, bool notifyFailure)
 {
-    const SharedLinkInterfacePtr sharedLink = _vehicle->vehicleLinkManager()->primaryLink().lock();
-    if (!sharedLink) {
-        return;
-    }
-
-    mavlink_message_t msg{};
-    char fixedParamName[MAVLINK_MSG_PARAM_REQUEST_READ_FIELD_PARAM_ID_LEN];
+    auto paramRequestReadEncoder = [this, componentId, paramName, paramIndex](uint8_t systemId, uint8_t channel, mavlink_message_t *message) -> void {
+        char paramId[MAVLINK_MSG_PARAM_REQUEST_READ_FIELD_PARAM_ID_LEN + 1] = {};
+        (void) strncpy(paramId, paramName.toLocal8Bit().constData(), MAVLINK_MSG_PARAM_REQUEST_READ_FIELD_PARAM_ID_LEN);
+
+        (void) mavlink_msg_param_request_read_pack_chan(MAVLinkProtocol::instance()->getSystemId(),   // QGC system id
+                                                        MAVLinkProtocol::getComponentId(),            // QGC component id
+                                                        channel,
+                                                        message,
+                                                        static_cast<uint8_t>(_vehicle->id()),
+                                                        static_cast<uint8_t>(componentId),
+                                                        paramId,
+                                                        static_cast<int16_t>(paramIndex));
+    };
 
-    (void) strncpy(fixedParamName, paramName.toStdString().c_str(), sizeof(fixedParamName));
-    (void) mavlink_msg_param_request_read_pack_chan(MAVLinkProtocol::instance()->getSystemId(),   // QGC system id
-                                                    MAVLinkProtocol::getComponentId(),     // QGC component id
-                                                    sharedLink->mavlinkChannel(),
-                                                    &msg,                           // Pack into this mavlink_message_t
-                                                    _vehicle->id(),                 // Target system id
-                                                    componentId,                    // Target component id
-                                                    fixedParamName,                 // Named parameter being requested
-                                                    paramIndex);                    // Parameter index being requested, -1 for named
-    (void) _vehicle->sendMessageOnLinkThreadSafe(sharedLink.get(), msg);
-}
+    auto checkForCorrectParamValue = [this, componentId, paramName, paramIndex](const mavlink_message_t &message) -> bool {
+        if (message.compid != componentId) {
+            return false;
+        }
 
-void ParameterManager::_sendParamSetToVehicle(int componentId, const QString &paramName, FactMetaData::ValueType_t valueType, const QVariant &value) const
-{
-    const SharedLinkInterfacePtr sharedLink = _vehicle->vehicleLinkManager()->primaryLink().lock();
-    if (!sharedLink) {
-        return;
-    }
+        mavlink_param_value_t param_value{};
+        mavlink_msg_param_value_decode(&message, &param_value);
 
-    mavlink_param_set_t p{};
-    p.param_type = factTypeToMavType(valueType);
+        // This will null terminate the name string
+        char parameterNameWithNull[MAVLINK_MSG_PARAM_VALUE_FIELD_PARAM_ID_LEN + 1] = {};
+        (void) strncpy(parameterNameWithNull, param_value.param_id, MAVLINK_MSG_PARAM_VALUE_FIELD_PARAM_ID_LEN);
+        const QString parameterName(parameterNameWithNull);
 
-    mavlink_param_union_t union_value{};
+        // Check that this is for the parameter we requested
+        if (paramIndex != -1) {
+            // Index based request
+            if (param_value.param_index != paramIndex) {
+                return false;
+            }
+        } else {
+            // Name based request
+            if (parameterName != paramName) {
+                return false;
+            }
+        }
 
-    bool ok = false;
-    switch (valueType) {
-    case FactMetaData::valueTypeUint8:
-        union_value.param_uint8 = static_cast<uint8_t>(value.toUInt(&ok));
-        break;
-    case FactMetaData::valueTypeInt8:
-        union_value.param_int8 = static_cast<int8_t>(value.toInt(&ok));
-        break;
-    case FactMetaData::valueTypeUint16:
-        union_value.param_uint16 = static_cast<uint16_t>(value.toUInt(&ok));
-        break;
-    case FactMetaData::valueTypeInt16:
-        union_value.param_int16 = static_cast<int16_t>(value.toInt(&ok));
-        break;
-    case FactMetaData::valueTypeUint32:
-        union_value.param_uint32 = static_cast<uint32_t>(value.toUInt(&ok));
-        break;
-    case FactMetaData::valueTypeFloat:
-        union_value.param_float = value.toFloat(&ok);
-        break;
-    default:
-        qCCritical(ParameterManagerLog) << "Unsupported fact value type" << valueType;
-    case FactMetaData::valueTypeInt32:
-        union_value.param_int32 = static_cast<int32_t>(value.toInt(&ok));
-        break;
-    }
+        return true;
+    };
 
-    if (!ok) {
-        qCCritical(ParameterManagerLog) << "Fact Failed to Convert to Param Type:" << value;
-        return;
+    // State Machine:
+    //  Send PARAM_REQUEST_READ - 2 retries after initial attempt
+    //  Wait for PARAM_VALUE ack
+    //
+    //  timeout:
+    //      Back up to PARAM_REQUEST_READ for retries
+    //
+    //  error:
+    //      Notify user of failure
+
+    // Create states
+    auto stateMachine = new QGCStateMachine(QStringLiteral("PARAM_REQUEST_READ"), vehicle(), this);
+    auto sendParamRequestReadState = new SendMavlinkMessageState(stateMachine, paramRequestReadEncoder, kParamRequestReadRetryCount);
+    auto waitAckState = new WaitForMavlinkMessageState(stateMachine, MAVLINK_MSG_ID_PARAM_VALUE, kWaitForParamValueAckMs, checkForCorrectParamValue);
+    auto userNotifyState = new ShowAppMessageState(stateMachine, QStringLiteral("Parameter read failed: param: %1 %2").arg(paramName).arg(_vehicleAndComponentString(componentId)));
+    auto logSuccessState = new FunctionState(QStringLiteral("Log success"), stateMachine, [this, componentId, paramName, paramIndex]() {
+        qCDebug(ParameterManagerLog) << "PARAM_REQUEST_READ succeeded: name:" << paramName << "index" << paramIndex << _vehicleAndComponentString(componentId);
+        emit _paramRequestReadSuccess(componentId, paramName, paramIndex);
+    });
+    auto logFailureState = new FunctionState(QStringLiteral("Log failure"), stateMachine, [this, componentId, paramName, paramIndex]() {
+        qCDebug(ParameterManagerLog) << "PARAM_REQUEST_READ failed: param:" << paramName << "index" << paramIndex << _vehicleAndComponentString(componentId);
+        emit _paramRequestReadFailure(componentId, paramName, paramIndex);
+    });
+    auto finalState = new QGCFinalState(stateMachine);
+
+    // Successful state machine transitions
+    stateMachine->setInitialState(sendParamRequestReadState);
+    sendParamRequestReadState->addThisTransition(&QGCState::advance, waitAckState);
+    waitAckState->addThisTransition             (&QGCState::advance, logSuccessState);
+    logSuccessState->addThisTransition          (&QGCState::advance, finalState);
+
+    // Retry transitions
+    waitAckState->addTransition(waitAckState, &WaitForMavlinkMessageState::timeout, sendParamRequestReadState); // Retry on timeout
+
+    // Error transitions
+    sendParamRequestReadState->addThisTransition(&QGCState::error, logFailureState); // Error is signaled after retries exhausted or internal error
+
+    // Error state branching transitions
+    if (notifyFailure) {
+        logFailureState->addThisTransition  (&QGCState::advance, userNotifyState);
+    } else {
+        logFailureState->addThisTransition  (&QGCState::advance, finalState);
     }
+    userNotifyState->addThisTransition  (&QGCState::advance, finalState);
 
-    p.param_value = union_value.param_float;
-    p.target_system = static_cast<uint8_t>(_vehicle->id());
-    p.target_component = static_cast<uint8_t>(componentId);
-
-    (void) strncpy(p.param_id, paramName.toStdString().c_str(), sizeof(p.param_id));
-
-    mavlink_message_t msg{};
-    (void) mavlink_msg_param_set_encode_chan(MAVLinkProtocol::instance()->getSystemId(),
-                                             MAVLinkProtocol::getComponentId(),
-                                             sharedLink->mavlinkChannel(),
-                                             &msg,
-                                             &p);
-    (void) _vehicle->sendMessageOnLinkThreadSafe(sharedLink.get(), msg);
+    qCDebug(ParameterManagerLog) << "Starting state machine for PARAM_REQUEST_READ on: " << paramName << _vehicleAndComponentString(componentId);
+    stateMachine->start();
 }
 
 void ParameterManager::_writeLocalParamCache(int vehicleId, int componentId)
@@ -1136,6 +1202,18 @@ void ParameterManager::_checkInitialLoadComplete()
 
 void ParameterManager::_initialRequestTimeout()
 {
+    if (_logReplay) {
+        // Signal load complete
+        qCDebug(ParameterManagerLog) << _logVehiclePrefix(-1) << "_initialRequestTimeout (log replay): Signalling load complete";
+        _initialLoadComplete = true;
+        _missingParameters = false;
+        _parametersReady = true;
+        _vehicle->autopilotPlugin()->parametersReadyPreChecks();
+        emit parametersReadyChanged(true);
+        emit missingParametersChanged(_missingParameters);
+        return;
+    }
+
     if (!_disableAllRetries && (++_initialRequestRetryCount <= _maxInitialRequestListRetry)) {
         qCDebug(ParameterManagerLog) << _logVehiclePrefix(-1) << "Retrying initial parameter request list";
         refreshAllParameters();
@@ -1299,13 +1377,7 @@ QList<int> ParameterManager::componentIds() const
 
 bool ParameterManager::pendingWrites() const
 {
-    for (const int compId: _waitingWriteParamNameMap.keys()) {
-        if (!_waitingWriteParamNameMap[compId].isEmpty()) {
-            return true;
-        }
-    }
-
-    return false;
+    return _pendingWritesCount > 0;
 }
 
 Vehicle *ParameterManager::vehicle()
@@ -1495,14 +1567,13 @@ bool ParameterManager::_parseParamFile(const QString& filename)
         }
         fact->containerSetRawValue(parameterValue);
     }
+
 Success:
     file.close();
     /* Create empty waiting lists as we have all parameters */
     _paramCountMap[componentId] = num_params;
     _totalParamCount += num_params;
     _waitingReadParamIndexMap[componentId] = QMap<int, int>();
-    _waitingReadParamNameMap[componentId] = QMap<QString, int>();
-    _waitingWriteParamNameMap[componentId] = QMap<QString, int>();
     _checkInitialLoadComplete();
     _setLoadProgress(0.0);
     return true;
@@ -1511,3 +1582,24 @@ bool ParameterManager::_parseParamFile(const QString& filename)
     file.close();
     return false;
 }
+
+void ParameterManager::_incrementPendingWriteCount()
+{
+    _pendingWritesCount++;
+    if (_pendingWritesCount == 1) {
+        emit pendingWritesChanged(true);
+    }
+}
+
+void ParameterManager::_decrementPendingWriteCount()
+{
+    if (_pendingWritesCount == 0) {
+        qCWarning(ParameterManagerLog) << "Internal Error: _pendingWriteCount == 0";
+        return;
+    }
+
+    _pendingWritesCount--;
+    if (_pendingWritesCount == 0) {
+        emit pendingWritesChanged(false);
+    }
+}
diff --git a/src/FactSystem/ParameterManager.h b/src/FactSystem/ParameterManager.h
index afe0f2e72c53..005883899a1b 100644
--- a/src/FactSystem/ParameterManager.h
+++ b/src/FactSystem/ParameterManager.h
@@ -98,6 +98,11 @@ class ParameterManager : public QObject
 
     static constexpr int defaultComponentId = -1;
 
+    // These are public for creating unit tests
+    static constexpr int kParamSetRetryCount = 2;                   ///< Number of retries for PARAM_SET
+    static constexpr int kParamRequestReadRetryCount = 2;           ///< Number of retries for PARAM_REQUEST_READ
+    static constexpr int kWaitForParamValueAckMs = 1000;    ///< Time to wait for param value ack after set param
+
 signals:
     void parametersReadyChanged(bool parametersReady);
     void missingParametersChanged(bool missingParameters);
@@ -105,6 +110,12 @@ class ParameterManager : public QObject
     void pendingWritesChanged(bool pendingWrites);
     void factAdded(int componentId, Fact *fact);
 
+    // These signals are used to verify unit tests
+    void _paramSetSuccess(int componentId, const QString &paramName);
+    void _paramSetFailure(int componentId, const QString &paramName);
+    void _paramRequestReadSuccess(int componentId, const QString &paramName, int paramIndex);
+    void _paramRequestReadFailure(int componentId, const QString &paramName, int paramIndex);
+
 private slots:
     void _factRawValueUpdated(const QVariant &rawValue);
 
@@ -112,20 +123,21 @@ private slots:
     /// Called whenever a parameter is updated or first seen.
     void _handleParamValue(int componentId, const QString &parameterName, int parameterCount, int parameterIndex, MAV_PARAM_TYPE mavParamType, const QVariant &parameterValue);
      /// Writes the parameter update to mavlink, sets up for write wait
-    void _factRawValueUpdateWorker(int componentId, const QString &name, FactMetaData::ValueType_t valueType, const QVariant &rawValue);
+    void _mavlinkParamSet(int componentId, const QString &name, FactMetaData::ValueType_t valueType, const QVariant &rawValue);
     void _waitingParamTimeout();
     void _tryCacheLookup();
     void _initialRequestTimeout();
     /// Translates ParameterManager::defaultComponentId to real component id if needed
     int _actualComponentId(int componentId) const;
-    void _readParameterRaw(int componentId, const QString &paramName, int paramIndex) const;
-    void _sendParamSetToVehicle(int componentId, const QString &paramName, FactMetaData::ValueType_t valueType, const QVariant &value) const;
+    void _mavlinkParamRequestRead(int componentId, const QString &paramName, int paramIndex, bool notifyFailure);
     void _writeLocalParamCache(int vehicleId, int componentId);
     void _tryCacheHashLoad(int vehicleId, int componentId, const QVariant &hashValue);
     void _loadMetaData();
     void _clearMetaData();
     /// Remap a parameter from one firmware version to another
     QString _remapParamNameToVersion(const QString &paramName) const;
+    bool _fillMavlinkParamUnion(FactMetaData::ValueType_t valueType, const QVariant &rawValue, mavlink_param_union_t &paramUnion) const;
+    bool _mavlinkParamUnionToVariant(const mavlink_param_union_t &paramUnion, QVariant &outValue) const;
     /// The offline editing vehicle can have custom loaded params bolted into it.
     void _loadOfflineEditingParams();
     QString _logVehiclePrefix(int componentId) const;
@@ -141,6 +153,9 @@ private slots:
     /// Parse the binary parameter file and inject the parameters in the qgc fact system.
     /// See: https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Filesystem
     bool _parseParamFile(const QString &filename);
+    void _incrementPendingWriteCount();
+    void _decrementPendingWriteCount();
+    QString _vehicleAndComponentString(int componentId) const;
 
     static QVariant _stringToTypedVariant(const QString &string, FactMetaData::ValueType_t type, bool failOk = false);
 
@@ -153,7 +168,6 @@ private slots:
     bool _missingParameters = false;            ///< true: parameter missing from initial load
     bool _initialLoadComplete = false;          ///< true: Initial load of all parameters complete, whether successful or not
     bool _waitingForDefaultComponent = false;   ///< true: last chance wait for default component params
-    bool _saveRequired = false;                 ///< true: _saveToEEPROM should be called
     bool _metaDataAddedToFacts = false;         ///< true: FactMetaData has been adde to the default component facts
     bool _logReplay = false;                    ///< true: running with log replay link
 
@@ -166,31 +180,23 @@ private slots:
 
     // Wait counts from previous parameter update cycle
     int _prevWaitingReadParamIndexCount = 0;
-    int _prevWaitingReadParamNameCount = 0;
-    int _prevWaitingWriteParamNameCount = 0;
 
     bool _readParamIndexProgressActive = false;
-    bool _readParamNameProgressActive = false;
-    bool _writeParamProgressActive = false;
 
     static constexpr int _maxInitialRequestListRetry = 4;       ///< Maximum retries for request list
     int _initialRequestRetryCount = 0;                          ///< Current retry count for request list
     static constexpr int _maxInitialLoadRetrySingleParam = 5;   ///< Maximum retries for initial index based load of a single param
-    static constexpr int _maxReadWriteRetry = 5;                ///< Maximum retries read/write
-    bool _disableAllRetries = false;                            ///< true: Don't retry any requests (used for testing)
+    bool _disableAllRetries = false;                            ///< true: Don't retry any requests (used for testing and logReplay)
 
     bool _indexBatchQueueActive = false;    ///< true: we are actively batching re-requests for missing index base params, false: index based re-request has not yet started
     QList<int> _indexBatchQueue;            ///< The current queue of index re-requests
 
     QMap<int, int> _paramCountMap;                              ///< Key: Component id, Value: count of parameters in this component
     QMap<int, QMap<int, int>> _waitingReadParamIndexMap;        ///< Key: Component id, Value: Map { Key: parameter index still waiting for, Value: retry count }
-    QMap<int, QMap<QString, int>> _waitingReadParamNameMap;     ///< Key: Component id, Value: Map { Key: parameter name still waiting for, Value: retry count }
-    QMap<int, QMap<QString, int>> _waitingWriteParamNameMap;    ///< Key: Component id, Value: Map { Key: parameter name still waiting for, Value: retry count }
     QMap<int, QList<int>> _failedReadParamIndexMap;             ///< Key: Component id, Value: failed parameter index
 
     int _totalParamCount = 0;                   ///< Number of parameters across all components
-    int _waitingWriteParamBatchCount = 0;       ///< Number of parameters which are batched up waiting on write responses
-    int _waitingReadParamNameBatchCount = 0;    ///< Number of parameters which are batched up waiting on read responses
+    int _pendingWritesCount = 0;                ///< Number of parameters with pending writes
 
     QTimer _initialRequestTimeoutTimer;
     QTimer _waitingParamTimeoutTimer;
diff --git a/src/FactSystem/SettingsFact.cc b/src/FactSystem/SettingsFact.cc
index 43cb6a452143..e67a76b3ee95 100644
--- a/src/FactSystem/SettingsFact.cc
+++ b/src/FactSystem/SettingsFact.cc
@@ -11,10 +11,11 @@
 #include "QGCApplication.h"
 #include "QGCCorePlugin.h"
 #include "QGCLoggingCategory.h"
+#include "SettingsManager.h"
 
 #include <QtCore/QSettings>
 
-QGC_LOGGING_CATEGORY(SettingsFactLog, "qgc.factsystem.settingsfact")
+QGC_LOGGING_CATEGORY(SettingsFactLog, "FactSystem.SettingsFact")
 
 SettingsFact::SettingsFact(QObject *parent)
     : Fact(parent)
@@ -34,7 +35,7 @@ SettingsFact::SettingsFact(const QString &settingsGroup, FactMetaData *metaData,
     }
 
     // Allow core plugin a chance to override the default value
-    _visible = QGCCorePlugin::instance()->adjustSettingMetaData(settingsGroup, *metaData);
+    SettingsManager::adjustSettingMetaData(settingsGroup, *metaData, _visible);
     setMetaData(metaData);
 
     if (metaData->defaultValueAvailable()) {
@@ -49,7 +50,7 @@ SettingsFact::SettingsFact(const QString &settingsGroup, FactMetaData *metaData,
             _rawValue = typedValue;
         } else {
             // Setting is not visible, force to default value always
-            settings.setValue(_name, rawDefaultValue);
+            // Note that we specifically do not save this back to QSettings such that a Settings Override file change is not a permanent change
             _rawValue = rawDefaultValue;
         }
     }
diff --git a/src/FirmwarePlugin/APM/APMBatteryIndicator.qml b/src/FirmwarePlugin/APM/APMBatteryIndicator.qml
new file mode 100644
index 000000000000..86882a938e03
--- /dev/null
+++ b/src/FirmwarePlugin/APM/APMBatteryIndicator.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+import QGroundControl.FactControls
+
+ColumnLayout {
+    FactPanelController { id: controller }
+
+    property Fact batt1Monitor: controller.getParameterFact(-1, "BATT_MONITOR")
+    property string disabledString: qsTr("- disabled")
+
+    SettingsGroupLayout {
+        Layout.fillWidth:   true
+        heading:            qsTr("Low Voltage Failsafe")
+        visible:            batt1Monitor.rawValue !== 0
+
+        LabelledFactComboBox {
+            label:              qsTr("Vehicle Action")
+            fact:               controller.getParameterFact(-1, "BATT_FS_LOW_ACT")
+            indexModel:         false
+        }
+
+        FactSlider {
+            Layout.fillWidth:   true
+            label:              qsTr("Voltage Trigger") + (value == 0 ? disabledString : "")
+            fact:               controller.getParameterFact(-1, "BATT_LOW_VOLT")
+            from:               0
+            to:                 100
+            majorTickStepSize:  5
+        }
+
+        FactSlider {
+            Layout.fillWidth:   true
+            label:              qsTr("mAh Trigger") + (value == 0 ? disabledString : "")
+            fact:               controller.getParameterFact(-1, "BATT_LOW_MAH")
+            from:               0
+            to:                 30000
+            majorTickStepSize:  1000
+        }
+    }
+
+    SettingsGroupLayout {
+        Layout.fillWidth:   true
+        heading:            qsTr("Critical Voltage Failsafe")
+        visible:            batt1Monitor.rawValue !== 0
+
+        LabelledFactComboBox {
+            label:              qsTr("Vehicle Action")
+            fact:               controller.getParameterFact(-1, "BATT_FS_CRT_ACT")
+            indexModel:         false
+        }
+
+        FactSlider {
+            Layout.fillWidth:   true
+            label:              qsTr("Voltage Trigger") + (value == 0 ? disabledString : "")
+            fact:               controller.getParameterFact(-1, "BATT_CRT_VOLT")
+            from:               0
+            to:                 100
+            majorTickStepSize:  5
+        }
+
+        FactSlider {
+            Layout.fillWidth:   true
+            label:              qsTr("mAh Trigger") + (value == 0 ? disabledString : "")
+            fact:               controller.getParameterFact(-1, "BATT_CRT_MAH")
+            from:               0
+            to:                 30000
+            majorTickStepSize:  1000
+        }
+    }
+}
diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
index 5860c9ca4fbf..405d89a3d0a9 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
@@ -34,7 +34,7 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QRegularExpressionMatch>
 
-QGC_LOGGING_CATEGORY(APMFirmwarePluginLog, "APMFirmwarePluginLog")
+QGC_LOGGING_CATEGORY(APMFirmwarePluginLog, "FirmwarePlugin.APMFirmwarePlugin")
 
 APMFirmwarePlugin::APMFirmwarePlugin(QObject *parent)
     : FirmwarePlugin(parent)
@@ -441,39 +441,77 @@ void APMFirmwarePlugin::initializeStreamRates(Vehicle *vehicle)
     instanceData->lastBatteryStatusTime = instanceData->lastHomePositionTime = QTime::currentTime();
 }
 
+APMFirmwarePlugin::FirmwareParameterHeader APMFirmwarePlugin::_parseParamsHeader(const QString &filePath)
+{
+    APMFirmwarePlugin::FirmwareParameterHeader data{};
+
+    QFile file(filePath);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return data;
+    }
+
+    QTextStream stream(&file);
+    while (!stream.atEnd()) {
+        const QString line = stream.readLine();
+
+        // Stop once non-comment parameter rows begin and we already saw some header
+        if (!line.startsWith('#')) {
+            break;
+        }
+
+        using namespace Qt::StringLiterals;
+
+        static const QRegularExpression reStack(uR"(^#\s*Stack:\s*(.+)\s*$)"_s);
+        auto match = reStack.match(line);
+        if (match.hasMatch()) {
+            const QString firmwareTypeStr = match.captured(1).trimmed();
+            const MAV_AUTOPILOT firmwareType = QGCMAVLink::firmwareTypeFromString(firmwareTypeStr);
+            data.firmwareType = firmwareType;
+            continue;
+        }
+
+        static const QRegularExpression reVehicle(uR"(^#\s*Vehicle:\s*(.+)\s*$)"_s);
+        match = reVehicle.match(line);
+        if (match.hasMatch()) {
+            const QString vehicleTypeStr = match.captured(1).trimmed();
+            const MAV_TYPE vehicleType = QGCMAVLink::vehicleTypeFromString(vehicleTypeStr);
+            data.vehicleType = vehicleType;
+            continue;
+        }
+
+        static const QRegularExpression reVersion(uR"(^#\s*Version:\s*([0-9]+(?:\.[0-9]+){0,2})(?:\s+([A-Za-z0-9]+))?\s*$)"_s);
+        match = reVersion.match(line);
+        if (match.hasMatch()) {
+            const QString versionNumber = match.captured(1).trimmed();
+            data.versionNumber = QVersionNumber::fromString(versionNumber);
+
+            const QString versionType = match.captured(2).trimmed();
+            if (versionType.isEmpty()) {
+                data.versionType = FIRMWARE_VERSION_TYPE_OFFICIAL;
+            } else {
+                data.versionType = QGCMAVLink::firmwareVersionTypeFromString(versionType);
+            }
+            continue;
+        }
+
+        static const QRegularExpression reGit(uR"(^#\s*Git Revision:\s*([0-9a-fA-F]+)\s*$)"_s);
+        match = reGit.match(line);
+        if (match.hasMatch()) {
+            data.gitRevision = match.captured(1).trimmed();
+            continue;
+        }
+    }
+
+    return data;
+}
 
 void APMFirmwarePlugin::initializeVehicle(Vehicle *vehicle)
 {
     if (vehicle->isOfflineEditingVehicle()) {
-        switch (vehicle->vehicleType()) {
-        case MAV_TYPE_QUADROTOR:
-        case MAV_TYPE_HEXAROTOR:
-        case MAV_TYPE_OCTOROTOR:
-        case MAV_TYPE_TRICOPTER:
-        case MAV_TYPE_COAXIAL:
-        case MAV_TYPE_HELICOPTER:
-            vehicle->setFirmwareVersion(4, 6, 2);
-            break;
-        case MAV_TYPE_VTOL_TAILSITTER_DUOROTOR:
-        case MAV_TYPE_VTOL_TAILSITTER_QUADROTOR:
-        case MAV_TYPE_VTOL_TILTROTOR:
-        case MAV_TYPE_VTOL_FIXEDROTOR:
-        case MAV_TYPE_VTOL_TAILSITTER:
-        case MAV_TYPE_VTOL_TILTWING:
-        case MAV_TYPE_VTOL_RESERVED5:
-        case MAV_TYPE_FIXED_WING:
-            vehicle->setFirmwareVersion(4, 6, 2);
-            break;
-        case MAV_TYPE_GROUND_ROVER:
-        case MAV_TYPE_SURFACE_BOAT:
-            vehicle->setFirmwareVersion(4, 6, 2);
-            break;
-        case MAV_TYPE_SUBMARINE:
-            vehicle->setFirmwareVersion(4, 6, 0);
-            break;
-        default:
-            // No version set
-            break;
+        const QString offlineParameterFile = offlineEditingParamFile(vehicle);
+        const APMFirmwarePlugin::FirmwareParameterHeader offlineParameterHeader = _parseParamsHeader(offlineParameterFile);
+        if (offlineParameterHeader.vehicleType != MAV_TYPE_GENERIC) {
+            vehicle->setFirmwareVersion(offlineParameterHeader.versionNumber.majorVersion(), offlineParameterHeader.versionNumber.minorVersion(), offlineParameterHeader.versionNumber.microVersion());
         }
     } else {
         initializeStreamRates(vehicle);
@@ -606,7 +644,7 @@ QString APMFirmwarePlugin::getHobbsMeter(Vehicle* vehicle) const
     const QString timeStr = QString::asprintf("%04d:%02d:%02d", hours, minutes, seconds);
     qCDebug(VehicleLog) << "Hobbs Meter string:" << timeStr;
     return timeStr;
-} 
+}
 
 bool APMFirmwarePlugin::hasGripper(const Vehicle *vehicle) const
 {
@@ -623,24 +661,8 @@ const QVariantList &APMFirmwarePlugin::toolIndicators(const Vehicle *vehicle)
         // First call the base class to get the standard QGC list
         _toolIndicatorList = FirmwarePlugin::toolIndicators(vehicle);
 
-        // Find the generic flight mode indicator and replace with the custom one
-        for (int i = 0; i < _toolIndicatorList.size(); i++) {
-            if (_toolIndicatorList.at(i).toUrl().toString().contains("FlightModeIndicator.qml")) {
-                _toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMFlightModeIndicator.qml"));
-                break;
-            }
-        }
-
-        // Find the generic battery indicator and replace with the custom one
-        for (int i = 0; i < _toolIndicatorList.size(); i++) {
-            if (_toolIndicatorList.at(i).toUrl().toString().contains("BatteryIndicator.qml")) {
-                _toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMBatteryIndicator.qml"));
-                break;
-            }
-        }
-
-        // Then add the forwarding support indicator
-        _toolIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMSupportForwardingIndicator.qml")));
+        // Add the forwarding support indicator
+        _toolIndicatorList.append(QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/APM/APMSupportForwardingIndicator.qml")));
     }
 
     return _toolIndicatorList;
@@ -1255,11 +1277,6 @@ void APMFirmwarePlugin::guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle *
     );                                        // param 5-7 unused
 }
 
-QVariant APMFirmwarePlugin::mainStatusIndicatorContentItem(const Vehicle*) const
-{
-    return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMMainStatusIndicatorContentItem.qml"));
-}
-
 void APMFirmwarePlugin::_setBaroGndTemp(Vehicle* vehicle, qreal temp)
 {
     if (!vehicle) {
@@ -1374,3 +1391,16 @@ bool APMFirmwarePlugin::stopCompensatingBaro(const Vehicle *vehicle, QPair<QMeta
 
     return result;
 }
+
+QVariant APMFirmwarePlugin::expandedToolbarIndicatorSource(const Vehicle* vehicle, const QString& indicatorName) const
+{
+    if (indicatorName == "Battery") {
+        return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/APM/APMBatteryIndicator.qml"));
+    } else if (indicatorName == "FlightMode" && vehicle->multiRotor()) {
+        return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/APM/APMFlightModeIndicator.qml"));
+    } else if (indicatorName == "MainStatus") {
+        return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/APM/APMMainStatusIndicator.qml"));
+    }
+
+    return QVariant();
+}
diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h
index 1652bce96d11..7a58a2f64e34 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h
+++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h
@@ -77,8 +77,8 @@ class APMFirmwarePlugin : public FirmwarePlugin
     double minimumEquivalentAirspeed(Vehicle *vehicle) const override;
     bool fixedWingAirSpeedLimitsAvailable(Vehicle *vehicle) const override;
     void guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle* vehicle, double airspeed_equiv) const override;
-    QVariant mainStatusIndicatorContentItem(const Vehicle* vehicle) const override;
     void sendGCSMotionReport(Vehicle *vehicle, const FollowMe::GCSMotionReport& motionReport, uint8_t estimatationCapabilities) const override;
+    QVariant expandedToolbarIndicatorSource  (const Vehicle* vehicle, const QString& indicatorName) const override;
 
     // support for changing speed in Copter guide mode:
     bool mulirotorSpeedLimitsAvailable(Vehicle *vehicle) const override;
@@ -139,6 +139,15 @@ private slots:
 
     static uint8_t _reencodeMavlinkChannel();
     static QMutex &_reencodeMavlinkChannelMutex();
+
+    struct FirmwareParameterHeader {
+        MAV_AUTOPILOT firmwareType = MAV_AUTOPILOT_GENERIC;
+        MAV_TYPE vehicleType = MAV_TYPE_GENERIC;
+        QVersionNumber versionNumber;
+        FIRMWARE_VERSION_TYPE versionType;
+        QString gitRevision;
+    };
+    static FirmwareParameterHeader _parseParamsHeader(const QString &filePath);
 };
 
 /*===========================================================================*/
diff --git a/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc b/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
index 7c5b7e4f04ea..9471fd0ba167 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
+++ b/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
@@ -14,7 +14,7 @@
 #include "ArduSubFirmwarePlugin.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(APMFirmwarePluginFactoryLog, "qgc.firmwareplugin.apmfirmwarepluginfactory");
+QGC_LOGGING_CATEGORY(APMFirmwarePluginFactoryLog, "FirmwarePlugin.APMFirmwarePluginFactory");
 
 APMFirmwarePluginFactory APMFirmwarePluginFactory(nullptr);
 
diff --git a/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml b/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml
new file mode 100644
index 000000000000..bb968c8d4ecd
--- /dev/null
+++ b/src/FirmwarePlugin/APM/APMFlightModeIndicator.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+ *
+ * (c) 2009-2022 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+import QGroundControl.FactControls
+
+SettingsGroupLayout {
+    Layout.fillWidth:       true
+    heading:                qsTr("Return to Launch")
+    visible:                activeVehicle.multiRotor
+
+    property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+    property Fact rtlAltFact: controller.getParameterFact(-1, "RTL_ALT")
+
+    FactPanelController { id: controller }
+
+    RowLayout {
+        Layout.fillWidth:   true
+        spacing:            ScreenTools.defaultFontPixelWidth * 2
+
+        QGCLabel {
+            id:                 label
+            Layout.fillWidth:   true
+            text:               qsTr("Return At")
+        }
+
+        QGCComboBox {
+            id:             returnAtCombo
+            sizeToContents: true
+            model:          [ qsTr("Current altitude"), qsTr("Specified altitude") ]
+
+            function setCurrentIndex() {
+                if (rtlAltFact.value === 0) {
+                    returnAtCombo.currentIndex = 0
+                } else {
+                    returnAtCombo.currentIndex = 1
+                }
+            }
+
+            Component.onCompleted: setCurrentIndex()
+
+            onActivated: (index) => {
+                if (index === 0) {
+                    rtlAltFact.rawValue = 0
+                } else {
+                    rtlAltFact.rawValue = 1500
+                }
+            }
+
+            Connections {
+                target:             rtlAltFact
+                onRawValueChanged:  returnAtCombo.setCurrentIndex()
+            }
+        }
+
+        FactTextField {
+            fact:       rtlAltFact
+            enabled:    rtlAltFact.rawValue !== 0
+        }
+    }
+}
diff --git a/src/UI/toolbar/APMMainStatusIndicatorContentItem.qml b/src/FirmwarePlugin/APM/APMMainStatusIndicator.qml
similarity index 99%
rename from src/UI/toolbar/APMMainStatusIndicatorContentItem.qml
rename to src/FirmwarePlugin/APM/APMMainStatusIndicator.qml
index 4529c3ccb0b5..635f81df698b 100644
--- a/src/UI/toolbar/APMMainStatusIndicatorContentItem.qml
+++ b/src/FirmwarePlugin/APM/APMMainStatusIndicator.qml
@@ -13,10 +13,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-
-
-
-
 import QGroundControl.FactControls
 
 ColumnLayout {
diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
index 58798500ad66..dbb09770cc17 100644
--- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc
+++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
@@ -15,8 +15,8 @@
 #include <QtCore/QRegularExpressionMatch>
 #include <QtCore/QStack>
 
-QGC_LOGGING_CATEGORY(APMParameterMetaDataLog, "qgc.firmwareplugin.apm.apmparametermetadata")
-QGC_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog, "qgc.firmwareplugin.apm.apmparametermetadata:verbose")
+QGC_LOGGING_CATEGORY(APMParameterMetaDataLog, "FirmwarePlugin.APMParameterMetaData")
+QGC_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog, "FirmwarePlugin.APMParameterMetaData:verbose")
 
 APMParameterMetaData::APMParameterMetaData(QObject *parent)
     : QObject(parent)
diff --git a/src/UI/toolbar/APMSupportForwardingIndicator.qml b/src/FirmwarePlugin/APM/APMSupportForwardingIndicator.qml
similarity index 97%
rename from src/UI/toolbar/APMSupportForwardingIndicator.qml
rename to src/FirmwarePlugin/APM/APMSupportForwardingIndicator.qml
index 97a22f9e8851..d16e91c390aa 100644
--- a/src/UI/toolbar/APMSupportForwardingIndicator.qml
+++ b/src/FirmwarePlugin/APM/APMSupportForwardingIndicator.qml
@@ -27,12 +27,12 @@ Item {
 
     Component {
         id: forwardingSupportInfoPage
-        
+
         ToolIndicatorPage {
             contentComponent: SettingsGroupLayout {
                 QGCLabel { text: qsTr("Mavlink traffic is being forwarded to a support server") }
 
-                LabelledLabel { 
+                LabelledLabel {
                     label:      qsTr("Server name:")
                     labelText:  QGroundControl.settingsManager.mavlinkSettings.forwardMavlinkAPMSupportHostName.value
                 }
@@ -49,7 +49,7 @@ Item {
         source:             "/qmlimages/ForwardingSupportIconGreen.svg"
         fillMode:           Image.PreserveAspectFit
     }
-    
+
     MouseArea {
         anchors.fill: parent
         onClicked:      mainWindow.showIndicatorDrawer(forwardingSupportInfoPage, control)
diff --git a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
index c86410018897..d8e04f52218d 100644
--- a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
@@ -43,7 +43,7 @@ ArduPlaneFirmwarePlugin::ArduPlaneFirmwarePlugin(QObject *parent)
         { APMPlaneMode::THERMAL       , _thermalFlightMode      },
         { APMPlaneMode::LOITER2QLAND  , _loiter2qlandFlightMode },
         { APMPlaneMode::AUTOLAND      , _autolandFlightMode     },
-        
+
     });
 
     static FlightModeList availableFlightModes = {
@@ -108,6 +108,11 @@ QString ArduPlaneFirmwarePlugin::stabilizedFlightMode() const
     return _modeEnumToString.value(APMPlaneMode::STABILIZE, _stabilizeFlightMode);
 }
 
+QString ArduPlaneFirmwarePlugin::pauseFlightMode() const
+{
+    return _modeEnumToString.value(APMPlaneMode::LOITER, _loiterFlightMode);
+}
+
 void ArduPlaneFirmwarePlugin::updateAvailableFlightModes(FlightModeList &modeList)
 {
     for (FirmwareFlightMode &mode: modeList) {
diff --git a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h
index a61643aca675..b33871ad9b47 100644
--- a/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h
+++ b/src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h
@@ -52,11 +52,11 @@ class ArduPlaneFirmwarePlugin : public APMFirmwarePlugin
     explicit ArduPlaneFirmwarePlugin(QObject *parent = nullptr);
     ~ArduPlaneFirmwarePlugin();
 
-    QString pauseFlightMode() const override { return QString("Loiter"); }
     QString offlineEditingParamFile(Vehicle *vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral(":/FirmwarePlugin/APM/Plane.OfflineEditing.params"); }
     QString autoDisarmParameter(Vehicle *vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("LAND_DISARMDELAY"); }
     int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const override;
     const FirmwarePlugin::remapParamNameMajorVersionMap_t &paramNameRemapMajorVersionMap() const override { return _remapParamName; }
+    QString pauseFlightMode() const override;
     QString takeOffFlightMode() const override;
     QString stabilizedFlightMode() const override;
     void updateAvailableFlightModes(FlightModeList &modeList) override;
diff --git a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
index b8a5d351c116..d37a1d3815fc 100644
--- a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
@@ -81,6 +81,16 @@ QString ArduRoverFirmwarePlugin::stabilizedFlightMode() const
     return _modeEnumToString.value(APMRoverMode::MANUAL, _manualFlightMode);
 }
 
+QString ArduRoverFirmwarePlugin::pauseFlightMode() const
+{
+    return _modeEnumToString.value(APMRoverMode::HOLD, _holdFlightMode);
+}
+
+QString ArduRoverFirmwarePlugin::followFlightMode() const
+{
+    return _modeEnumToString.value(APMRoverMode::FOLLOW, _followFlightMode);
+}
+
 void ArduRoverFirmwarePlugin::updateAvailableFlightModes(FlightModeList &modeList)
 {
     for (FirmwareFlightMode &mode: modeList) {
diff --git a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h
index 9f65de12bf7d..3a20415bbf0c 100644
--- a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h
+++ b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h
@@ -40,8 +40,6 @@ class ArduRoverFirmwarePlugin : public APMFirmwarePlugin
     explicit ArduRoverFirmwarePlugin(QObject *parent = nullptr);
     ~ArduRoverFirmwarePlugin();
 
-    QString pauseFlightMode() const override { return QStringLiteral("Hold"); }
-    QString followFlightMode() const override { return QStringLiteral("Follow"); }
     void guidedModeChangeAltitude(Vehicle* vehicle, double altitudeChange, bool pauseVehicle) override;
     int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const override;
     const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap() const override { return _remapParamName; }
@@ -49,6 +47,8 @@ class ArduRoverFirmwarePlugin : public APMFirmwarePlugin
     bool supportsSmartRTL() const override { return true; }
     QString offlineEditingParamFile(Vehicle *vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral(":/FirmwarePlugin/APM/Rover.OfflineEditing.params"); }
 
+    QString pauseFlightMode() const override;
+    QString followFlightMode() const override;
     QString stabilizedFlightMode() const override;
     void updateAvailableFlightModes(FlightModeList &modeList) override;
 
diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
index eff3ca85f665..848e669cfede 100644
--- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
@@ -11,7 +11,7 @@
 #include "QGCLoggingCategory.h"
 #include "Vehicle.h"
 
-QGC_LOGGING_CATEGORY(APMSubmarineFactGroupLog, "qgc.firmwareplugin.apm.ardusubfirmwareplugin")
+QGC_LOGGING_CATEGORY(APMSubmarineFactGroupLog, "FirmwarePlugin.ArduSubFirmwarePlugin")
 
 APMSubmarineFactGroup::APMSubmarineFactGroup(QObject *parent)
     : FactGroup(300, QStringLiteral(":/json/Vehicle/SubmarineFact.json"), parent)
@@ -175,33 +175,6 @@ bool ArduSubFirmwarePlugin::isCapable(const Vehicle *vehicle, FirmwareCapabiliti
     return ((capabilities & available) == capabilities);
 }
 
-const QVariantList &ArduSubFirmwarePlugin::toolIndicators(const Vehicle *vehicle)
-{
-    Q_UNUSED(vehicle);
-    //-- Sub specific list of indicators (Enter your modified list here)
-    if (_toolIndicators.isEmpty()) {
-        _toolIndicators = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/BatteryIndicator.qml")),
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/JoystickIndicator.qml")),
-        });
-    }
-    return _toolIndicators;
-}
-
-const QVariantList& ArduSubFirmwarePlugin::modeIndicators(const Vehicle *vehicle)
-{
-    Q_UNUSED(vehicle);
-    //-- Sub specific list of indicators (Enter your modified list here)
-    if (_modeIndicators.isEmpty()) {
-        _modeIndicators = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/ModeIndicator.qml")),
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/ArmedIndicator.qml")),
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MultiVehicleSelector.qml")),
-        });
-    }
-    return _modeIndicators;
-}
-
 void ArduSubFirmwarePlugin::_handleNamedValueFloat(mavlink_message_t *message)
 {
     mavlink_named_value_float_t value{};
diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
index 2392e7b789a6..d7231ebc228f 100644
--- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
+++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
@@ -109,8 +109,6 @@ class ArduSubFirmwarePlugin : public APMFirmwarePlugin
     QString brandImageOutdoor(const Vehicle *vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); }
     const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap() const override { return _remapParamName; }
     int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const override;
-    const QVariantList &toolIndicators(const Vehicle *vehicle) override;
-    const QVariantList &modeIndicators(const Vehicle *vehicle) override;
     bool adjustIncomingMavlinkMessage(Vehicle *vehicle, mavlink_message_t *message) override;
     QMap<QString, FactGroup*> *factGroups() override;
     void adjustMetaData(MAV_TYPE vehicleType, FactMetaData *metaData) override;
@@ -138,7 +136,6 @@ class ArduSubFirmwarePlugin : public APMFirmwarePlugin
 
 private:
     QVariantList _toolIndicators;
-    QVariantList _modeIndicators;
     static bool _remapParamNameIntialized;
     QMap<QString, QString> _factRenameMap;
     static FirmwarePlugin::remapParamNameMajorVersionMap_t _remapParamName;
diff --git a/src/FirmwarePlugin/APM/CMakeLists.txt b/src/FirmwarePlugin/APM/CMakeLists.txt
index d87a8ab7084f..c164262adca6 100644
--- a/src/FirmwarePlugin/APM/CMakeLists.txt
+++ b/src/FirmwarePlugin/APM/CMakeLists.txt
@@ -107,3 +107,20 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "qgcresources_apm_params"
         "${ArduPilotParams_SOURCE_DIR}/Sub-4.1/apm.pdef.xml"
         "${ArduPilotParams_SOURCE_DIR}/Sub-4.5/apm.pdef.xml"
 )
+
+# Add qml module
+qt_add_library(APMFirmwareModule STATIC)
+
+qt_add_qml_module(APMFirmwareModule
+    URI QGroundControl.FirmwarePlugin.APM
+    VERSION 1.0
+    RESOURCE_PREFIX /qml
+    QML_FILES
+        APMBatteryIndicator.qml
+        APMFlightModeIndicator.qml
+        APMMainStatusIndicator.qml
+        APMSupportForwardingIndicator.qml
+    NO_PLUGIN
+)
+
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE APMFirmwareModule)
diff --git a/src/FirmwarePlugin/APM/Copter.OfflineEditing.params b/src/FirmwarePlugin/APM/Copter.OfflineEditing.params
index 0412f36b1ecf..e44cf725372c 100644
--- a/src/FirmwarePlugin/APM/Copter.OfflineEditing.params
+++ b/src/FirmwarePlugin/APM/Copter.OfflineEditing.params
@@ -1,29 +1,41 @@
 # Onboard parameters for Vehicle 1
 #
 # Stack: ArduPilot
-# Vehicle: Quadrotor
-# Version: 4.6.2 
-# Git Revision: 1ebd4d99
+# Vehicle: Multi-Rotor
+# Version: 4.0.5 rc
+# Git Revision: b319b27
 #
 # Vehicle-Id Component-Id Name Value Type
 1	1	ACRO_BAL_PITCH	1.000000000000000000	9
 1	1	ACRO_BAL_ROLL	1.000000000000000000	9
-1	1	ACRO_OPTIONS	0	2
 1	1	ACRO_RP_EXPO	0.300000011920928955	9
-1	1	ACRO_RP_RATE	360.000000000000000000	9
-1	1	ACRO_RP_RATE_TC	0.000000000000000000	9
+1	1	ACRO_RP_P	4.500000000000000000	9
 1	1	ACRO_THR_MID	0.000000000000000000	9
 1	1	ACRO_TRAINER	2	2
+1	1	ACRO_YAW_P	4.500000000000000000	9
 1	1	ACRO_Y_EXPO	0.000000000000000000	9
-1	1	ACRO_Y_RATE	202.500000000000000000	9
-1	1	ACRO_Y_RATE_TC	0.000000000000000000	9
-1	1	ADSB_TYPE	0	2
+1	1	ADSB_EMIT_TYPE	14	2
+1	1	ADSB_ENABLE	1	2
+1	1	ADSB_ICAO_ID	0	6
+1	1	ADSB_ICAO_SPECL	0	6
+1	1	ADSB_LEN_WIDTH	1	2
+1	1	ADSB_LIST_ALT	0	4
+1	1	ADSB_LIST_MAX	25	4
+1	1	ADSB_LIST_RADIUS	2000	6
+1	1	ADSB_LOG	1	2
+1	1	ADSB_OFFSET_LAT	4	2
+1	1	ADSB_OFFSET_LON	1	2
+1	1	ADSB_RF_CAPABLE	0	2
+1	1	ADSB_RF_SELECT	1	2
+1	1	ADSB_SQUAWK	1200	4
 1	1	AHRS_COMP_BETA	0.100000001490116119	9
-1	1	AHRS_EKF_TYPE	3	2
+1	1	AHRS_CUSTOM_PIT	0.000000000000000000	9
+1	1	AHRS_CUSTOM_ROLL	0.000000000000000000	9
+1	1	AHRS_CUSTOM_YAW	0.000000000000000000	9
+1	1	AHRS_EKF_TYPE	2	2
 1	1	AHRS_GPS_GAIN	1.000000000000000000	9
 1	1	AHRS_GPS_MINSATS	6	2
 1	1	AHRS_GPS_USE	1	2
-1	1	AHRS_OPTIONS	0	4
 1	1	AHRS_ORIENTATION	0	2
 1	1	AHRS_RP_P	0.200000002980232239	9
 1	1	AHRS_TRIM_X	0.000000000000000000	9
@@ -31,15 +43,11 @@
 1	1	AHRS_TRIM_Z	0.000000000000000000	9
 1	1	AHRS_WIND_MAX	0	2
 1	1	AHRS_YAW_P	0.200000002980232239	9
-1	1	ANGLE_MAX	3000	4
+1	1	ANGLE_MAX	4500	4
 1	1	ARMING_ACCTHRESH	0.750000000000000000	9
 1	1	ARMING_CHECK	1	6
-1	1	ARMING_MAGTHRESH	100	4
 1	1	ARMING_MIS_ITEMS	0	6
-1	1	ARMING_NEED_LOC	0	2
-1	1	ARMING_OPTIONS	0	6
 1	1	ARMING_RUDDER	2	2
-1	1	ARSPD_ENABLE	0	2
 1	1	ATC_ACCEL_P_MAX	110000.000000000000000000	9
 1	1	ATC_ACCEL_R_MAX	110000.000000000000000000	9
 1	1	ATC_ACCEL_Y_MAX	27000.000000000000000000	9
@@ -49,90 +57,47 @@
 1	1	ATC_ANG_RLL_P	4.500000000000000000	9
 1	1	ATC_ANG_YAW_P	4.500000000000000000	9
 1	1	ATC_INPUT_TC	0.150000005960464478	9
-1	1	ATC_LAND_P_MULT	1.000000000000000000	9
-1	1	ATC_LAND_R_MULT	1.000000000000000000	9
-1	1	ATC_LAND_Y_MULT	1.000000000000000000	9
 1	1	ATC_RATE_FF_ENAB	1	2
 1	1	ATC_RATE_P_MAX	0.000000000000000000	9
 1	1	ATC_RATE_R_MAX	0.000000000000000000	9
 1	1	ATC_RATE_Y_MAX	0.000000000000000000	9
 1	1	ATC_RAT_PIT_D	0.003599999938160181	9
-1	1	ATC_RAT_PIT_D_FF	0.000000000000000000	9
 1	1	ATC_RAT_PIT_FF	0.000000000000000000	9
 1	1	ATC_RAT_PIT_FLTD	20.000000000000000000	9
 1	1	ATC_RAT_PIT_FLTE	0.000000000000000000	9
 1	1	ATC_RAT_PIT_FLTT	20.000000000000000000	9
 1	1	ATC_RAT_PIT_I	0.135000005364418030	9
 1	1	ATC_RAT_PIT_IMAX	0.500000000000000000	9
-1	1	ATC_RAT_PIT_NEF	0	2
-1	1	ATC_RAT_PIT_NTF	0	2
 1	1	ATC_RAT_PIT_P	0.135000005364418030	9
-1	1	ATC_RAT_PIT_PDMX	0.000000000000000000	9
-1	1	ATC_RAT_PIT_SMAX	0.000000000000000000	9
 1	1	ATC_RAT_RLL_D	0.003599999938160181	9
-1	1	ATC_RAT_RLL_D_FF	0.000000000000000000	9
 1	1	ATC_RAT_RLL_FF	0.000000000000000000	9
 1	1	ATC_RAT_RLL_FLTD	20.000000000000000000	9
 1	1	ATC_RAT_RLL_FLTE	0.000000000000000000	9
 1	1	ATC_RAT_RLL_FLTT	20.000000000000000000	9
 1	1	ATC_RAT_RLL_I	0.135000005364418030	9
 1	1	ATC_RAT_RLL_IMAX	0.500000000000000000	9
-1	1	ATC_RAT_RLL_NEF	0	2
-1	1	ATC_RAT_RLL_NTF	0	2
 1	1	ATC_RAT_RLL_P	0.135000005364418030	9
-1	1	ATC_RAT_RLL_PDMX	0.000000000000000000	9
-1	1	ATC_RAT_RLL_SMAX	0.000000000000000000	9
 1	1	ATC_RAT_YAW_D	0.000000000000000000	9
-1	1	ATC_RAT_YAW_D_FF	0.000000000000000000	9
 1	1	ATC_RAT_YAW_FF	0.000000000000000000	9
-1	1	ATC_RAT_YAW_FLTD	20.000000000000000000	9
+1	1	ATC_RAT_YAW_FLTD	0.000000000000000000	9
 1	1	ATC_RAT_YAW_FLTE	2.500000000000000000	9
 1	1	ATC_RAT_YAW_FLTT	20.000000000000000000	9
-1	1	ATC_RAT_YAW_I	0.019999999552965164	9
+1	1	ATC_RAT_YAW_I	0.017999999225139618	9
 1	1	ATC_RAT_YAW_IMAX	0.500000000000000000	9
-1	1	ATC_RAT_YAW_NEF	0	2
-1	1	ATC_RAT_YAW_NTF	0	2
-1	1	ATC_RAT_YAW_P	0.300000011920928955	9
-1	1	ATC_RAT_YAW_PDMX	0.000000000000000000	9
-1	1	ATC_RAT_YAW_SMAX	0.000000000000000000	9
+1	1	ATC_RAT_YAW_P	0.180000007152557373	9
 1	1	ATC_SLEW_YAW	6000.000000000000000000	9
-1	1	ATC_THR_G_BOOST	0.000000000000000000	9
 1	1	ATC_THR_MIX_MAN	0.100000001490116119	9
 1	1	ATC_THR_MIX_MAX	0.500000000000000000	9
 1	1	ATC_THR_MIX_MIN	0.100000001490116119	9
-1	1	AUTOTUNE_AGGR	0.075000002980232239	9
+1	1	AUTOTUNE_AGGR	0.100000001490116119	9
 1	1	AUTOTUNE_AXES	7	2
-1	1	AUTOTUNE_MIN_D	0.000500000023748726	9
-1	1	AUTO_OPTIONS	0	6
+1	1	AUTOTUNE_MIN_D	0.001000000047497451	9
 1	1	AVD_ENABLE	0	2
-1	1	AVOID_ACCEL_MAX	3.000000000000000000	9
-1	1	AVOID_ALT_MIN	0.000000000000000000	9
 1	1	AVOID_ANGLE_MAX	1000	4
-1	1	AVOID_BACKUP_DZ	0.100000001490116119	9
-1	1	AVOID_BACKUP_SPD	0.750000000000000000	9
-1	1	AVOID_BACKZ_SPD	0.750000000000000000	9
 1	1	AVOID_BEHAVE	0	2
 1	1	AVOID_DIST_MAX	5.000000000000000000	9
 1	1	AVOID_ENABLE	3	2
 1	1	AVOID_MARGIN	2.000000000000000000	9
-1	1	BARO1_DEVID	65540	6
-1	1	BARO1_GND_PRESS	101325.062500000000000000	9
-1	1	BARO1_WCF_ENABLE	0	2
-1	1	BARO2_DEVID	65796	6
-1	1	BARO2_GND_PRESS	101324.507812500000000000	9
-1	1	BARO2_WCF_ENABLE	0	2
-1	1	BARO3_DEVID	0	6
-1	1	BARO3_GND_PRESS	0.000000000000000000	9
-1	1	BARO3_WCF_ENABLE	0	2
-1	1	BARO_ALTERR_MAX	2000.000000000000000000	9
-1	1	BARO_ALT_OFFSET	0.000000000000000000	9
-1	1	BARO_EXT_BUS	-1	2
-1	1	BARO_FIELD_ELV	0.000000000000000000	9
-1	1	BARO_FLTR_RNG	0	2
-1	1	BARO_GND_TEMP	0.000000000000000000	9
-1	1	BARO_OPTIONS	0	4
-1	1	BARO_PRIMARY	0	2
-1	1	BARO_PROBE_EXT	0	6
 1	1	BATT2_MONITOR	0	2
 1	1	BATT3_MONITOR	0	2
 1	1	BATT4_MONITOR	0	2
@@ -141,83 +106,87 @@
 1	1	BATT7_MONITOR	0	2
 1	1	BATT8_MONITOR	0	2
 1	1	BATT9_MONITOR	0	2
-1	1	BATT_AMP_OFFSET	0.000000000000000000	9
-1	1	BATT_AMP_PERVLT	17.000000000000000000	9
-1	1	BATT_ARM_MAH	0	6
-1	1	BATT_ARM_VOLT	0.000000000000000000	9
-1	1	BATT_CAPACITY	3300	6
-1	1	BATT_CRT_MAH	0.000000000000000000	9
-1	1	BATT_CRT_VOLT	0.000000000000000000	9
-1	1	BATT_CURR_PIN	12	2
-1	1	BATT_FS_CRT_ACT	0	2
-1	1	BATT_FS_LOW_ACT	0	2
-1	1	BATT_FS_VOLTSRC	0	2
-1	1	BATT_LOW_MAH	0.000000000000000000	9
-1	1	BATT_LOW_TIMER	10	2
-1	1	BATT_LOW_VOLT	10.500000000000000000	9
-1	1	BATT_MONITOR	4	2
-1	1	BATT_OPTIONS	0	6
-1	1	BATT_SERIAL_NUM	-1	6
-1	1	BATT_VLT_OFFSET	0.000000000000000000	9
-1	1	BATT_VOLT_MULT	10.100000381469726563	9
-1	1	BATT_VOLT_PIN	13	2
+1	1	BATT_MONITOR	0	2
+1	1	BCN_ALT	0.000000000000000000	9
+1	1	BCN_LATITUDE	0.000000000000000000	9
+1	1	BCN_LONGITUDE	0.000000000000000000	9
+1	1	BCN_ORIENT_YAW	0	4
 1	1	BCN_TYPE	0	2
+1	1	BRD_ALT_CONFIG	0	2
 1	1	BRD_BOOT_DELAY	0	4
-1	1	BRD_OPTIONS	0	6
+1	1	BRD_IMUHEAT_I	0.070000000298023224	9
+1	1	BRD_IMUHEAT_IMAX	70.000000000000000000	9
+1	1	BRD_IMUHEAT_P	50.000000000000000000	9
+1	1	BRD_IMU_TARGTEMP	45	2
+1	1	BRD_IO_ENABLE	1	2
+1	1	BRD_OPTIONS	1	6
+1	1	BRD_PWM_COUNT	4	2
+1	1	BRD_PWM_VOLT_SEL	0	2
 1	1	BRD_RTC_TYPES	1	2
 1	1	BRD_RTC_TZ_MIN	0	4
+1	1	BRD_SAFETYENABLE	1	2
 1	1	BRD_SAFETYOPTION	3	4
-1	1	BRD_SAFETY_DEFLT	0	2
-1	1	BRD_SAFETY_MASK	16368	6
-1	1	BRD_SD_FENCE	0	4
-1	1	BRD_SD_MISSION	0	4
-1	1	BRD_SERIAL_NUM	0	6
+1	1	BRD_SAFETY_MASK	16383	6
+1	1	BRD_SBUS_OUT	0	2
+1	1	BRD_SD_SLOWDOWN	0	2
+1	1	BRD_SER1_RTSCTS	2	2
+1	1	BRD_SER2_RTSCTS	2	2
+1	1	BRD_SERIAL_NUM	0	4
+1	1	BRD_TYPE	3	2
 1	1	BRD_VBUS_MIN	4.300000190734863281	9
 1	1	BRD_VSERVO_MIN	0.000000000000000000	9
 1	1	BTN_ENABLE	0	2
-1	1	CAM1_TYPE	0	2
-1	1	CAM2_TYPE	0	2
 1	1	CAM_AUTO_ONLY	0	2
+1	1	CAM_DURATION	10	2
+1	1	CAM_FEEDBACK_PIN	-1	2
+1	1	CAM_FEEDBACK_POL	1	2
 1	1	CAM_MAX_ROLL	0	4
-1	1	CAM_RC_TYPE	0	2
+1	1	CAM_MIN_INTERVAL	0	4
+1	1	CAM_RELAY_ON	1	2
+1	1	CAM_SERVO_OFF	1100	4
+1	1	CAM_SERVO_ON	1300	4
+1	1	CAM_TRIGG_DIST	0.000000000000000000	9
+1	1	CAM_TRIGG_TYPE	0	2
+1	1	CAM_TYPE	0	2
 1	1	CAN_D1_PROTOCOL	1	2
-1	1	CAN_D1_PROTOCOL2	0	2
 1	1	CAN_D2_PROTOCOL	1	2
-1	1	CAN_D2_PROTOCOL2	0	2
-1	1	CAN_LOGLEVEL	0	2
 1	1	CAN_P1_DRIVER	0	2
 1	1	CAN_P2_DRIVER	0	2
-1	1	CC_TYPE	0	2
+1	1	CAN_SLCAN_CPORT	0	2
+1	1	CAN_SLCAN_SERNUM	-1	2
+1	1	CAN_SLCAN_TIMOUT	0	4
 1	1	CHUTE_ENABLED	0	2
-1	1	CIRCLE_OPTIONS	1	4
+1	1	CIRCLE_CONTROL	1	4
 1	1	CIRCLE_RADIUS	1000.000000000000000000	9
 1	1	CIRCLE_RATE	20.000000000000000000	9
 1	1	COMPASS_AUTODEC	1	2
 1	1	COMPASS_AUTO_ROT	2	2
 1	1	COMPASS_CAL_FIT	16.000000000000000000	9
-1	1	COMPASS_DEC	0.223357215523719788	9
-1	1	COMPASS_DEV_ID	97539	6
-1	1	COMPASS_DEV_ID2	131874	6
-1	1	COMPASS_DEV_ID3	263178	6
-1	1	COMPASS_DEV_ID4	97283	6
-1	1	COMPASS_DEV_ID5	97795	6
-1	1	COMPASS_DEV_ID6	98051	6
+1	1	COMPASS_CUS_PIT	0.000000000000000000	9
+1	1	COMPASS_CUS_ROLL	0.000000000000000000	9
+1	1	COMPASS_CUS_YAW	0.000000000000000000	9
+1	1	COMPASS_DEC	0.000000000000000000	9
+1	1	COMPASS_DEV_ID	590114	6
+1	1	COMPASS_DEV_ID2	0	6
+1	1	COMPASS_DEV_ID3	0	6
+1	1	COMPASS_DEV_ID4	0	6
+1	1	COMPASS_DEV_ID5	0	6
+1	1	COMPASS_DEV_ID6	0	6
 1	1	COMPASS_DEV_ID7	0	6
 1	1	COMPASS_DEV_ID8	0	6
-1	1	COMPASS_DIA2_X	1.000000000000000000	9
-1	1	COMPASS_DIA2_Y	1.000000000000000000	9
-1	1	COMPASS_DIA2_Z	1.000000000000000000	9
-1	1	COMPASS_DIA3_X	1.000000000000000000	9
-1	1	COMPASS_DIA3_Y	1.000000000000000000	9
-1	1	COMPASS_DIA3_Z	1.000000000000000000	9
+1	1	COMPASS_DIA2_X	0.000000000000000000	9
+1	1	COMPASS_DIA2_Y	0.000000000000000000	9
+1	1	COMPASS_DIA2_Z	0.000000000000000000	9
+1	1	COMPASS_DIA3_X	0.000000000000000000	9
+1	1	COMPASS_DIA3_Y	0.000000000000000000	9
+1	1	COMPASS_DIA3_Z	0.000000000000000000	9
 1	1	COMPASS_DIA_X	1.000000000000000000	9
 1	1	COMPASS_DIA_Y	1.000000000000000000	9
 1	1	COMPASS_DIA_Z	1.000000000000000000	9
-1	1	COMPASS_DISBLMSK	0	6
 1	1	COMPASS_ENABLE	1	2
 1	1	COMPASS_EXTERN2	0	2
 1	1	COMPASS_EXTERN3	0	2
-1	1	COMPASS_EXTERNAL	1	2
+1	1	COMPASS_EXTERNAL	0	2
 1	1	COMPASS_FLTR_RNG	0	2
 1	1	COMPASS_LEARN	0	2
 1	1	COMPASS_MOT2_X	0.000000000000000000	9
@@ -240,132 +209,93 @@
 1	1	COMPASS_ODI_Y	0.000000000000000000	9
 1	1	COMPASS_ODI_Z	0.000000000000000000	9
 1	1	COMPASS_OFFS_MAX	1800	4
-1	1	COMPASS_OFS2_X	5.000000000000000000	9
-1	1	COMPASS_OFS2_Y	13.000000000000000000	9
-1	1	COMPASS_OFS2_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS3_X	5.000000000000000000	9
-1	1	COMPASS_OFS3_Y	13.000000000000000000	9
-1	1	COMPASS_OFS3_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS_X	5.000000000000000000	9
-1	1	COMPASS_OFS_Y	13.000000000000000000	9
-1	1	COMPASS_OFS_Z	-18.000000000000000000	9
+1	1	COMPASS_OFS2_X	0.000000000000000000	9
+1	1	COMPASS_OFS2_Y	0.000000000000000000	9
+1	1	COMPASS_OFS2_Z	0.000000000000000000	9
+1	1	COMPASS_OFS3_X	0.000000000000000000	9
+1	1	COMPASS_OFS3_Y	0.000000000000000000	9
+1	1	COMPASS_OFS3_Z	0.000000000000000000	9
+1	1	COMPASS_OFS_X	0.000000000000000000	9
+1	1	COMPASS_OFS_Y	0.000000000000000000	9
+1	1	COMPASS_OFS_Z	0.000000000000000000	9
 1	1	COMPASS_OPTIONS	0	4
 1	1	COMPASS_ORIENT	0	2
 1	1	COMPASS_ORIENT2	0	2
 1	1	COMPASS_ORIENT3	0	2
 1	1	COMPASS_PMOT_EN	0	2
-1	1	COMPASS_PRIO1_ID	97539	6
-1	1	COMPASS_PRIO2_ID	131874	6
-1	1	COMPASS_PRIO3_ID	263178	6
-1	1	COMPASS_SCALE	1.000000000000000000	9
-1	1	COMPASS_SCALE2	1.000000000000000000	9
-1	1	COMPASS_SCALE3	1.000000000000000000	9
+1	1	COMPASS_PRIO1_ID	590114	6
+1	1	COMPASS_PRIO2_ID	0	6
+1	1	COMPASS_PRIO3_ID	0	6
+1	1	COMPASS_SCALE	0.000000000000000000	9
+1	1	COMPASS_SCALE2	0.000000000000000000	9
+1	1	COMPASS_SCALE3	0.000000000000000000	9
+1	1	COMPASS_TYPEMASK	32	6
 1	1	COMPASS_USE	1	2
 1	1	COMPASS_USE2	1	2
 1	1	COMPASS_USE3	1	2
-1	1	CUST_ROT_ENABLE	0	2
 1	1	DEV_OPTIONS	0	6
-1	1	DID_ENABLE	0	2
 1	1	DISARM_DELAY	10	2
-1	1	EAHRS_TYPE	0	2
-1	1	EFI_TYPE	0	2
-1	1	EK2_ENABLE	0	2
-1	1	EK3_ABIAS_P_NSE	0.019999999552965164	9
-1	1	EK3_ACC_BIAS_LIM	1.000000000000000000	9
-1	1	EK3_ACC_P_NSE	0.349999994039535522	9
-1	1	EK3_AFFINITY	0	6
-1	1	EK3_ALT_M_NSE	2.000000000000000000	9
-1	1	EK3_BCN_DELAY	50	2
-1	1	EK3_BCN_I_GTE	500	4
-1	1	EK3_BCN_M_NSE	1.000000000000000000	9
-1	1	EK3_BETA_MASK	0	2
-1	1	EK3_CHECK_SCALE	100	4
-1	1	EK3_DRAG_BCOEF_X	0.000000000000000000	9
-1	1	EK3_DRAG_BCOEF_Y	0.000000000000000000	9
-1	1	EK3_DRAG_MCOEF	0.000000000000000000	9
-1	1	EK3_DRAG_M_NSE	0.500000000000000000	9
-1	1	EK3_EAS_I_GATE	400	4
-1	1	EK3_EAS_M_NSE	1.399999976158142090	9
-1	1	EK3_ENABLE	1	2
-1	1	EK3_ERR_THRESH	0.200000002980232239	9
-1	1	EK3_FLOW_DELAY	10	2
-1	1	EK3_FLOW_I_GATE	300	4
-1	1	EK3_FLOW_M_NSE	0.250000000000000000	9
-1	1	EK3_FLOW_USE	1	2
-1	1	EK3_GBIAS_P_NSE	0.001000000047497451	9
-1	1	EK3_GLITCH_RAD	25	2
-1	1	EK3_GND_EFF_DZ	4.000000000000000000	9
-1	1	EK3_GPS_CHECK	31	2
-1	1	EK3_GPS_VACC_MAX	0.000000000000000000	9
-1	1	EK3_GSF_RST_MAX	2	2
-1	1	EK3_GSF_RUN_MASK	3	2
-1	1	EK3_GSF_USE_MASK	3	2
-1	1	EK3_GYRO_P_NSE	0.014999999664723873	9
-1	1	EK3_HGT_DELAY	60	4
-1	1	EK3_HGT_I_GATE	500	4
-1	1	EK3_HRT_FILT	2.000000000000000000	9
-1	1	EK3_IMU_MASK	3	2
-1	1	EK3_LOG_LEVEL	0	2
-1	1	EK3_MAGB_P_NSE	0.000099999997473788	9
-1	1	EK3_MAGE_P_NSE	0.001000000047497451	9
-1	1	EK3_MAG_CAL	3	2
-1	1	EK3_MAG_EF_LIM	50	4
-1	1	EK3_MAG_I_GATE	300	4
-1	1	EK3_MAG_MASK	0	2
-1	1	EK3_MAG_M_NSE	0.050000000745058060	9
-1	1	EK3_MAX_FLOW	2.500000000000000000	9
-1	1	EK3_NOAID_M_NSE	10.000000000000000000	9
-1	1	EK3_OGNM_TEST_SF	2.000000000000000000	9
-1	1	EK3_OGN_HGT_MASK	0	2
-1	1	EK3_OPTIONS	0	6
-1	1	EK3_POSNE_M_NSE	0.500000000000000000	9
-1	1	EK3_POS_I_GATE	500	4
-1	1	EK3_PRIMARY	0	2
-1	1	EK3_RNG_I_GATE	500	4
-1	1	EK3_RNG_M_NSE	0.500000000000000000	9
-1	1	EK3_RNG_USE_HGT	-1	2
-1	1	EK3_RNG_USE_SPD	2.000000000000000000	9
-1	1	EK3_SRC1_POSXY	3	2
-1	1	EK3_SRC1_POSZ	1	2
-1	1	EK3_SRC1_VELXY	3	2
-1	1	EK3_SRC1_VELZ	3	2
-1	1	EK3_SRC1_YAW	1	2
-1	1	EK3_SRC2_POSXY	0	2
-1	1	EK3_SRC2_POSZ	1	2
-1	1	EK3_SRC2_VELXY	0	2
-1	1	EK3_SRC2_VELZ	0	2
-1	1	EK3_SRC2_YAW	0	2
-1	1	EK3_SRC3_POSXY	0	2
-1	1	EK3_SRC3_POSZ	1	2
-1	1	EK3_SRC3_VELXY	0	2
-1	1	EK3_SRC3_VELZ	0	2
-1	1	EK3_SRC3_YAW	0	2
-1	1	EK3_SRC_OPTIONS	1	4
-1	1	EK3_TAU_OUTPUT	25	2
-1	1	EK3_TERR_GRAD	0.100000001490116119	9
-1	1	EK3_VELD_M_NSE	0.500000000000000000	9
-1	1	EK3_VELNE_M_NSE	0.300000011920928955	9
-1	1	EK3_VEL_I_GATE	500	4
-1	1	EK3_VIS_VERR_MAX	0.899999976158142090	9
-1	1	EK3_VIS_VERR_MIN	0.100000001490116119	9
-1	1	EK3_WENC_VERR	0.100000001490116119	9
-1	1	EK3_WIND_PSCALE	1.000000000000000000	9
-1	1	EK3_WIND_P_NSE	0.200000002980232239	9
-1	1	EK3_YAW_I_GATE	300	4
-1	1	EK3_YAW_M_NSE	0.500000000000000000	9
+1	1	EK2_ABIAS_P_NSE	0.004999999888241291	9
+1	1	EK2_ACC_P_NSE	0.600000023841857910	9
+1	1	EK2_ALT_M_NSE	3.000000000000000000	9
+1	1	EK2_ALT_SOURCE	0	2
+1	1	EK2_BCN_DELAY	50	2
+1	1	EK2_BCN_I_GTE	500	4
+1	1	EK2_BCN_M_NSE	1.000000000000000000	9
+1	1	EK2_CHECK_SCALE	100	4
+1	1	EK2_EAS_I_GATE	400	4
+1	1	EK2_EAS_M_NSE	1.399999976158142090	9
+1	1	EK2_ENABLE	1	2
+1	1	EK2_EXTNAV_DELAY	10	2
+1	1	EK2_FLOW_DELAY	10	2
+1	1	EK2_FLOW_I_GATE	300	4
+1	1	EK2_FLOW_M_NSE	0.250000000000000000	9
+1	1	EK2_FLOW_USE	1	2
+1	1	EK2_GBIAS_P_NSE	0.000099999997473788	9
+1	1	EK2_GLITCH_RAD	25	2
+1	1	EK2_GPS_CHECK	31	2
+1	1	EK2_GPS_TYPE	0	2
+1	1	EK2_GSCL_P_NSE	0.000500000023748726	9
+1	1	EK2_GYRO_P_NSE	0.029999999329447746	9
+1	1	EK2_HGT_DELAY	60	4
+1	1	EK2_HGT_I_GATE	500	4
+1	1	EK2_HRT_FILT	2.000000000000000000	9
+1	1	EK2_IMU_MASK	3	2
+1	1	EK2_LOG_MASK	1	2
+1	1	EK2_MAGB_P_NSE	0.000099999997473788	9
+1	1	EK2_MAGE_P_NSE	0.001000000047497451	9
+1	1	EK2_MAG_CAL	3	2
+1	1	EK2_MAG_EF_LIM	50	4
+1	1	EK2_MAG_I_GATE	300	4
+1	1	EK2_MAG_MASK	0	2
+1	1	EK2_MAG_M_NSE	0.050000000745058060	9
+1	1	EK2_MAX_FLOW	2.500000000000000000	9
+1	1	EK2_NOAID_M_NSE	10.000000000000000000	9
+1	1	EK2_OGN_HGT_MASK	0	2
+1	1	EK2_POSNE_M_NSE	1.000000000000000000	9
+1	1	EK2_POS_I_GATE	500	4
+1	1	EK2_RNG_I_GATE	500	4
+1	1	EK2_RNG_M_NSE	0.500000000000000000	9
+1	1	EK2_RNG_USE_HGT	-1	2
+1	1	EK2_RNG_USE_SPD	2.000000000000000000	9
+1	1	EK2_TAU_OUTPUT	25	2
+1	1	EK2_TERR_GRAD	0.100000001490116119	9
+1	1	EK2_VELD_M_NSE	0.699999988079071045	9
+1	1	EK2_VELNE_M_NSE	0.500000000000000000	9
+1	1	EK2_VEL_I_GATE	500	4
+1	1	EK2_WIND_PSCALE	0.500000000000000000	9
+1	1	EK2_WIND_P_NSE	0.100000001490116119	9
+1	1	EK2_YAW_I_GATE	300	4
+1	1	EK2_YAW_M_NSE	0.500000000000000000	9
+1	1	EK3_ENABLE	0	2
 1	1	ESC_CALIBRATION	0	2
-1	1	ESC_TLM_MAV_OFS	0	2
 1	1	FENCE_ACTION	1	2
 1	1	FENCE_ALT_MAX	100.000000000000000000	9
-1	1	FENCE_ALT_MIN	-10.000000000000000000	9
-1	1	FENCE_AUTOENABLE	0	2
 1	1	FENCE_ENABLE	0	2
 1	1	FENCE_MARGIN	2.000000000000000000	9
-1	1	FENCE_OPTIONS	0	4
-1	1	FENCE_RADIUS	150.000000000000000000	9
+1	1	FENCE_RADIUS	300.000000000000000000	9
 1	1	FENCE_TOTAL	0	2
 1	1	FENCE_TYPE	7	2
-1	1	FFT_ENABLE	0	2
 1	1	FHLD_BRAKE_RATE	8	2
 1	1	FHLD_FILT_HZ	5.000000000000000000	9
 1	1	FHLD_FLOW_MAX	0.600000023841857910	9
@@ -374,130 +304,118 @@
 1	1	FHLD_XY_I	0.300000011920928955	9
 1	1	FHLD_XY_IMAX	3000.000000000000000000	9
 1	1	FHLD_XY_P	0.200000002980232239	9
-1	1	FILT1_TYPE	0	2
-1	1	FILT2_TYPE	0	2
-1	1	FILT3_TYPE	0	2
-1	1	FILT4_TYPE	0	2
-1	1	FILT5_TYPE	0	2
-1	1	FILT6_TYPE	0	2
-1	1	FILT7_TYPE	0	2
-1	1	FILT8_TYPE	0	2
-1	1	FLIGHT_OPTIONS	0	6
+1	1	FLOW_ADDR	0	2
+1	1	FLOW_FXSCALER	0	4
+1	1	FLOW_FYSCALER	0	4
+1	1	FLOW_ORIENT_YAW	0	4
+1	1	FLOW_POS_X	0.000000000000000000	9
+1	1	FLOW_POS_Y	0.000000000000000000	9
+1	1	FLOW_POS_Z	0.000000000000000000	9
 1	1	FLOW_TYPE	0	2
-1	1	FLTMODE1	7	2
-1	1	FLTMODE2	9	2
-1	1	FLTMODE3	6	2
-1	1	FLTMODE4	3	2
-1	1	FLTMODE5	5	2
+1	1	FLTMODE1	0	2
+1	1	FLTMODE2	0	2
+1	1	FLTMODE3	0	2
+1	1	FLTMODE4	0	2
+1	1	FLTMODE5	0	2
 1	1	FLTMODE6	0	2
 1	1	FLTMODE_CH	5	2
-1	1	FLTMODE_GCSBLOCK	0	6
 1	1	FOLL_ENABLE	0	2
-1	1	FORMAT_VERSION	120	4
-1	1	FRAME_CLASS	1	2
-1	1	FRAME_TYPE	0	2
-1	1	FRSKY_DNLINK1_ID	20	2
-1	1	FRSKY_DNLINK2_ID	7	2
-1	1	FRSKY_DNLINK_ID	27	2
-1	1	FRSKY_OPTIONS	0	2
-1	1	FRSKY_UPLINK_ID	13	2
+1	1	FRAME_CLASS	0	2
+1	1	FRAME_TYPE	1	2
 1	1	FS_CRASH_CHECK	1	2
-1	1	FS_DR_ENABLE	2	2
-1	1	FS_DR_TIMEOUT	30	4
 1	1	FS_EKF_ACTION	1	2
-1	1	FS_EKF_FILT	5.000000000000000000	9
 1	1	FS_EKF_THRESH	0.800000011920928955	9
 1	1	FS_GCS_ENABLE	0	2
-1	1	FS_GCS_TIMEOUT	5.000000000000000000	9
-1	1	FS_OPTIONS	16	6
+1	1	FS_OPTIONS	0	6
 1	1	FS_THR_ENABLE	1	2
 1	1	FS_THR_VALUE	975	4
 1	1	FS_VIBE_ENABLE	1	2
 1	1	GCS_PID_MASK	0	4
-1	1	GEN_TYPE	0	2
+1	1	GND_ABS_PRESS	85515.125000000000000000	9
+1	1	GND_ABS_PRESS2	85533.453125000000000000	9
+1	1	GND_ABS_PRESS3	0.000000000000000000	9
+1	1	GND_ALT_OFFSET	0.000000000000000000	9
 1	1	GND_EFFECT_COMP	1	2
-1	1	GPS1_CAN_NODEID	0	6
-1	1	GPS1_CAN_OVRIDE	0	6
-1	1	GPS1_COM_PORT	1	2
-1	1	GPS1_DELAY_MS	0	4
-1	1	GPS1_GNSS_MODE	0	2
-1	1	GPS1_MB_TYPE	0	2
-1	1	GPS1_POS_X	0.000000000000000000	9
-1	1	GPS1_POS_Y	0.000000000000000000	9
-1	1	GPS1_POS_Z	0.000000000000000000	9
-1	1	GPS1_RATE_MS	200	4
-1	1	GPS1_TYPE	1	2
-1	1	GPS2_TYPE	0	2
+1	1	GND_EXT_BUS	-1	2
+1	1	GND_FLTR_RNG	0	2
+1	1	GND_PRIMARY	0	2
+1	1	GND_PROBE_EXT	0	6
+1	1	GND_TEMP	0.000000000000000000	9
 1	1	GPS_AUTO_CONFIG	1	2
 1	1	GPS_AUTO_SWITCH	1	2
 1	1	GPS_BLEND_MASK	5	2
+1	1	GPS_BLEND_TC	10.000000000000000000	9
+1	1	GPS_DELAY_MS	0	4
+1	1	GPS_DELAY_MS2	0	4
 1	1	GPS_DRV_OPTIONS	0	4
+1	1	GPS_GNSS_MODE	0	2
+1	1	GPS_GNSS_MODE2	0	2
 1	1	GPS_HDOP_GOOD	140	4
 1	1	GPS_INJECT_TO	127	2
+1	1	GPS_MIN_DGPS	100	2
 1	1	GPS_MIN_ELEV	-100	2
 1	1	GPS_NAVFILTER	8	2
-1	1	GPS_PRIMARY	0	2
+1	1	GPS_POS1_X	0.000000000000000000	9
+1	1	GPS_POS1_Y	0.000000000000000000	9
+1	1	GPS_POS1_Z	0.000000000000000000	9
+1	1	GPS_POS2_X	0.000000000000000000	9
+1	1	GPS_POS2_Y	0.000000000000000000	9
+1	1	GPS_POS2_Z	0.000000000000000000	9
+1	1	GPS_RATE_MS	200	4
+1	1	GPS_RATE_MS2	200	4
 1	1	GPS_RAW_DATA	0	2
 1	1	GPS_SAVE_CFG	2	2
 1	1	GPS_SBAS_MODE	2	2
 1	1	GPS_SBP_LOGMASK	-256	4
+1	1	GPS_TYPE	1	2
+1	1	GPS_TYPE2	0	2
 1	1	GRIP_ENABLE	0	2
-1	1	GUID_OPTIONS	0	6
-1	1	GUID_TIMEOUT	3.000000000000000000	9
-1	1	INITIAL_MODE	0	2
-1	1	INS_ACC1_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2OFFS_X	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Y	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Z	0.001000000047497451	9
-1	1	INS_ACC2SCAL_X	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Y	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Z	1.001000046730041504	9
-1	1	INS_ACC2_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2_ID	2753036	6
+1	1	INS_ACC2OFFS_X	0.000000000000000000	9
+1	1	INS_ACC2OFFS_Y	0.000000000000000000	9
+1	1	INS_ACC2OFFS_Z	0.000000000000000000	9
+1	1	INS_ACC2SCAL_X	1.000000000000000000	9
+1	1	INS_ACC2SCAL_Y	1.000000000000000000	9
+1	1	INS_ACC2SCAL_Z	1.000000000000000000	9
+1	1	INS_ACC2_ID	2883874	6
 1	1	INS_ACC3OFFS_X	0.000000000000000000	9
 1	1	INS_ACC3OFFS_Y	0.000000000000000000	9
 1	1	INS_ACC3OFFS_Z	0.000000000000000000	9
 1	1	INS_ACC3SCAL_X	1.000000000000000000	9
 1	1	INS_ACC3SCAL_Y	1.000000000000000000	9
 1	1	INS_ACC3SCAL_Z	1.000000000000000000	9
-1	1	INS_ACC3_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC3_ID	0	6
+1	1	INS_ACC3_ID	3015690	6
 1	1	INS_ACCEL_FILTER	20	4
-1	1	INS_ACCOFFS_X	0.001000000047497451	9
-1	1	INS_ACCOFFS_Y	0.001000000047497451	9
-1	1	INS_ACCOFFS_Z	0.001000000047497451	9
-1	1	INS_ACCSCAL_X	1.001000046730041504	9
-1	1	INS_ACCSCAL_Y	1.001000046730041504	9
-1	1	INS_ACCSCAL_Z	1.001000046730041504	9
+1	1	INS_ACCOFFS_X	0.000000000000000000	9
+1	1	INS_ACCOFFS_Y	0.000000000000000000	9
+1	1	INS_ACCOFFS_Z	0.000000000000000000	9
+1	1	INS_ACCSCAL_X	1.000000000000000000	9
+1	1	INS_ACCSCAL_Y	1.000000000000000000	9
+1	1	INS_ACCSCAL_Z	1.000000000000000000	9
 1	1	INS_ACC_BODYFIX	2	2
-1	1	INS_ACC_ID	2753028	6
+1	1	INS_ACC_ID	3081250	6
 1	1	INS_ENABLE_MASK	127	2
-1	1	INS_FAST_SAMPLE	1	2
-1	1	INS_GYR1_CALTEMP	25.018352508544921875	9
-1	1	INS_GYR2OFFS_X	-0.000007097929483280	9
-1	1	INS_GYR2OFFS_Y	0.000048979549319483	9
-1	1	INS_GYR2OFFS_Z	0.000025458299205638	9
-1	1	INS_GYR2_CALTEMP	25.018352508544921875	9
-1	1	INS_GYR2_ID	2752780	6
-1	1	INS_GYR3OFFS_X	0.000000000000000000	9
-1	1	INS_GYR3OFFS_Y	0.000000000000000000	9
-1	1	INS_GYR3OFFS_Z	0.000000000000000000	9
-1	1	INS_GYR3_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR3_ID	0	6
-1	1	INS_GYROFFS_X	0.000021559313609032	9
-1	1	INS_GYROFFS_Y	0.000020211216906318	9
-1	1	INS_GYROFFS_Z	0.000024633345674374	9
+1	1	INS_FAST_SAMPLE	7	2
+1	1	INS_GYR2OFFS_X	-0.001730036456137896	9
+1	1	INS_GYR2OFFS_Y	-0.013567177578806877	9
+1	1	INS_GYR2OFFS_Z	0.016979435458779335	9
+1	1	INS_GYR2_ID	2883874	6
+1	1	INS_GYR3OFFS_X	-0.012815136462450027	9
+1	1	INS_GYR3OFFS_Y	-0.001344033051282167	9
+1	1	INS_GYR3OFFS_Z	0.011734368279576302	9
+1	1	INS_GYR3_ID	3015690	6
+1	1	INS_GYROFFS_X	0.021145243197679520	9
+1	1	INS_GYROFFS_Y	-0.022721750661730766	9
+1	1	INS_GYROFFS_Z	0.019216123968362808	9
 1	1	INS_GYRO_FILTER	20	4
-1	1	INS_GYRO_RATE	0	2
 1	1	INS_GYR_CAL	1	2
-1	1	INS_GYR_ID	2752772	6
-1	1	INS_HNTC2_ENABLE	0	2
+1	1	INS_GYR_ID	3081250	6
 1	1	INS_HNTCH_ENABLE	0	2
 1	1	INS_LOG_BAT_CNT	1024	4
 1	1	INS_LOG_BAT_LGCT	32	4
 1	1	INS_LOG_BAT_LGIN	20	2
 1	1	INS_LOG_BAT_MASK	0	2
 1	1	INS_LOG_BAT_OPT	0	2
+1	1	INS_NOTCH_ENABLE	0	2
 1	1	INS_POS1_X	0.000000000000000000	9
 1	1	INS_POS1_Y	0.000000000000000000	9
 1	1	INS_POS1_Z	0.000000000000000000	9
@@ -507,35 +425,30 @@
 1	1	INS_POS3_X	0.000000000000000000	9
 1	1	INS_POS3_Y	0.000000000000000000	9
 1	1	INS_POS3_Z	0.000000000000000000	9
-1	1	INS_RAW_LOG_OPT	0	4
 1	1	INS_STILL_THRESH	2.500000000000000000	9
-1	1	INS_TCAL1_ENABLE	0	2
-1	1	INS_TCAL2_ENABLE	0	2
-1	1	INS_TCAL3_ENABLE	0	2
-1	1	INS_TCAL_OPTIONS	0	6
 1	1	INS_TRIM_OPTION	1	2
 1	1	INS_USE	1	2
 1	1	INS_USE2	1	2
 1	1	INS_USE3	1	2
-1	1	KDE_NPOLE	14	2
 1	1	LAND_ALT_LOW	1000	4
 1	1	LAND_REPOSITION	1	2
 1	1	LAND_SPEED	50	4
 1	1	LAND_SPEED_HIGH	0	4
-1	1	LGR_ENABLE	0	2
+1	1	LGR_DEPLOY_ALT	0	4
+1	1	LGR_DEPLOY_PIN	-1	2
+1	1	LGR_DEPLOY_POL	0	2
+1	1	LGR_OPTIONS	3	4
+1	1	LGR_RETRACT_ALT	0	4
+1	1	LGR_STARTUP	0	2
+1	1	LGR_WOW_PIN	-1	2
+1	1	LGR_WOW_POL	0	2
 1	1	LOG_BACKEND_TYPE	1	2
-1	1	LOG_BITMASK	180222	6
-1	1	LOG_BLK_RATEMAX	0.000000000000000000	9
-1	1	LOG_DARM_RATEMAX	0.000000000000000000	9
+1	1	LOG_BITMASK	176126	6
 1	1	LOG_DISARMED	0	2
-1	1	LOG_FILE_BUFSIZE	200	4
+1	1	LOG_FILE_BUFSIZE	50	2
 1	1	LOG_FILE_DSRMROT	0	2
-1	1	LOG_FILE_MB_FREE	500	4
-1	1	LOG_FILE_RATEMAX	0.000000000000000000	9
 1	1	LOG_FILE_TIMEOUT	5	4
 1	1	LOG_MAV_BUFSIZE	8	2
-1	1	LOG_MAV_RATEMAX	0.000000000000000000	9
-1	1	LOG_MAX_FILES	500	4
 1	1	LOG_REPLAY	0	2
 1	1	LOIT_ACC_MAX	500.000000000000000000	9
 1	1	LOIT_ANG_MAX	0.000000000000000000	9
@@ -546,18 +459,38 @@
 1	1	MIS_OPTIONS	0	4
 1	1	MIS_RESTART	0	2
 1	1	MIS_TOTAL	0	4
-1	1	MNT1_TYPE	0	2
-1	1	MNT2_TYPE	0	2
+1	1	MNT_ANGMAX_PAN	4500	4
+1	1	MNT_ANGMAX_ROL	4500	4
+1	1	MNT_ANGMAX_TIL	4500	4
+1	1	MNT_ANGMIN_PAN	-4500	4
+1	1	MNT_ANGMIN_ROL	-4500	4
+1	1	MNT_ANGMIN_TIL	-4500	4
+1	1	MNT_DEFLT_MODE	3	2
+1	1	MNT_JSTICK_SPD	0	2
+1	1	MNT_LEAD_PTCH	0.000000000000000000	9
+1	1	MNT_LEAD_RLL	0.000000000000000000	9
+1	1	MNT_NEUTRAL_X	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Y	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Z	0.000000000000000000	9
+1	1	MNT_RC_IN_PAN	0	2
+1	1	MNT_RC_IN_ROLL	0	2
+1	1	MNT_RC_IN_TILT	0	2
+1	1	MNT_RETRACT_X	0.000000000000000000	9
+1	1	MNT_RETRACT_Y	0.000000000000000000	9
+1	1	MNT_RETRACT_Z	0.000000000000000000	9
+1	1	MNT_STAB_PAN	0	2
+1	1	MNT_STAB_ROLL	0	2
+1	1	MNT_STAB_TILT	0	2
+1	1	MNT_TYPE	0	2
 1	1	MOT_BAT_CURR_MAX	0.000000000000000000	9
 1	1	MOT_BAT_CURR_TC	5.000000000000000000	9
 1	1	MOT_BAT_IDX	0	2
-1	1	MOT_BAT_VOLT_MAX	12.800000190734863281	9
-1	1	MOT_BAT_VOLT_MIN	9.600000381469726563	9
+1	1	MOT_BAT_VOLT_MAX	0.000000000000000000	9
+1	1	MOT_BAT_VOLT_MIN	0.000000000000000000	9
 1	1	MOT_BOOST_SCALE	0.000000000000000000	9
 1	1	MOT_HOVER_LEARN	2	2
-1	1	MOT_OPTIONS	0	4
-1	1	MOT_PWM_MAX	2000	4
-1	1	MOT_PWM_MIN	1000	4
+1	1	MOT_PWM_MAX	0	4
+1	1	MOT_PWM_MIN	0	4
 1	1	MOT_PWM_TYPE	0	2
 1	1	MOT_SAFE_DISARM	0	2
 1	1	MOT_SAFE_TIME	1.000000000000000000	9
@@ -567,30 +500,20 @@
 1	1	MOT_SPIN_MAX	0.949999988079071045	9
 1	1	MOT_SPIN_MIN	0.150000005960464478	9
 1	1	MOT_SPOOL_TIME	0.500000000000000000	9
-1	1	MOT_SPOOL_TIM_DN	0.000000000000000000	9
 1	1	MOT_THST_EXPO	0.649999976158142090	9
-1	1	MOT_THST_HOVER	0.389999985694885254	9
+1	1	MOT_THST_HOVER	0.349999994039535522	9
 1	1	MOT_YAW_HEADROOM	200	4
-1	1	MSP_OPTIONS	0	2
-1	1	MSP_OSD_NCELLS	0	2
-1	1	NET_ENABLE	0	2
-1	1	NET_P1_TYPE	0	2
-1	1	NET_P2_TYPE	0	2
-1	1	NET_P3_TYPE	0	2
-1	1	NET_P4_TYPE	0	2
-1	1	NMEA_MSG_EN	3	4
-1	1	NMEA_RATE_MS	100	4
+1	1	NTF_BUZZ_ENABLE	1	2
 1	1	NTF_BUZZ_ON_LVL	1	2
-1	1	NTF_BUZZ_PIN	-1	2
-1	1	NTF_BUZZ_TYPES	5	2
+1	1	NTF_BUZZ_PIN	0	2
 1	1	NTF_BUZZ_VOLUME	100	2
 1	1	NTF_DISPLAY_TYPE	0	2
 1	1	NTF_LED_BRIGHT	3	2
 1	1	NTF_LED_LEN	1	2
 1	1	NTF_LED_OVERRIDE	0	2
-1	1	NTF_LED_TYPES	123079	6
+1	1	NTF_LED_TYPES	199	6
+1	1	NTF_OREO_THEME	0	2
 1	1	OA_TYPE	0	2
-1	1	OSD_TYPE	0	2
 1	1	PHLD_BRAKE_ANGLE	3000	4
 1	1	PHLD_BRAKE_RATE	8	4
 1	1	PILOT_ACCEL_Z	250	4
@@ -599,54 +522,40 @@
 1	1	PILOT_THR_BHV	0	4
 1	1	PILOT_THR_FILT	0.000000000000000000	9
 1	1	PILOT_TKOFF_ALT	0.000000000000000000	9
-1	1	PILOT_Y_EXPO	0.000000000000000000	9
-1	1	PILOT_Y_RATE	202.500000000000000000	9
-1	1	PILOT_Y_RATE_TC	0.000000000000000000	9
-1	1	PLDP_DELAY	0.000000000000000000	9
-1	1	PLDP_RNG_MAX	0.000000000000000000	9
-1	1	PLDP_SPEED_DN	0.000000000000000000	9
-1	1	PLDP_THRESH	0.899999976158142090	9
 1	1	PLND_ENABLED	0	2
-1	1	PRX1_TYPE	0	2
-1	1	PRX2_TYPE	0	2
-1	1	PRX3_TYPE	0	2
-1	1	PRX4_TYPE	0	2
-1	1	PRX5_TYPE	0	2
-1	1	PRX_ALT_MIN	1.000000000000000000	9
-1	1	PRX_FILT	0.250000000000000000	9
-1	1	PRX_IGN_GND	0	2
-1	1	PRX_LOG_RAW	0	2
+1	1	PRX_IGN_ANG1	0	4
+1	1	PRX_IGN_ANG2	0	4
+1	1	PRX_IGN_ANG3	0	4
+1	1	PRX_IGN_ANG4	0	4
+1	1	PRX_IGN_ANG5	0	4
+1	1	PRX_IGN_ANG6	0	4
+1	1	PRX_IGN_WID1	0	2
+1	1	PRX_IGN_WID2	0	2
+1	1	PRX_IGN_WID3	0	2
+1	1	PRX_IGN_WID4	0	2
+1	1	PRX_IGN_WID5	0	2
+1	1	PRX_IGN_WID6	0	2
+1	1	PRX_ORIENT	0	2
+1	1	PRX_TYPE	0	2
+1	1	PRX_YAW_CORR	0	4
 1	1	PSC_ACCZ_D	0.000000000000000000	9
-1	1	PSC_ACCZ_D_FF	0.000000000000000000	9
 1	1	PSC_ACCZ_FF	0.000000000000000000	9
 1	1	PSC_ACCZ_FLTD	0.000000000000000000	9
 1	1	PSC_ACCZ_FLTE	20.000000000000000000	9
 1	1	PSC_ACCZ_FLTT	0.000000000000000000	9
 1	1	PSC_ACCZ_I	1.000000000000000000	9
 1	1	PSC_ACCZ_IMAX	800.000000000000000000	9
-1	1	PSC_ACCZ_NEF	0	2
-1	1	PSC_ACCZ_NTF	0	2
 1	1	PSC_ACCZ_P	0.500000000000000000	9
-1	1	PSC_ACCZ_PDMX	0.000000000000000000	9
-1	1	PSC_ACCZ_SMAX	0.000000000000000000	9
+1	1	PSC_ACC_XY_FILT	2.000000000000000000	9
 1	1	PSC_ANGLE_MAX	0.000000000000000000	9
-1	1	PSC_JERK_XY	5.000000000000000000	9
-1	1	PSC_JERK_Z	5.000000000000000000	9
 1	1	PSC_POSXY_P	1.000000000000000000	9
 1	1	PSC_POSZ_P	1.000000000000000000	9
-1	1	PSC_VELXY_D	0.250000000000000000	9
-1	1	PSC_VELXY_FF	0.000000000000000000	9
-1	1	PSC_VELXY_FLTD	5.000000000000000000	9
-1	1	PSC_VELXY_FLTE	5.000000000000000000	9
+1	1	PSC_VELXY_D	0.500000000000000000	9
+1	1	PSC_VELXY_D_FILT	5.000000000000000000	9
+1	1	PSC_VELXY_FILT	5.000000000000000000	9
 1	1	PSC_VELXY_I	1.000000000000000000	9
 1	1	PSC_VELXY_IMAX	1000.000000000000000000	9
 1	1	PSC_VELXY_P	2.000000000000000000	9
-1	1	PSC_VELZ_D	0.000000000000000000	9
-1	1	PSC_VELZ_FF	0.000000000000000000	9
-1	1	PSC_VELZ_FLTD	5.000000000000000000	9
-1	1	PSC_VELZ_FLTE	5.000000000000000000	9
-1	1	PSC_VELZ_I	0.000000000000000000	9
-1	1	PSC_VELZ_IMAX	1000.000000000000000000	9
 1	1	PSC_VELZ_P	5.000000000000000000	9
 1	1	RALLY_INCL_HOME	1	2
 1	1	RALLY_LIMIT_KM	0.300000011920928955	9
@@ -694,50 +603,50 @@
 1	1	RC16_REVERSED	0	2
 1	1	RC16_TRIM	1500	4
 1	1	RC1_DZ	20	4
-1	1	RC1_MAX	2000	4
-1	1	RC1_MIN	1000	4
+1	1	RC1_MAX	1900	4
+1	1	RC1_MIN	1100	4
 1	1	RC1_OPTION	0	4
 1	1	RC1_REVERSED	0	2
 1	1	RC1_TRIM	1500	4
 1	1	RC2_DZ	20	4
-1	1	RC2_MAX	2000	4
-1	1	RC2_MIN	1000	4
+1	1	RC2_MAX	1900	4
+1	1	RC2_MIN	1100	4
 1	1	RC2_OPTION	0	4
 1	1	RC2_REVERSED	0	2
 1	1	RC2_TRIM	1500	4
 1	1	RC3_DZ	30	4
-1	1	RC3_MAX	2000	4
-1	1	RC3_MIN	1000	4
+1	1	RC3_MAX	1900	4
+1	1	RC3_MIN	1100	4
 1	1	RC3_OPTION	0	4
 1	1	RC3_REVERSED	0	2
 1	1	RC3_TRIM	1500	4
 1	1	RC4_DZ	20	4
-1	1	RC4_MAX	2000	4
-1	1	RC4_MIN	1000	4
+1	1	RC4_MAX	1900	4
+1	1	RC4_MIN	1100	4
 1	1	RC4_OPTION	0	4
 1	1	RC4_REVERSED	0	2
 1	1	RC4_TRIM	1500	4
 1	1	RC5_DZ	0	4
-1	1	RC5_MAX	2000	4
-1	1	RC5_MIN	1000	4
+1	1	RC5_MAX	1900	4
+1	1	RC5_MIN	1100	4
 1	1	RC5_OPTION	0	4
 1	1	RC5_REVERSED	0	2
 1	1	RC5_TRIM	1500	4
 1	1	RC6_DZ	0	4
-1	1	RC6_MAX	2000	4
-1	1	RC6_MIN	1000	4
+1	1	RC6_MAX	1900	4
+1	1	RC6_MIN	1100	4
 1	1	RC6_OPTION	0	4
 1	1	RC6_REVERSED	0	2
 1	1	RC6_TRIM	1500	4
 1	1	RC7_DZ	0	4
-1	1	RC7_MAX	2000	4
-1	1	RC7_MIN	1000	4
-1	1	RC7_OPTION	7	4
+1	1	RC7_MAX	1900	4
+1	1	RC7_MIN	1100	4
+1	1	RC7_OPTION	0	4
 1	1	RC7_REVERSED	0	2
 1	1	RC7_TRIM	1500	4
 1	1	RC8_DZ	0	4
-1	1	RC8_MAX	2000	4
-1	1	RC8_MIN	1000	4
+1	1	RC8_MAX	1900	4
+1	1	RC8_MIN	1100	4
 1	1	RC8_OPTION	0	4
 1	1	RC8_REVERSED	0	2
 1	1	RC8_TRIM	1500	4
@@ -751,69 +660,216 @@
 1	1	RCMAP_ROLL	1	2
 1	1	RCMAP_THROTTLE	3	2
 1	1	RCMAP_YAW	4	2
-1	1	RC_FS_TIMEOUT	1.000000000000000000	9
-1	1	RC_OPTIONS	32	6
+1	1	RC_OPTIONS	0	6
 1	1	RC_OVERRIDE_TIME	3.000000000000000000	9
-1	1	RC_PROTOCOLS	1	6
 1	1	RC_SPEED	490	4
-1	1	RELAY1_DEFAULT	0	2
-1	1	RELAY1_FUNCTION	1	2
-1	1	RELAY1_INVERTED	0	2
-1	1	RELAY1_PIN	13	4
-1	1	RELAY2_FUNCTION	0	2
-1	1	RELAY3_FUNCTION	0	2
-1	1	RELAY4_FUNCTION	0	2
-1	1	RELAY5_FUNCTION	0	2
-1	1	RELAY6_FUNCTION	0	2
+1	1	RELAY_DEFAULT	0	2
+1	1	RELAY_PIN	54	2
+1	1	RELAY_PIN2	55	2
+1	1	RELAY_PIN3	-1	2
+1	1	RELAY_PIN4	-1	2
+1	1	RELAY_PIN5	-1	2
+1	1	RELAY_PIN6	-1	2
+1	1	RNGFND1_ADDR	0	2
+1	1	RNGFND1_FUNCTION	0	2
+1	1	RNGFND1_GNDCLEAR	10	2
+1	1	RNGFND1_MAX_CM	700	4
+1	1	RNGFND1_MIN_CM	20	4
+1	1	RNGFND1_OFFSET	0.000000000000000000	9
+1	1	RNGFND1_ORIENT	25	2
+1	1	RNGFND1_PIN	-1	2
+1	1	RNGFND1_POS_X	0.000000000000000000	9
+1	1	RNGFND1_POS_Y	0.000000000000000000	9
+1	1	RNGFND1_POS_Z	0.000000000000000000	9
+1	1	RNGFND1_PWRRNG	0	4
+1	1	RNGFND1_RMETRIC	1	2
+1	1	RNGFND1_SCALING	3.000000000000000000	9
+1	1	RNGFND1_STOP_PIN	-1	2
 1	1	RNGFND1_TYPE	0	2
+1	1	RNGFND2_ADDR	0	2
+1	1	RNGFND2_FUNCTION	0	2
+1	1	RNGFND2_GNDCLEAR	10	2
+1	1	RNGFND2_MAX_CM	700	4
+1	1	RNGFND2_MIN_CM	20	4
+1	1	RNGFND2_OFFSET	0.000000000000000000	9
+1	1	RNGFND2_ORIENT	25	2
+1	1	RNGFND2_PIN	-1	2
+1	1	RNGFND2_POS_X	0.000000000000000000	9
+1	1	RNGFND2_POS_Y	0.000000000000000000	9
+1	1	RNGFND2_POS_Z	0.000000000000000000	9
+1	1	RNGFND2_PWRRNG	0	4
+1	1	RNGFND2_RMETRIC	1	2
+1	1	RNGFND2_SCALING	3.000000000000000000	9
+1	1	RNGFND2_STOP_PIN	-1	2
 1	1	RNGFND2_TYPE	0	2
+1	1	RNGFND3_ADDR	0	2
+1	1	RNGFND3_FUNCTION	0	2
+1	1	RNGFND3_GNDCLEAR	10	2
+1	1	RNGFND3_MAX_CM	700	4
+1	1	RNGFND3_MIN_CM	20	4
+1	1	RNGFND3_OFFSET	0.000000000000000000	9
+1	1	RNGFND3_ORIENT	25	2
+1	1	RNGFND3_PIN	-1	2
+1	1	RNGFND3_POS_X	0.000000000000000000	9
+1	1	RNGFND3_POS_Y	0.000000000000000000	9
+1	1	RNGFND3_POS_Z	0.000000000000000000	9
+1	1	RNGFND3_PWRRNG	0	4
+1	1	RNGFND3_RMETRIC	1	2
+1	1	RNGFND3_SCALING	3.000000000000000000	9
+1	1	RNGFND3_STOP_PIN	-1	2
 1	1	RNGFND3_TYPE	0	2
+1	1	RNGFND4_ADDR	0	2
+1	1	RNGFND4_FUNCTION	0	2
+1	1	RNGFND4_GNDCLEAR	10	2
+1	1	RNGFND4_MAX_CM	700	4
+1	1	RNGFND4_MIN_CM	20	4
+1	1	RNGFND4_OFFSET	0.000000000000000000	9
+1	1	RNGFND4_ORIENT	25	2
+1	1	RNGFND4_PIN	-1	2
+1	1	RNGFND4_POS_X	0.000000000000000000	9
+1	1	RNGFND4_POS_Y	0.000000000000000000	9
+1	1	RNGFND4_POS_Z	0.000000000000000000	9
+1	1	RNGFND4_PWRRNG	0	4
+1	1	RNGFND4_RMETRIC	1	2
+1	1	RNGFND4_SCALING	3.000000000000000000	9
+1	1	RNGFND4_STOP_PIN	-1	2
 1	1	RNGFND4_TYPE	0	2
+1	1	RNGFND5_ADDR	0	2
+1	1	RNGFND5_FUNCTION	0	2
+1	1	RNGFND5_GNDCLEAR	10	2
+1	1	RNGFND5_MAX_CM	700	4
+1	1	RNGFND5_MIN_CM	20	4
+1	1	RNGFND5_OFFSET	0.000000000000000000	9
+1	1	RNGFND5_ORIENT	25	2
+1	1	RNGFND5_PIN	-1	2
+1	1	RNGFND5_POS_X	0.000000000000000000	9
+1	1	RNGFND5_POS_Y	0.000000000000000000	9
+1	1	RNGFND5_POS_Z	0.000000000000000000	9
+1	1	RNGFND5_PWRRNG	0	4
+1	1	RNGFND5_RMETRIC	1	2
+1	1	RNGFND5_SCALING	3.000000000000000000	9
+1	1	RNGFND5_STOP_PIN	-1	2
 1	1	RNGFND5_TYPE	0	2
+1	1	RNGFND6_ADDR	0	2
+1	1	RNGFND6_FUNCTION	0	2
+1	1	RNGFND6_GNDCLEAR	10	2
+1	1	RNGFND6_MAX_CM	700	4
+1	1	RNGFND6_MIN_CM	20	4
+1	1	RNGFND6_OFFSET	0.000000000000000000	9
+1	1	RNGFND6_ORIENT	25	2
+1	1	RNGFND6_PIN	-1	2
+1	1	RNGFND6_POS_X	0.000000000000000000	9
+1	1	RNGFND6_POS_Y	0.000000000000000000	9
+1	1	RNGFND6_POS_Z	0.000000000000000000	9
+1	1	RNGFND6_PWRRNG	0	4
+1	1	RNGFND6_RMETRIC	1	2
+1	1	RNGFND6_SCALING	3.000000000000000000	9
+1	1	RNGFND6_STOP_PIN	-1	2
 1	1	RNGFND6_TYPE	0	2
+1	1	RNGFND7_ADDR	0	2
+1	1	RNGFND7_FUNCTION	0	2
+1	1	RNGFND7_GNDCLEAR	10	2
+1	1	RNGFND7_MAX_CM	700	4
+1	1	RNGFND7_MIN_CM	20	4
+1	1	RNGFND7_OFFSET	0.000000000000000000	9
+1	1	RNGFND7_ORIENT	25	2
+1	1	RNGFND7_PIN	-1	2
+1	1	RNGFND7_POS_X	0.000000000000000000	9
+1	1	RNGFND7_POS_Y	0.000000000000000000	9
+1	1	RNGFND7_POS_Z	0.000000000000000000	9
+1	1	RNGFND7_PWRRNG	0	4
+1	1	RNGFND7_RMETRIC	1	2
+1	1	RNGFND7_SCALING	3.000000000000000000	9
+1	1	RNGFND7_STOP_PIN	-1	2
 1	1	RNGFND7_TYPE	0	2
+1	1	RNGFND8_ADDR	0	2
+1	1	RNGFND8_FUNCTION	0	2
+1	1	RNGFND8_GNDCLEAR	10	2
+1	1	RNGFND8_MAX_CM	700	4
+1	1	RNGFND8_MIN_CM	20	4
+1	1	RNGFND8_OFFSET	0.000000000000000000	9
+1	1	RNGFND8_ORIENT	25	2
+1	1	RNGFND8_PIN	-1	2
+1	1	RNGFND8_POS_X	0.000000000000000000	9
+1	1	RNGFND8_POS_Y	0.000000000000000000	9
+1	1	RNGFND8_POS_Z	0.000000000000000000	9
+1	1	RNGFND8_PWRRNG	0	4
+1	1	RNGFND8_RMETRIC	1	2
+1	1	RNGFND8_SCALING	3.000000000000000000	9
+1	1	RNGFND8_STOP_PIN	-1	2
 1	1	RNGFND8_TYPE	0	2
+1	1	RNGFND9_ADDR	0	2
+1	1	RNGFND9_FUNCTION	0	2
+1	1	RNGFND9_GNDCLEAR	10	2
+1	1	RNGFND9_MAX_CM	700	4
+1	1	RNGFND9_MIN_CM	20	4
+1	1	RNGFND9_OFFSET	0.000000000000000000	9
+1	1	RNGFND9_ORIENT	25	2
+1	1	RNGFND9_PIN	-1	2
+1	1	RNGFND9_POS_X	0.000000000000000000	9
+1	1	RNGFND9_POS_Y	0.000000000000000000	9
+1	1	RNGFND9_POS_Z	0.000000000000000000	9
+1	1	RNGFND9_PWRRNG	0	4
+1	1	RNGFND9_RMETRIC	1	2
+1	1	RNGFND9_SCALING	3.000000000000000000	9
+1	1	RNGFND9_STOP_PIN	-1	2
 1	1	RNGFND9_TYPE	0	2
+1	1	RNGFNDA_ADDR	0	2
+1	1	RNGFNDA_FUNCTION	0	2
+1	1	RNGFNDA_GNDCLEAR	10	2
+1	1	RNGFNDA_MAX_CM	700	4
+1	1	RNGFNDA_MIN_CM	20	4
+1	1	RNGFNDA_OFFSET	0.000000000000000000	9
+1	1	RNGFNDA_ORIENT	25	2
+1	1	RNGFNDA_PIN	-1	2
+1	1	RNGFNDA_POS_X	0.000000000000000000	9
+1	1	RNGFNDA_POS_Y	0.000000000000000000	9
+1	1	RNGFNDA_POS_Z	0.000000000000000000	9
+1	1	RNGFNDA_PWRRNG	0	4
+1	1	RNGFNDA_RMETRIC	1	2
+1	1	RNGFNDA_SCALING	3.000000000000000000	9
+1	1	RNGFNDA_STOP_PIN	-1	2
 1	1	RNGFNDA_TYPE	0	2
-1	1	RNGFND_FILT	0.500000000000000000	9
-1	1	RPM1_TYPE	0	2
+1	1	RNGFND_GAIN	0.800000011920928955	9
+1	1	RPM2_PIN	-1	2
+1	1	RPM2_SCALING	1.000000000000000000	9
 1	1	RPM2_TYPE	0	2
+1	1	RPM_MAX	100000.000000000000000000	9
+1	1	RPM_MIN	10.000000000000000000	9
+1	1	RPM_MIN_QUAL	0.500000000000000000	9
+1	1	RPM_PIN	54	2
+1	1	RPM_SCALING	1.000000000000000000	9
+1	1	RPM_TYPE	0	2
 1	1	RSSI_TYPE	0	2
-1	1	RTL_ALT	1500	6
+1	1	RTL_ALT	1500	4
 1	1	RTL_ALT_FINAL	0	4
-1	1	RTL_ALT_TYPE	0	2
 1	1	RTL_CLIMB_MIN	0	4
 1	1	RTL_CONE_SLOPE	3.000000000000000000	9
 1	1	RTL_LOIT_TIME	5000	6
-1	1	RTL_OPTIONS	0	6
 1	1	RTL_SPEED	0	4
 1	1	SCHED_DEBUG	0	2
 1	1	SCHED_LOOP_RATE	400	4
-1	1	SCHED_OPTIONS	0	2
 1	1	SCR_ENABLE	0	2
 1	1	SERIAL0_BAUD	115	6
 1	1	SERIAL0_PROTOCOL	2	2
 1	1	SERIAL1_BAUD	57	6
 1	1	SERIAL1_OPTIONS	0	4
-1	1	SERIAL1_PROTOCOL	2	2
+1	1	SERIAL1_PROTOCOL	1	2
 1	1	SERIAL2_BAUD	57	6
 1	1	SERIAL2_OPTIONS	0	4
-1	1	SERIAL2_PROTOCOL	2	2
-1	1	SERIAL3_BAUD	230	6
+1	1	SERIAL2_PROTOCOL	1	2
+1	1	SERIAL3_BAUD	38	6
 1	1	SERIAL3_OPTIONS	0	4
 1	1	SERIAL3_PROTOCOL	5	2
-1	1	SERIAL4_BAUD	230	6
+1	1	SERIAL4_BAUD	38	6
 1	1	SERIAL4_OPTIONS	0	4
 1	1	SERIAL4_PROTOCOL	5	2
 1	1	SERIAL5_BAUD	57	6
 1	1	SERIAL5_OPTIONS	0	4
-1	1	SERIAL5_PROTOCOL	-1	2
-1	1	SERIAL6_BAUD	57	6
+1	1	SERIAL5_PROTOCOL	1	2
+1	1	SERIAL6_BAUD	115200	6
 1	1	SERIAL6_OPTIONS	0	4
-1	1	SERIAL6_PROTOCOL	-1	2
-1	1	SERIAL7_BAUD	57	6
-1	1	SERIAL7_OPTIONS	0	4
-1	1	SERIAL7_PROTOCOL	-1	2
+1	1	SERIAL6_PROTOCOL	22	2
 1	1	SERIAL_PASS1	0	2
 1	1	SERIAL_PASS2	-1	2
 1	1	SERIAL_PASSTIMO	15	2
@@ -852,22 +908,22 @@
 1	1	SERVO16_MIN	1100	4
 1	1	SERVO16_REVERSED	0	2
 1	1	SERVO16_TRIM	1500	4
-1	1	SERVO1_FUNCTION	33	4
+1	1	SERVO1_FUNCTION	0	4
 1	1	SERVO1_MAX	1900	4
 1	1	SERVO1_MIN	1100	4
 1	1	SERVO1_REVERSED	0	2
 1	1	SERVO1_TRIM	1500	4
-1	1	SERVO2_FUNCTION	34	4
+1	1	SERVO2_FUNCTION	0	4
 1	1	SERVO2_MAX	1900	4
 1	1	SERVO2_MIN	1100	4
 1	1	SERVO2_REVERSED	0	2
 1	1	SERVO2_TRIM	1500	4
-1	1	SERVO3_FUNCTION	35	4
+1	1	SERVO3_FUNCTION	0	4
 1	1	SERVO3_MAX	1900	4
 1	1	SERVO3_MIN	1100	4
 1	1	SERVO3_REVERSED	0	2
 1	1	SERVO3_TRIM	1500	4
-1	1	SERVO4_FUNCTION	36	4
+1	1	SERVO4_FUNCTION	0	4
 1	1	SERVO4_MAX	1900	4
 1	1	SERVO4_MIN	1100	4
 1	1	SERVO4_REVERSED	0	2
@@ -897,397 +953,34 @@
 1	1	SERVO9_MIN	1100	4
 1	1	SERVO9_REVERSED	0	2
 1	1	SERVO9_TRIM	1500	4
-1	1	SERVO_32_ENABLE	0	2
-1	1	SERVO_DSHOT_ESC	0	2
-1	1	SERVO_DSHOT_RATE	0	2
-1	1	SERVO_FTW_MASK	0	6
-1	1	SERVO_FTW_POLES	14	2
-1	1	SERVO_FTW_RVMASK	0	6
-1	1	SERVO_GPIO_MASK	0	6
+1	1	SERVO_BLH_AUTO	0	2
+1	1	SERVO_BLH_DEBUG	0	2
+1	1	SERVO_BLH_MASK	0	6
+1	1	SERVO_BLH_OTYPE	0	2
+1	1	SERVO_BLH_POLES	14	2
+1	1	SERVO_BLH_PORT	0	2
+1	1	SERVO_BLH_REMASK	0	6
+1	1	SERVO_BLH_TEST	0	2
+1	1	SERVO_BLH_TMOUT	0	4
+1	1	SERVO_BLH_TRATE	10	4
 1	1	SERVO_RATE	50	4
-1	1	SERVO_RC_FS_MSK	0	6
 1	1	SERVO_ROB_POSMAX	4095	6
 1	1	SERVO_ROB_POSMIN	0	6
 1	1	SERVO_SBUS_RATE	50	4
 1	1	SERVO_VOLZ_MASK	0	6
-1	1	SERVO_VOLZ_RANGE	200	4
 1	1	SID_AXIS	0	2
 1	1	SIMPLE	0	2
-1	1	SIM_ACC1_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC1_RND	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC2_RND	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC3_RND	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACCEL1_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL2_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL3_FAIL	0.000000000000000000	9
-1	1	SIM_ACC_FAIL_MSK	0	2
-1	1	SIM_ACC_FILE_RW	0	2
-1	1	SIM_ACC_TRIM_X	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Y	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Z	0.000000000000000000	9
-1	1	SIM_ADSB_ALT	1000.000000000000000000	9
-1	1	SIM_ADSB_COUNT	-1	4
-1	1	SIM_ADSB_RADIUS	10000.000000000000000000	9
-1	1	SIM_ADSB_TX	0	2
-1	1	SIM_ADSB_TYPES	1	2
-1	1	SIM_ARSPD2_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD2_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD2_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD2_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD2_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD2_RND	2.000000000000000000	9
-1	1	SIM_ARSPD2_SIGN	0	2
-1	1	SIM_ARSPD_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD_RND	2.000000000000000000	9
-1	1	SIM_ARSPD_SIGN	0	2
-1	1	SIM_BAR2_DELAY	0	4
-1	1	SIM_BAR2_DISABLE	0	2
-1	1	SIM_BAR2_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR2_FREEZE	0	2
-1	1	SIM_BAR2_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR2_RND	0.200000002980232239	9
-1	1	SIM_BAR2_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_UP	0.000000000000000000	9
-1	1	SIM_BAR3_DELAY	0	4
-1	1	SIM_BAR3_DISABLE	0	2
-1	1	SIM_BAR3_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR3_FREEZE	0	2
-1	1	SIM_BAR3_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR3_RND	0.200000002980232239	9
-1	1	SIM_BAR3_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_UP	0.000000000000000000	9
-1	1	SIM_BARO_COUNT	2	2
-1	1	SIM_BARO_DELAY	0	4
-1	1	SIM_BARO_DISABLE	0	2
-1	1	SIM_BARO_DRIFT	0.000000000000000000	9
-1	1	SIM_BARO_FREEZE	0	2
-1	1	SIM_BARO_GLITCH	0.000000000000000000	9
-1	1	SIM_BARO_RND	0.000000000000000000	9
-1	1	SIM_BARO_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BARO_WCF_DN	0.000000000000000000	9
-1	1	SIM_BARO_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BARO_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_UP	0.000000000000000000	9
-1	1	SIM_BATT_CAP_AH	0.000000000000000000	9
-1	1	SIM_BATT_VOLTAGE	12.600000381469726563	9
-1	1	SIM_BAUDLIMIT_EN	0	2
-1	1	SIM_CAN_SRV_MSK	0	6
-1	1	SIM_CAN_TYPE1	1	2
-1	1	SIM_CAN_TYPE2	1	2
-1	1	SIM_CLAMP_CH	0	2
-1	1	SIM_DRIFT_SPEED	0.050000000745058060	9
-1	1	SIM_DRIFT_TIME	5.000000000000000000	9
-1	1	SIM_EFI_TYPE	0	2
-1	1	SIM_ENGINE_FAIL	0	2
-1	1	SIM_ENGINE_MUL	1.000000000000000000	9
-1	1	SIM_ESC_ARM_RPM	0.000000000000000000	9
-1	1	SIM_ESC_TELEM	1	2
-1	1	SIM_FLOAT_EXCEPT	1	2
-1	1	SIM_FLOW_DELAY	0	2
-1	1	SIM_FLOW_ENABLE	0	2
-1	1	SIM_FLOW_POS_X	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Y	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Z	0.000000000000000000	9
-1	1	SIM_FLOW_RATE	10	4
-1	1	SIM_FLOW_RND	0.050000000745058060	9
-1	1	SIM_FTOWESC_ENA	0	2
-1	1	SIM_FTOWESC_POW	4095	6
-1	1	SIM_GND_BEHAV	-1	2
-1	1	SIM_GPS2_ACC	0.300000011920928955	9
-1	1	SIM_GPS2_ALT_OFS	0	4
-1	1	SIM_GPS2_BYTELOS	0.000000000000000000	9
-1	1	SIM_GPS2_DISABLE	1	2
-1	1	SIM_GPS2_DRFTALT	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_X	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Y	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Z	0.000000000000000000	9
-1	1	SIM_GPS2_HDG	0	2
-1	1	SIM_GPS2_HZ	5	2
-1	1	SIM_GPS2_JAM	0	2
-1	1	SIM_GPS2_LAG_MS	100	4
-1	1	SIM_GPS2_LCKTIME	0	4
-1	1	SIM_GPS2_NOISE	0.000000000000000000	9
-1	1	SIM_GPS2_NUMSATS	10	2
-1	1	SIM_GPS2_POS_X	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS2_TYPE	1	2
-1	1	SIM_GPS2_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Z	0.000000000000000000	9
-1	1	SIM_GPS_ACC	0.300000011920928955	9
-1	1	SIM_GPS_ALT_OFS	0	4
-1	1	SIM_GPS_BYTELOSS	0.000000000000000000	9
-1	1	SIM_GPS_DISABLE	0	2
-1	1	SIM_GPS_DRIFTALT	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_X	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Y	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Z	0.000000000000000000	9
-1	1	SIM_GPS_HDG	0	2
-1	1	SIM_GPS_HZ	5	2
-1	1	SIM_GPS_JAM	0	2
-1	1	SIM_GPS_LAG_MS	100	4
-1	1	SIM_GPS_LOCKTIME	0	4
-1	1	SIM_GPS_LOG_NUM	0	4
-1	1	SIM_GPS_NOISE	0.000000000000000000	9
-1	1	SIM_GPS_NUMSATS	10	2
-1	1	SIM_GPS_POS_X	0.000000000000000000	9
-1	1	SIM_GPS_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS_TYPE	1	2
-1	1	SIM_GPS_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Z	0.000000000000000000	9
-1	1	SIM_GRPE_ENABLE	0	2
-1	1	SIM_GRPE_PIN	-1	2
-1	1	SIM_GRPS_ENABLE	0	2
-1	1	SIM_GRPS_GRAB	2000	4
-1	1	SIM_GRPS_PIN	-1	2
-1	1	SIM_GRPS_RELEASE	1000	4
-1	1	SIM_GRPS_REVERSE	0	2
-1	1	SIM_GYR1_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR1_RND	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR2_RND	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR3_RND	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR_FAIL_MSK	0	2
-1	1	SIM_GYR_FILE_RW	0	2
-1	1	SIM_IE24_ENABLE	0	2
-1	1	SIM_IE24_ERROR	0	6
-1	1	SIM_IE24_STATE	-1	2
-1	1	SIM_IMUT1_ENABLE	0	2
-1	1	SIM_IMUT2_ENABLE	0	2
-1	1	SIM_IMUT3_ENABLE	0	2
-1	1	SIM_IMUT_END	45.000000000000000000	9
-1	1	SIM_IMUT_FIXED	0.000000000000000000	9
-1	1	SIM_IMUT_START	25.000000000000000000	9
-1	1	SIM_IMUT_TCONST	300.000000000000000000	9
-1	1	SIM_IMU_COUNT	2	2
-1	1	SIM_IMU_ORIENT	0	2
-1	1	SIM_IMU_POS_X	0.000000000000000000	9
-1	1	SIM_IMU_POS_Y	0.000000000000000000	9
-1	1	SIM_IMU_POS_Z	0.000000000000000000	9
-1	1	SIM_INIT_ALT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LAT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LON_OFS	0.000000000000000000	9
-1	1	SIM_INS_THR_MIN	0.100000001490116119	9
-1	1	SIM_JSON_MASTER	0	2
-1	1	SIM_LED_LAYOUT	0	2
-1	1	SIM_LOOP_DELAY	0	6
-1	1	SIM_MAG1_DEVID	97539	6
-1	1	SIM_MAG1_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG1_FAIL	0	2
-1	1	SIM_MAG1_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG1_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG1_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG1_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG1_ORIENT	0	2
-1	1	SIM_MAG1_SCALING	1.000000000000000000	9
-1	1	SIM_MAG2_DEVID	131874	6
-1	1	SIM_MAG2_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG2_FAIL	0	2
-1	1	SIM_MAG2_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG2_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG2_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG2_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG2_ORIENT	0	2
-1	1	SIM_MAG2_SCALING	1.000000000000000000	9
-1	1	SIM_MAG3_DEVID	263178	6
-1	1	SIM_MAG3_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG3_FAIL	0	2
-1	1	SIM_MAG3_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG3_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG3_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG3_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG3_ORIENT	0	2
-1	1	SIM_MAG3_SCALING	1.000000000000000000	9
-1	1	SIM_MAG4_DEVID	97283	6
-1	1	SIM_MAG5_DEVID	97795	6
-1	1	SIM_MAG6_DEVID	98051	6
-1	1	SIM_MAG7_DEVID	0	6
-1	1	SIM_MAG8_DEVID	0	6
-1	1	SIM_MAG_ALY_HGT	1.000000000000000000	9
-1	1	SIM_MAG_ALY_X	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Y	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Z	0.000000000000000000	9
-1	1	SIM_MAG_DELAY	0	4
-1	1	SIM_MAG_MOT_X	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Y	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Z	0.000000000000000000	9
-1	1	SIM_MAG_RND	0.000000000000000000	9
-1	1	SIM_MAG_SAVE_IDS	1	2
-1	1	SIM_ODOM_ENABLE	0	2
-1	1	SIM_OH_MASK	0	6
-1	1	SIM_OH_RELAY_MSK	-1	4
-1	1	SIM_OPOS_ALT	584.000000000000000000	9
-1	1	SIM_OPOS_HDG	353.000000000000000000	9
-1	1	SIM_OPOS_LAT	-35.363262176513671875	9
-1	1	SIM_OPOS_LNG	149.165237426757812500	9
-1	1	SIM_PARA_ENABLE	0	2
-1	1	SIM_PARA_PIN	-1	2
-1	1	SIM_PIN_MASK	0	4
-1	1	SIM_PLD_ALT_LMT	15.000000000000000000	9
-1	1	SIM_PLD_DIST_LMT	10.000000000000000000	9
-1	1	SIM_PLD_ENABLE	0	2
-1	1	SIM_PLD_HEIGHT	0.000000000000000000	9
-1	1	SIM_PLD_LAT	0.000000000000000000	9
-1	1	SIM_PLD_LON	0.000000000000000000	9
-1	1	SIM_PLD_OPTIONS	0	2
-1	1	SIM_PLD_ORIENT	24	2
-1	1	SIM_PLD_RATE	100	6
-1	1	SIM_PLD_SHIP	0	2
-1	1	SIM_PLD_TYPE	0	2
-1	1	SIM_PLD_YAW	0	4
-1	1	SIM_RATE_HZ	1200	4
-1	1	SIM_RC_CHANCOUNT	16	2
-1	1	SIM_RC_FAIL	0	2
-1	1	SIM_RICH_CTRL	-1	2
-1	1	SIM_RICH_ENABLE	0	2
-1	1	SIM_SERVO_DELAY	0.000000000000000000	9
-1	1	SIM_SERVO_FILTER	0.000000000000000000	9
-1	1	SIM_SERVO_SPEED	0.140000000596046448	9
-1	1	SIM_SHIP_DSIZE	10.000000000000000000	9
-1	1	SIM_SHIP_ENABLE	0	2
-1	1	SIM_SHIP_OFS_X	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Y	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Z	0.000000000000000000	9
-1	1	SIM_SHIP_PSIZE	1000.000000000000000000	9
-1	1	SIM_SHIP_SPEED	3.000000000000000000	9
-1	1	SIM_SHIP_SYSID	17	2
-1	1	SIM_SHOVE_TIME	0	6
-1	1	SIM_SHOVE_X	0.000000000000000000	9
-1	1	SIM_SHOVE_Y	0.000000000000000000	9
-1	1	SIM_SHOVE_Z	0.000000000000000000	9
-1	1	SIM_SLUP_ENABLE	0	2
-1	1	SIM_SONAR_GLITCH	0.000000000000000000	9
-1	1	SIM_SONAR_POS_X	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Y	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Z	0.000000000000000000	9
-1	1	SIM_SONAR_RND	0.000000000000000000	9
-1	1	SIM_SONAR_ROT	25	2
-1	1	SIM_SONAR_SCALE	12.121199607849121094	9
-1	1	SIM_SPEEDUP	1.000000000000000000	9
-1	1	SIM_SPR_ENABLE	0	2
-1	1	SIM_SPR_PUMP	-1	2
-1	1	SIM_SPR_SPIN	-1	2
-1	1	SIM_TA_ENABLE	1	2
-1	1	SIM_TEMP_BFACTOR	0.000000000000000000	9
-1	1	SIM_TEMP_BRD_OFF	20.000000000000000000	9
-1	1	SIM_TEMP_START	25.000000000000000000	9
-1	1	SIM_TEMP_TCONST	30.000000000000000000	9
-1	1	SIM_TERRAIN	1	2
-1	1	SIM_THML_SCENARI	0	2
-1	1	SIM_TIDE_DIR	0.000000000000000000	9
-1	1	SIM_TIDE_SPEED	0.000000000000000000	9
-1	1	SIM_TIME_JITTER	0	4
-1	1	SIM_TWIST_TIME	0	6
-1	1	SIM_TWIST_X	0.000000000000000000	9
-1	1	SIM_TWIST_Y	0.000000000000000000	9
-1	1	SIM_TWIST_Z	0.000000000000000000	9
-1	1	SIM_UART_LOSS	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_X	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Y	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Z	0.000000000000000000	9
-1	1	SIM_VIB_MOT_HMNC	1	4
-1	1	SIM_VIB_MOT_MASK	0	6
-1	1	SIM_VIB_MOT_MAX	0.000000000000000000	9
-1	1	SIM_VIB_MOT_MULT	1.000000000000000000	9
-1	1	SIM_VICON_FAIL	0	2
-1	1	SIM_VICON_GLIT_X	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Y	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Z	0.000000000000000000	9
-1	1	SIM_VICON_POS_X	0.000000000000000000	9
-1	1	SIM_VICON_POS_Y	0.000000000000000000	9
-1	1	SIM_VICON_POS_Z	0.000000000000000000	9
-1	1	SIM_VICON_TMASK	3	2
-1	1	SIM_VICON_VGLI_X	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Y	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Z	0.000000000000000000	9
-1	1	SIM_VICON_YAW	0	4
-1	1	SIM_VICON_YAWERR	0	4
-1	1	SIM_WAVE_AMP	0.500000000000000000	9
-1	1	SIM_WAVE_DIR	0.000000000000000000	9
-1	1	SIM_WAVE_ENABLE	0	2
-1	1	SIM_WAVE_LENGTH	10.000000000000000000	9
-1	1	SIM_WAVE_SPEED	0.500000000000000000	9
-1	1	SIM_WIND_DIR	180.000000000000000000	9
-1	1	SIM_WIND_DIR_Z	0.000000000000000000	9
-1	1	SIM_WIND_SPD	0.000000000000000000	9
-1	1	SIM_WIND_T	0	2
-1	1	SIM_WIND_TC	5.000000000000000000	9
-1	1	SIM_WIND_TURB	0.000000000000000000	9
-1	1	SIM_WIND_T_ALT	60.000000000000000000	9
-1	1	SIM_WIND_T_COEF	0.009999999776482582	9
-1	1	SIM_WOW_PIN	-1	2
 1	1	SPRAY_ENABLE	0	2
-1	1	SR0_ADSB	4	4
-1	1	SR0_EXTRA1	4	4
-1	1	SR0_EXTRA2	4	4
-1	1	SR0_EXTRA3	4	4
-1	1	SR0_EXT_STAT	4	4
+1	1	SR0_ADSB	0	4
+1	1	SR0_EXTRA1	0	4
+1	1	SR0_EXTRA2	0	4
+1	1	SR0_EXTRA3	0	4
+1	1	SR0_EXT_STAT	0	4
 1	1	SR0_PARAMS	0	4
-1	1	SR0_POSITION	4	4
-1	1	SR0_RAW_CTRL	4	4
-1	1	SR0_RAW_SENS	4	4
-1	1	SR0_RC_CHAN	4	4
+1	1	SR0_POSITION	0	4
+1	1	SR0_RAW_CTRL	0	4
+1	1	SR0_RAW_SENS	0	4
+1	1	SR0_RC_CHAN	0	4
 1	1	SR1_ADSB	0	4
 1	1	SR1_EXTRA1	0	4
 1	1	SR1_EXTRA2	0	4
@@ -1318,88 +1011,41 @@
 1	1	SR3_RAW_CTRL	0	4
 1	1	SR3_RAW_SENS	0	4
 1	1	SR3_RC_CHAN	0	4
-1	1	SR4_ADSB	0	4
-1	1	SR4_EXTRA1	0	4
-1	1	SR4_EXTRA2	0	4
-1	1	SR4_EXTRA3	0	4
-1	1	SR4_EXT_STAT	0	4
-1	1	SR4_PARAMS	0	4
-1	1	SR4_POSITION	0	4
-1	1	SR4_RAW_CTRL	0	4
-1	1	SR4_RAW_SENS	0	4
-1	1	SR4_RC_CHAN	0	4
-1	1	SR5_ADSB	0	4
-1	1	SR5_EXTRA1	0	4
-1	1	SR5_EXTRA2	0	4
-1	1	SR5_EXTRA3	0	4
-1	1	SR5_EXT_STAT	0	4
-1	1	SR5_PARAMS	0	4
-1	1	SR5_POSITION	0	4
-1	1	SR5_RAW_CTRL	0	4
-1	1	SR5_RAW_SENS	0	4
-1	1	SR5_RC_CHAN	0	4
-1	1	SR6_ADSB	0	4
-1	1	SR6_EXTRA1	0	4
-1	1	SR6_EXTRA2	0	4
-1	1	SR6_EXTRA3	0	4
-1	1	SR6_EXT_STAT	0	4
-1	1	SR6_PARAMS	0	4
-1	1	SR6_POSITION	0	4
-1	1	SR6_RAW_CTRL	0	4
-1	1	SR6_RAW_SENS	0	4
-1	1	SR6_RC_CHAN	0	4
 1	1	SRTL_ACCURACY	2.000000000000000000	9
-1	1	SRTL_OPTIONS	0	6
 1	1	SRTL_POINTS	300	4
 1	1	STAT_BOOTCNT	1	4
 1	1	STAT_FLTTIME	0	6
-1	1	STAT_RESET	1	6
-1	1	STAT_RUNTIME	30	6
+1	1	STAT_RESET	0	6
+1	1	STAT_RUNTIME	0	6
 1	1	SUPER_SIMPLE	0	2
-1	1	SURFTRAK_MODE	1	2
-1	1	SURFTRAK_TC	1.000000000000000000	9
 1	1	SYSID_ENFORCE	0	2
 1	1	SYSID_MYGCS	255	4
+1	1	SYSID_SW_MREV	120	4
 1	1	SYSID_THISMAV	1	4
 1	1	TCAL_ENABLED	0	2
 1	1	TELEM_DELAY	0	2
-1	1	TEMP1_TYPE	0	2
-1	1	TEMP2_TYPE	0	2
-1	1	TEMP3_TYPE	0	2
-1	1	TEMP_LOG	0	2
-1	1	TERRAIN_CACHE_SZ	12	4
 1	1	TERRAIN_ENABLE	1	2
-1	1	TERRAIN_MARGIN	0.050000000745058060	9
-1	1	TERRAIN_OFS_MAX	30.000000000000000000	9
+1	1	TERRAIN_FOLLOW	0	2
 1	1	TERRAIN_OPTIONS	0	4
 1	1	TERRAIN_SPACING	100	4
-1	1	THROW_ALT_MAX	0	4
-1	1	THROW_ALT_MIN	0	4
 1	1	THROW_MOT_START	0	2
 1	1	THROW_NEXTMODE	18	2
 1	1	THROW_TYPE	0	2
 1	1	THR_DZ	100	4
-1	1	TKOFF_RPM_MAX	0	4
-1	1	TKOFF_RPM_MIN	0	4
-1	1	TKOFF_SLEW_TIME	2.000000000000000000	9
-1	1	TKOFF_THR_MAX	0.899999976158142090	9
 1	1	TUNE	0	2
 1	1	TUNE_MAX	0.000000000000000000	9
 1	1	TUNE_MIN	0.000000000000000000	9
+1	1	VISO_ORIENT	0	2
+1	1	VISO_POS_X	0.000000000000000000	9
+1	1	VISO_POS_Y	0.000000000000000000	9
+1	1	VISO_POS_Z	0.000000000000000000	9
 1	1	VISO_TYPE	0	2
-1	1	VTX_ENABLE	0	2
-1	1	WINCH_TYPE	0	2
-1	1	WPNAV_ACCEL	250.000000000000000000	9
-1	1	WPNAV_ACCEL_C	0.000000000000000000	9
+1	1	WPNAV_ACCEL	100.000000000000000000	9
 1	1	WPNAV_ACCEL_Z	100.000000000000000000	9
-1	1	WPNAV_JERK	1.000000000000000000	9
 1	1	WPNAV_RADIUS	200.000000000000000000	9
 1	1	WPNAV_RFND_USE	1	2
-1	1	WPNAV_SPEED	1000.000000000000000000	9
+1	1	WPNAV_SPEED	500.000000000000000000	9
 1	1	WPNAV_SPEED_DN	150.000000000000000000	9
 1	1	WPNAV_SPEED_UP	250.000000000000000000	9
-1	1	WPNAV_TER_MARGIN	10.000000000000000000	9
 1	1	WP_NAVALT_MIN	0.000000000000000000	9
 1	1	WP_YAW_BEHAVIOR	2	2
-1	1	WVANE_ENABLE	0	2
-1	1	ZIGZ_AUTO_ENABLE	0	2
diff --git a/src/FirmwarePlugin/APM/Plane.OfflineEditing.params b/src/FirmwarePlugin/APM/Plane.OfflineEditing.params
index 35172d40ce1e..c80f3634b44f 100644
--- a/src/FirmwarePlugin/APM/Plane.OfflineEditing.params
+++ b/src/FirmwarePlugin/APM/Plane.OfflineEditing.params
@@ -1,82 +1,58 @@
 # Onboard parameters for Vehicle 1
 #
 # Stack: ArduPilot
-# Vehicle: Fixed wing aircraft
-# Version: 4.6.2 
-# Git Revision: 1ebd4d99
+# Vehicle: Fixed Wing
+# Version: 4.0.9
+# Git Revision: b319b27
 #
 # Vehicle-Id Component-Id Name Value Type
 1	1	ACRO_LOCKING	1	2
-1	1	ACRO_PITCH_RATE	180	4
+1	1	ACRO_PITCH_RATE	90	4
 1	1	ACRO_ROLL_RATE	180	4
-1	1	ACRO_YAW_RATE	0	4
-1	1	ADSB_TYPE	0	2
+1	1	ADSB_ENABLE	0	2
 1	1	AFS_ENABLE	0	2
 1	1	AHRS_COMP_BETA	0.100000001490116119	9
-1	1	AHRS_EKF_TYPE	3	2
+1	1	AHRS_CUSTOM_PIT	0.000000000000000000	9
+1	1	AHRS_CUSTOM_ROLL	0.000000000000000000	9
+1	1	AHRS_CUSTOM_YAW	0.000000000000000000	9
+1	1	AHRS_EKF_TYPE	2	2
 1	1	AHRS_GPS_GAIN	1.000000000000000000	9
 1	1	AHRS_GPS_MINSATS	6	2
 1	1	AHRS_GPS_USE	1	2
-1	1	AHRS_OPTIONS	0	4
-1	1	AHRS_ORIENTATION	0	2
+1	1	AHRS_ORIENTATION	4	2
 1	1	AHRS_RP_P	0.200000002980232239	9
-1	1	AHRS_TRIM_X	0.000000000000000000	9
-1	1	AHRS_TRIM_Y	0.000000000000000000	9
+1	1	AHRS_TRIM_X	-0.005102053750306368	9
+1	1	AHRS_TRIM_Y	-0.040495343506336212	9
 1	1	AHRS_TRIM_Z	0.000000000000000000	9
-1	1	AHRS_WIND_MAX	0	2
+1	1	AHRS_WIND_MAX	12	2
 1	1	AHRS_YAW_P	0.200000002980232239	9
-1	1	AIRSPEED_CRUISE	22.000000000000000000	9
-1	1	AIRSPEED_MAX	30	4
-1	1	AIRSPEED_MIN	10	4
-1	1	AIRSPEED_STALL	0.000000000000000000	9
+1	1	ALT_CTRL_ALG	0	2
+1	1	ALT_HOLD_FBWCM	1500	4
+1	1	ALT_HOLD_RTL	8000	6
 1	1	ALT_OFFSET	0	4
 1	1	ARMING_ACCTHRESH	0.750000000000000000	9
-1	1	ARMING_CHECK	1	6
-1	1	ARMING_MAGTHRESH	100	4
+1	1	ARMING_CHECK	0	6
 1	1	ARMING_MIS_ITEMS	0	6
-1	1	ARMING_OPTIONS	0	6
 1	1	ARMING_REQUIRE	1	2
-1	1	ARMING_RUDDER	1	2
+1	1	ARMING_RUDDER	2	2
 1	1	ARSPD2_TYPE	0	2
 1	1	ARSPD_AUTOCAL	0	2
 1	1	ARSPD_BUS	1	2
-1	1	ARSPD_DEVID	0	6
-1	1	ARSPD_OFFSET	2014.252685546875000000	9
-1	1	ARSPD_OFF_PCNT	0	2
-1	1	ARSPD_OPTIONS	11	6
-1	1	ARSPD_PIN	1	2
+1	1	ARSPD_FBW_MAX	22	4
+1	1	ARSPD_FBW_MIN	14	4
+1	1	ARSPD_OFFSET	0.000000000000000000	9
+1	1	ARSPD_OPTIONS	0	6
+1	1	ARSPD_PIN	15	2
 1	1	ARSPD_PRIMARY	0	2
 1	1	ARSPD_PSI_RANGE	1.000000000000000000	9
-1	1	ARSPD_RATIO	2.000000000000000000	9
+1	1	ARSPD_RATIO	1.993600010871887207	9
 1	1	ARSPD_SKIP_CAL	0	2
-1	1	ARSPD_TUBE_ORDR	2	2
-1	1	ARSPD_TYPE	2	2
-1	1	ARSPD_USE	1	2
-1	1	ARSPD_WIND_GATE	5.000000000000000000	9
-1	1	ARSPD_WIND_MAX	0.000000000000000000	9
-1	1	ARSPD_WIND_WARN	0.000000000000000000	9
-1	1	AUTOTUNE_AXES	7	2
+1	1	ARSPD_TUBE_ORDER	2	2
+1	1	ARSPD_TYPE	1	2
+1	1	ARSPD_USE	0	2
 1	1	AUTOTUNE_LEVEL	6	2
-1	1	AUTOTUNE_OPTIONS	0	6
+1	1	AUTO_FBW_STEER	0	2
 1	1	AVD_ENABLE	0	2
-1	1	BARO1_DEVID	65540	6
-1	1	BARO1_GND_PRESS	101325.851562500000000000	9
-1	1	BARO1_WCF_ENABLE	0	2
-1	1	BARO2_DEVID	65796	6
-1	1	BARO2_GND_PRESS	101327.273437500000000000	9
-1	1	BARO2_WCF_ENABLE	0	2
-1	1	BARO3_DEVID	0	6
-1	1	BARO3_GND_PRESS	0.000000000000000000	9
-1	1	BARO3_WCF_ENABLE	0	2
-1	1	BARO_ALTERR_MAX	2000.000000000000000000	9
-1	1	BARO_ALT_OFFSET	0.000000000000000000	9
-1	1	BARO_EXT_BUS	-1	2
-1	1	BARO_FIELD_ELV	0.000000000000000000	9
-1	1	BARO_FLTR_RNG	0	2
-1	1	BARO_GND_TEMP	0.000000000000000000	9
-1	1	BARO_OPTIONS	0	4
-1	1	BARO_PRIMARY	0	2
-1	1	BARO_PROBE_EXT	0	6
 1	1	BATT2_MONITOR	0	2
 1	1	BATT3_MONITOR	0	2
 1	1	BATT4_MONITOR	0	2
@@ -86,13 +62,14 @@
 1	1	BATT8_MONITOR	0	2
 1	1	BATT9_MONITOR	0	2
 1	1	BATT_AMP_OFFSET	0.000000000000000000	9
-1	1	BATT_AMP_PERVLT	17.000000000000000000	9
+1	1	BATT_AMP_PERVLT	39.876998901367187500	9
 1	1	BATT_ARM_MAH	0	6
-1	1	BATT_ARM_VOLT	0.000000000000000000	9
-1	1	BATT_CAPACITY	3300	6
+1	1	BATT_ARM_VOLT	14.500000000000000000	9
+1	1	BATT_BUS	0	2
+1	1	BATT_CAPACITY	16800	6
 1	1	BATT_CRT_MAH	0.000000000000000000	9
 1	1	BATT_CRT_VOLT	0.000000000000000000	9
-1	1	BATT_CURR_PIN	12	2
+1	1	BATT_CURR_PIN	15	2
 1	1	BATT_FS_CRT_ACT	0	2
 1	1	BATT_FS_LOW_ACT	0	2
 1	1	BATT_FS_VOLTSRC	0	2
@@ -100,121 +77,142 @@
 1	1	BATT_LOW_TIMER	10	2
 1	1	BATT_LOW_VOLT	0.000000000000000000	9
 1	1	BATT_MONITOR	4	2
-1	1	BATT_OPTIONS	0	6
 1	1	BATT_SERIAL_NUM	-1	6
-1	1	BATT_VLT_OFFSET	0.000000000000000000	9
-1	1	BATT_VOLT_MULT	10.100000381469726563	9
-1	1	BATT_VOLT_PIN	13	2
+1	1	BATT_VOLT_MULT	12.020000457763671875	9
+1	1	BATT_VOLT_PIN	14	2
 1	1	BATT_WATT_MAX	0	4
+1	1	BRD_ALT_CONFIG	0	2
 1	1	BRD_BOOT_DELAY	0	4
-1	1	BRD_OPTIONS	0	6
+1	1	BRD_IMUHEAT_I	0.070000000298023224	9
+1	1	BRD_IMUHEAT_IMAX	70.000000000000000000	9
+1	1	BRD_IMUHEAT_P	50.000000000000000000	9
+1	1	BRD_IMU_TARGTEMP	45	2
+1	1	BRD_IO_ENABLE	1	2
+1	1	BRD_OPTIONS	1	6
+1	1	BRD_PWM_COUNT	4	2
+1	1	BRD_PWM_VOLT_SEL	0	2
 1	1	BRD_RTC_TYPES	1	2
 1	1	BRD_RTC_TZ_MIN	0	4
-1	1	BRD_SAFETYOPTION	3	4
-1	1	BRD_SAFETY_DEFLT	0	2
+1	1	BRD_SAFETYENABLE	0	2
+1	1	BRD_SAFETYOPTION	0	4
 1	1	BRD_SAFETY_MASK	0	6
-1	1	BRD_SD_FENCE	0	4
-1	1	BRD_SD_MISSION	0	4
-1	1	BRD_SERIAL_NUM	0	6
+1	1	BRD_SBUS_OUT	0	2
+1	1	BRD_SD_SLOWDOWN	0	2
+1	1	BRD_SER1_RTSCTS	0	2
+1	1	BRD_SER2_RTSCTS	0	2
+1	1	BRD_SERIAL_NUM	0	4
+1	1	BRD_TYPE	3	2
 1	1	BRD_VBUS_MIN	4.300000190734863281	9
 1	1	BRD_VSERVO_MIN	0.000000000000000000	9
 1	1	BTN_ENABLE	0	2
-1	1	CAM1_TYPE	0	2
-1	1	CAM2_TYPE	0	2
 1	1	CAM_AUTO_ONLY	0	2
+1	1	CAM_DURATION	10	2
+1	1	CAM_FEEDBACK_PIN	-1	2
+1	1	CAM_FEEDBACK_POL	1	2
 1	1	CAM_MAX_ROLL	0	4
-1	1	CAM_RC_TYPE	0	2
+1	1	CAM_MIN_INTERVAL	0	4
+1	1	CAM_RELAY_ON	1	2
+1	1	CAM_SERVO_OFF	1100	4
+1	1	CAM_SERVO_ON	1300	4
+1	1	CAM_TRIGG_DIST	0.000000000000000000	9
+1	1	CAM_TRIGG_TYPE	0	2
+1	1	CAM_TYPE	0	2
 1	1	CAN_D1_PROTOCOL	1	2
-1	1	CAN_D1_PROTOCOL2	0	2
+1	1	CAN_D1_UC_ESC_BM	0	6
+1	1	CAN_D1_UC_NODE	10	2
+1	1	CAN_D1_UC_SRV_BM	0	6
+1	1	CAN_D1_UC_SRV_RT	50	4
 1	1	CAN_D2_PROTOCOL	1	2
-1	1	CAN_D2_PROTOCOL2	0	2
-1	1	CAN_LOGLEVEL	0	2
-1	1	CAN_P1_DRIVER	0	2
-1	1	CAN_P2_DRIVER	0	2
+1	1	CAN_P1_BITRATE	1000000	6
+1	1	CAN_P1_DRIVER	1	2
+1	1	CAN_P2_BITRATE	1000000	6
+1	1	CAN_P2_DRIVER	1	2
+1	1	CAN_SLCAN_CPORT	0	2
+1	1	CAN_SLCAN_SERNUM	-1	2
+1	1	CAN_SLCAN_TIMOUT	0	4
+1	1	CHUTE_CHAN	0	2
 1	1	CHUTE_ENABLED	0	2
 1	1	COMPASS_AUTODEC	1	2
-1	1	COMPASS_AUTO_ROT	2	2
-1	1	COMPASS_CAL_FIT	16.000000000000000000	9
-1	1	COMPASS_DEC	0.223357215523719788	9
-1	1	COMPASS_DEV_ID	97539	6
-1	1	COMPASS_DEV_ID2	131874	6
-1	1	COMPASS_DEV_ID3	263178	6
-1	1	COMPASS_DEV_ID4	97283	6
-1	1	COMPASS_DEV_ID5	97795	6
-1	1	COMPASS_DEV_ID6	98051	6
+1	1	COMPASS_AUTO_ROT	0	2
+1	1	COMPASS_CAL_FIT	8.000000000000000000	9
+1	1	COMPASS_CUS_PIT	0.000000000000000000	9
+1	1	COMPASS_CUS_ROLL	0.000000000000000000	9
+1	1	COMPASS_CUS_YAW	0.000000000000000000	9
+1	1	COMPASS_DEC	-0.329219996929168701	9
+1	1	COMPASS_DEV_ID	0	6
+1	1	COMPASS_DEV_ID2	0	6
+1	1	COMPASS_DEV_ID3	590114	6
+1	1	COMPASS_DEV_ID4	0	6
+1	1	COMPASS_DEV_ID5	0	6
+1	1	COMPASS_DEV_ID6	0	6
 1	1	COMPASS_DEV_ID7	0	6
 1	1	COMPASS_DEV_ID8	0	6
-1	1	COMPASS_DIA2_X	1.000000000000000000	9
-1	1	COMPASS_DIA2_Y	1.000000000000000000	9
-1	1	COMPASS_DIA2_Z	1.000000000000000000	9
+1	1	COMPASS_DIA2_X	0.948000013828277588	9
+1	1	COMPASS_DIA2_Y	1.065999984741210938	9
+1	1	COMPASS_DIA2_Z	0.986000001430511475	9
 1	1	COMPASS_DIA3_X	1.000000000000000000	9
 1	1	COMPASS_DIA3_Y	1.000000000000000000	9
 1	1	COMPASS_DIA3_Z	1.000000000000000000	9
-1	1	COMPASS_DIA_X	1.000000000000000000	9
-1	1	COMPASS_DIA_Y	1.000000000000000000	9
-1	1	COMPASS_DIA_Z	1.000000000000000000	9
-1	1	COMPASS_DISBLMSK	0	6
+1	1	COMPASS_DIA_X	1.011999964714050293	9
+1	1	COMPASS_DIA_Y	1.019000053405761719	9
+1	1	COMPASS_DIA_Z	0.970000028610229492	9
 1	1	COMPASS_ENABLE	1	2
-1	1	COMPASS_EXTERN2	0	2
+1	1	COMPASS_EXTERN2	1	2
 1	1	COMPASS_EXTERN3	0	2
 1	1	COMPASS_EXTERNAL	1	2
 1	1	COMPASS_FLTR_RNG	0	2
 1	1	COMPASS_LEARN	0	2
 1	1	COMPASS_MOT2_X	0.000000000000000000	9
-1	1	COMPASS_MOT2_Y	0.000000000000000000	9
+1	1	COMPASS_MOT2_Y	3.200000047683715820	9
 1	1	COMPASS_MOT2_Z	0.000000000000000000	9
 1	1	COMPASS_MOT3_X	0.000000000000000000	9
 1	1	COMPASS_MOT3_Y	0.000000000000000000	9
 1	1	COMPASS_MOT3_Z	0.000000000000000000	9
-1	1	COMPASS_MOTCT	0	2
+1	1	COMPASS_MOTCT	2	2
 1	1	COMPASS_MOT_X	0.000000000000000000	9
 1	1	COMPASS_MOT_Y	0.000000000000000000	9
 1	1	COMPASS_MOT_Z	0.000000000000000000	9
-1	1	COMPASS_ODI2_X	0.000000000000000000	9
-1	1	COMPASS_ODI2_Y	0.000000000000000000	9
-1	1	COMPASS_ODI2_Z	0.000000000000000000	9
+1	1	COMPASS_ODI2_X	-0.013000000268220901	9
+1	1	COMPASS_ODI2_Y	0.014000000432133675	9
+1	1	COMPASS_ODI2_Z	0.010999999940395355	9
 1	1	COMPASS_ODI3_X	0.000000000000000000	9
 1	1	COMPASS_ODI3_Y	0.000000000000000000	9
 1	1	COMPASS_ODI3_Z	0.000000000000000000	9
-1	1	COMPASS_ODI_X	0.000000000000000000	9
-1	1	COMPASS_ODI_Y	0.000000000000000000	9
+1	1	COMPASS_ODI_X	-0.004000000189989805	9
+1	1	COMPASS_ODI_Y	-0.016000000759959221	9
 1	1	COMPASS_ODI_Z	0.000000000000000000	9
 1	1	COMPASS_OFFS_MAX	1800	4
-1	1	COMPASS_OFS2_X	5.000000000000000000	9
-1	1	COMPASS_OFS2_Y	13.000000000000000000	9
-1	1	COMPASS_OFS2_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS3_X	5.000000000000000000	9
-1	1	COMPASS_OFS3_Y	13.000000000000000000	9
-1	1	COMPASS_OFS3_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS_X	5.000000000000000000	9
-1	1	COMPASS_OFS_Y	13.000000000000000000	9
-1	1	COMPASS_OFS_Z	-18.000000000000000000	9
+1	1	COMPASS_OFS2_X	54.000000000000000000	9
+1	1	COMPASS_OFS2_Y	100.000000000000000000	9
+1	1	COMPASS_OFS2_Z	172.000000000000000000	9
+1	1	COMPASS_OFS3_X	0.000000000000000000	9
+1	1	COMPASS_OFS3_Y	0.000000000000000000	9
+1	1	COMPASS_OFS3_Z	0.000000000000000000	9
+1	1	COMPASS_OFS_X	69.000000000000000000	9
+1	1	COMPASS_OFS_Y	-98.000000000000000000	9
+1	1	COMPASS_OFS_Z	-22.000000000000000000	9
 1	1	COMPASS_OPTIONS	0	4
-1	1	COMPASS_ORIENT	0	2
+1	1	COMPASS_ORIENT	8	2
 1	1	COMPASS_ORIENT2	0	2
 1	1	COMPASS_ORIENT3	0	2
 1	1	COMPASS_PMOT_EN	0	2
-1	1	COMPASS_PRIO1_ID	97539	6
-1	1	COMPASS_PRIO2_ID	131874	6
-1	1	COMPASS_PRIO3_ID	263178	6
-1	1	COMPASS_SCALE	1.000000000000000000	9
-1	1	COMPASS_SCALE2	1.000000000000000000	9
-1	1	COMPASS_SCALE3	1.000000000000000000	9
+1	1	COMPASS_PRIO1_ID	1257473	6
+1	1	COMPASS_PRIO2_ID	97539	6
+1	1	COMPASS_PRIO3_ID	590114	6
+1	1	COMPASS_SCALE	1.029999971389770508	9
+1	1	COMPASS_SCALE2	1.049999952316284180	9
+1	1	COMPASS_SCALE3	1.027450680732727051	9
+1	1	COMPASS_TYPEMASK	0	6
 1	1	COMPASS_USE	1	2
 1	1	COMPASS_USE2	1	2
-1	1	COMPASS_USE3	1	2
-1	1	CRASH_ACC_THRESH	0	2
+1	1	COMPASS_USE3	0	2
+1	1	CRASH_ACC_THRESH	40	2
 1	1	CRASH_DETECT	0	2
-1	1	CRUISE_ALT_FLOOR	0.000000000000000000	9
-1	1	CUST_ROT_ENABLE	0	2
-1	1	DID_ENABLE	0	2
-1	1	DSPOILER_AILMTCH	100	2
-1	1	DSPOILER_CROW_W1	0	2
-1	1	DSPOILER_CROW_W2	0	2
-1	1	DSPOILER_OPTS	3	2
-1	1	DSPOILR_RUD_RATE	100	4
-1	1	EAHRS_TYPE	0	2
-1	1	EFI_TYPE	0	2
+1	1	DSPOILER_AILMTCH	0	2
+1	1	DSPOILER_CROW_W1	30	2
+1	1	DSPOILER_CROW_W2	100	2
+1	1	DSPOILER_OPTS	0	2
+1	1	DSPOILR_RUD_RATE	0	4
 1	1	EK2_ABIAS_P_NSE	0.004999999888241291	9
 1	1	EK2_ACC_P_NSE	0.600000023841857910	9
 1	1	EK2_ALT_M_NSE	3.000000000000000000	9
@@ -226,6 +224,7 @@
 1	1	EK2_EAS_I_GATE	400	4
 1	1	EK2_EAS_M_NSE	1.399999976158142090	9
 1	1	EK2_ENABLE	1	2
+1	1	EK2_EXTNAV_DELAY	10	2
 1	1	EK2_FLOW_DELAY	10	2
 1	1	EK2_FLOW_I_GATE	500	4
 1	1	EK2_FLOW_M_NSE	0.150000005960464478	9
@@ -235,14 +234,12 @@
 1	1	EK2_GPS_CHECK	31	2
 1	1	EK2_GPS_TYPE	0	2
 1	1	EK2_GSCL_P_NSE	0.000500000023748726	9
-1	1	EK2_GSF_RST_MAX	2	2
-1	1	EK2_GSF_RUN_MASK	3	2
-1	1	EK2_GSF_USE_MASK	3	2
 1	1	EK2_GYRO_P_NSE	0.029999999329447746	9
 1	1	EK2_HGT_DELAY	60	4
 1	1	EK2_HGT_I_GATE	500	4
 1	1	EK2_HRT_FILT	2.000000000000000000	9
 1	1	EK2_IMU_MASK	3	2
+1	1	EK2_LOG_MASK	1	2
 1	1	EK2_MAGB_P_NSE	0.000099999997473788	9
 1	1	EK2_MAGE_P_NSE	0.001000000047497451	9
 1	1	EK2_MAG_CAL	0	2
@@ -253,7 +250,6 @@
 1	1	EK2_MAX_FLOW	2.500000000000000000	9
 1	1	EK2_NOAID_M_NSE	10.000000000000000000	9
 1	1	EK2_OGN_HGT_MASK	0	2
-1	1	EK2_OPTIONS	0	6
 1	1	EK2_POSNE_M_NSE	1.000000000000000000	9
 1	1	EK2_POS_I_GATE	500	4
 1	1	EK2_RNG_I_GATE	500	4
@@ -269,446 +265,512 @@
 1	1	EK2_WIND_P_NSE	0.100000001490116119	9
 1	1	EK2_YAW_I_GATE	300	4
 1	1	EK2_YAW_M_NSE	0.500000000000000000	9
-1	1	EK3_ABIAS_P_NSE	0.019999999552965164	9
-1	1	EK3_ACC_BIAS_LIM	1.000000000000000000	9
-1	1	EK3_ACC_P_NSE	0.349999994039535522	9
-1	1	EK3_AFFINITY	0	6
-1	1	EK3_ALT_M_NSE	3.000000000000000000	9
-1	1	EK3_BCN_DELAY	50	2
-1	1	EK3_BCN_I_GTE	500	4
-1	1	EK3_BCN_M_NSE	1.000000000000000000	9
-1	1	EK3_BETA_MASK	0	2
-1	1	EK3_CHECK_SCALE	150	4
-1	1	EK3_DRAG_BCOEF_X	0.000000000000000000	9
-1	1	EK3_DRAG_BCOEF_Y	0.000000000000000000	9
-1	1	EK3_DRAG_MCOEF	0.000000000000000000	9
-1	1	EK3_DRAG_M_NSE	0.500000000000000000	9
-1	1	EK3_EAS_I_GATE	400	4
-1	1	EK3_EAS_M_NSE	1.399999976158142090	9
-1	1	EK3_ENABLE	1	2
-1	1	EK3_ERR_THRESH	0.200000002980232239	9
-1	1	EK3_FLOW_DELAY	10	2
-1	1	EK3_FLOW_I_GATE	500	4
-1	1	EK3_FLOW_M_NSE	0.150000005960464478	9
-1	1	EK3_FLOW_USE	2	2
-1	1	EK3_GBIAS_P_NSE	0.001000000047497451	9
-1	1	EK3_GLITCH_RAD	25	2
-1	1	EK3_GND_EFF_DZ	4.000000000000000000	9
-1	1	EK3_GPS_CHECK	31	2
-1	1	EK3_GPS_VACC_MAX	0.000000000000000000	9
-1	1	EK3_GSF_RST_MAX	2	2
-1	1	EK3_GSF_RUN_MASK	3	2
-1	1	EK3_GSF_USE_MASK	3	2
-1	1	EK3_GYRO_P_NSE	0.014999999664723873	9
-1	1	EK3_HGT_DELAY	60	4
-1	1	EK3_HGT_I_GATE	500	4
-1	1	EK3_HRT_FILT	2.000000000000000000	9
-1	1	EK3_IMU_MASK	3	2
-1	1	EK3_LOG_LEVEL	0	2
-1	1	EK3_MAGB_P_NSE	0.000099999997473788	9
-1	1	EK3_MAGE_P_NSE	0.001000000047497451	9
-1	1	EK3_MAG_CAL	0	2
-1	1	EK3_MAG_EF_LIM	50	4
-1	1	EK3_MAG_I_GATE	300	4
-1	1	EK3_MAG_MASK	0	2
-1	1	EK3_MAG_M_NSE	0.050000000745058060	9
-1	1	EK3_MAX_FLOW	2.500000000000000000	9
-1	1	EK3_NOAID_M_NSE	10.000000000000000000	9
-1	1	EK3_OGNM_TEST_SF	2.000000000000000000	9
-1	1	EK3_OGN_HGT_MASK	0	2
-1	1	EK3_OPTIONS	0	6
-1	1	EK3_POSNE_M_NSE	0.500000000000000000	9
-1	1	EK3_POS_I_GATE	500	4
-1	1	EK3_PRIMARY	0	2
-1	1	EK3_RNG_I_GATE	500	4
-1	1	EK3_RNG_M_NSE	0.500000000000000000	9
-1	1	EK3_RNG_USE_HGT	-1	2
-1	1	EK3_RNG_USE_SPD	2.000000000000000000	9
-1	1	EK3_SRC1_POSXY	3	2
-1	1	EK3_SRC1_POSZ	1	2
-1	1	EK3_SRC1_VELXY	3	2
-1	1	EK3_SRC1_VELZ	3	2
-1	1	EK3_SRC1_YAW	1	2
-1	1	EK3_SRC2_POSXY	0	2
-1	1	EK3_SRC2_POSZ	1	2
-1	1	EK3_SRC2_VELXY	0	2
-1	1	EK3_SRC2_VELZ	0	2
-1	1	EK3_SRC2_YAW	0	2
-1	1	EK3_SRC3_POSXY	0	2
-1	1	EK3_SRC3_POSZ	1	2
-1	1	EK3_SRC3_VELXY	0	2
-1	1	EK3_SRC3_VELZ	0	2
-1	1	EK3_SRC3_YAW	0	2
-1	1	EK3_SRC_OPTIONS	1	4
-1	1	EK3_TAU_OUTPUT	25	2
-1	1	EK3_TERR_GRAD	0.100000001490116119	9
-1	1	EK3_VELD_M_NSE	0.699999988079071045	9
-1	1	EK3_VELNE_M_NSE	0.500000000000000000	9
-1	1	EK3_VEL_I_GATE	500	4
-1	1	EK3_VIS_VERR_MAX	0.899999976158142090	9
-1	1	EK3_VIS_VERR_MIN	0.100000001490116119	9
-1	1	EK3_WENC_VERR	0.100000001490116119	9
-1	1	EK3_WIND_PSCALE	1.000000000000000000	9
-1	1	EK3_WIND_P_NSE	0.100000001490116119	9
-1	1	EK3_YAW_I_GATE	300	4
-1	1	EK3_YAW_M_NSE	0.500000000000000000	9
-1	1	ESC_TLM_MAV_OFS	0	2
-1	1	FBWB_CLIMB_RATE	2	2
+1	1	EK3_ENABLE	0	2
+1	1	FBWA_TDRAG_CHAN	0	2
+1	1	FBWB_CLIMB_RATE	5	2
 1	1	FBWB_ELEV_REV	0	2
-1	1	FENCE_ACTION	1	2
-1	1	FENCE_ALT_MAX	100.000000000000000000	9
-1	1	FENCE_ALT_MIN	-10.000000000000000000	9
+1	1	FENCE_ACTION	0	2
 1	1	FENCE_AUTOENABLE	0	2
-1	1	FENCE_ENABLE	0	2
-1	1	FENCE_MARGIN	2.000000000000000000	9
-1	1	FENCE_OPTIONS	1	4
-1	1	FENCE_RADIUS	300.000000000000000000	9
-1	1	FENCE_RET_ALT	0	4
+1	1	FENCE_CHANNEL	0	2
+1	1	FENCE_MAXALT	0	4
+1	1	FENCE_MINALT	0	4
+1	1	FENCE_RETALT	0	4
 1	1	FENCE_RET_RALLY	0	2
 1	1	FENCE_TOTAL	0	2
-1	1	FENCE_TYPE	4	2
-1	1	FFT_ENABLE	0	2
-1	1	FILT1_TYPE	0	2
-1	1	FILT2_TYPE	0	2
-1	1	FILT3_TYPE	0	2
-1	1	FILT4_TYPE	0	2
-1	1	FILT5_TYPE	0	2
-1	1	FILT6_TYPE	0	2
-1	1	FILT7_TYPE	0	2
-1	1	FILT8_TYPE	0	2
-1	1	FLAP_1_PERCNT	0	2
-1	1	FLAP_1_SPEED	0	2
+1	1	FLAP_1_PERCNT	50	2
+1	1	FLAP_1_SPEED	14	2
 1	1	FLAP_2_PERCNT	0	2
 1	1	FLAP_2_SPEED	0	2
-1	1	FLAP_SLEWRATE	75	2
-1	1	FLIGHT_OPTIONS	0	6
+1	1	FLAP_IN_CHANNEL	0	2
+1	1	FLAP_SLEWRATE	25	2
+1	1	FLIGHT_OPTIONS	4352	6
+1	1	FLOW_ADDR	0	2
+1	1	FLOW_FXSCALER	0	4
+1	1	FLOW_FYSCALER	0	4
+1	1	FLOW_ORIENT_YAW	0	4
+1	1	FLOW_POS_X	0.000000000000000000	9
+1	1	FLOW_POS_Y	0.000000000000000000	9
+1	1	FLOW_POS_Z	0.000000000000000000	9
 1	1	FLOW_TYPE	0	2
-1	1	FLTMODE1	10	2
-1	1	FLTMODE2	11	2
-1	1	FLTMODE3	12	2
-1	1	FLTMODE4	5	2
-1	1	FLTMODE5	2	2
-1	1	FLTMODE6	0	2
-1	1	FLTMODE_CH	8	2
-1	1	FLTMODE_GCSBLOCK	0	6
-1	1	FOLL_ENABLE	0	2
+1	1	FLTMODE1	19	2
+1	1	FLTMODE2	19	2
+1	1	FLTMODE3	19	2
+1	1	FLTMODE4	6	2
+1	1	FLTMODE5	6	2
+1	1	FLTMODE6	11	2
+1	1	FLTMODE_CH	6	2
 1	1	FORMAT_VERSION	13	4
-1	1	FRSKY_DNLINK1_ID	20	2
-1	1	FRSKY_DNLINK2_ID	7	2
-1	1	FRSKY_DNLINK_ID	27	2
-1	1	FRSKY_OPTIONS	0	2
-1	1	FRSKY_UPLINK_ID	13	2
-1	1	FS_EKF_THRESH	0.800000011920928955	9
-1	1	FS_GCS_ENABL	0	2
-1	1	FS_LONG_ACTN	0	2
-1	1	FS_LONG_TIMEOUT	5.000000000000000000	9
-1	1	FS_SHORT_ACTN	0	2
-1	1	FS_SHORT_TIMEOUT	1.500000000000000000	9
+1	1	FS_GCS_ENABL	3	2
+1	1	FS_LONG_ACTN	1	2
+1	1	FS_LONG_TIMEOUT	10.000000000000000000	9
+1	1	FS_SHORT_ACTN	1	2
+1	1	FS_SHORT_TIMEOUT	4.000000000000000000	9
 1	1	FWD_BAT_IDX	0	2
-1	1	FWD_BAT_VOLT_MAX	0.000000000000000000	9
-1	1	FWD_BAT_VOLT_MIN	0.000000000000000000	9
+1	1	FWD_BAT_VOLT_MAX	16.799999237060546875	9
+1	1	FWD_BAT_VOLT_MIN	14.000000000000000000	9
 1	1	GCS_PID_MASK	0	4
-1	1	GEN_TYPE	0	2
 1	1	GLIDE_SLOPE_MIN	15	4
 1	1	GLIDE_SLOPE_THR	5.000000000000000000	9
-1	1	GPS1_CAN_NODEID	0	6
-1	1	GPS1_CAN_OVRIDE	0	6
-1	1	GPS1_COM_PORT	1	2
-1	1	GPS1_DELAY_MS	0	4
-1	1	GPS1_GNSS_MODE	0	2
-1	1	GPS1_MB_TYPE	0	2
-1	1	GPS1_POS_X	0.000000000000000000	9
-1	1	GPS1_POS_Y	0.000000000000000000	9
-1	1	GPS1_POS_Z	0.000000000000000000	9
-1	1	GPS1_RATE_MS	200	4
-1	1	GPS1_TYPE	1	2
-1	1	GPS2_TYPE	0	2
-1	1	GPS_AUTO_CONFIG	1	2
-1	1	GPS_AUTO_SWITCH	1	2
+1	1	GND_ABS_PRESS	85533.164062500000000000	9
+1	1	GND_ABS_PRESS2	85546.882812500000000000	9
+1	1	GND_ABS_PRESS3	85625.093750000000000000	9
+1	1	GND_ALT_OFFSET	0.000000000000000000	9
+1	1	GND_EXT_BUS	-1	2
+1	1	GND_FLTR_RNG	0	2
+1	1	GND_PRIMARY	0	2
+1	1	GND_PROBE_EXT	0	6
+1	1	GND_TEMP	0.000000000000000000	9
+1	1	GPS_AUTO_CONFIG	0	2
+1	1	GPS_AUTO_SWITCH	0	2
 1	1	GPS_BLEND_MASK	5	2
+1	1	GPS_BLEND_TC	10.000000000000000000	9
+1	1	GPS_DELAY_MS	0	4
+1	1	GPS_DELAY_MS2	0	4
 1	1	GPS_DRV_OPTIONS	0	4
+1	1	GPS_GNSS_MODE	0	2
+1	1	GPS_GNSS_MODE2	0	2
 1	1	GPS_INJECT_TO	127	2
+1	1	GPS_MIN_DGPS	100	2
 1	1	GPS_MIN_ELEV	-100	2
 1	1	GPS_NAVFILTER	8	2
-1	1	GPS_PRIMARY	0	2
+1	1	GPS_POS1_X	0.000000000000000000	9
+1	1	GPS_POS1_Y	0.000000000000000000	9
+1	1	GPS_POS1_Z	0.000000000000000000	9
+1	1	GPS_POS2_X	0.000000000000000000	9
+1	1	GPS_POS2_Y	0.000000000000000000	9
+1	1	GPS_POS2_Z	0.000000000000000000	9
+1	1	GPS_RATE_MS	200	4
+1	1	GPS_RATE_MS2	200	4
 1	1	GPS_RAW_DATA	0	2
 1	1	GPS_SAVE_CFG	2	2
 1	1	GPS_SBAS_MODE	2	2
 1	1	GPS_SBP_LOGMASK	-256	4
+1	1	GPS_TYPE	9	2
+1	1	GPS_TYPE2	0	2
 1	1	GRIP_ENABLE	0	2
 1	1	GROUND_STEER_ALT	0.000000000000000000	9
 1	1	GROUND_STEER_DPS	90	4
-1	1	GUIDED_D	0.000000000000000000	9
-1	1	GUIDED_D_FF	0.000000000000000000	9
-1	1	GUIDED_FF	0.000000000000000000	9
-1	1	GUIDED_FLTD	5.000000000000000000	9
-1	1	GUIDED_FLTE	5.000000000000000000	9
-1	1	GUIDED_FLTT	5.000000000000000000	9
-1	1	GUIDED_I	0.000000000000000000	9
-1	1	GUIDED_IMAX	10.000000000000000000	9
-1	1	GUIDED_NEF	0	2
-1	1	GUIDED_NTF	0	2
-1	1	GUIDED_P	5000.000000000000000000	9
-1	1	GUIDED_PDMX	0.000000000000000000	9
-1	1	GUIDED_SMAX	0.000000000000000000	9
+1	1	HIL_ERR_LIMIT	5.000000000000000000	9
+1	1	HIL_MODE	0	2
+1	1	HIL_SERVOS	0	2
 1	1	HOME_RESET_ALT	0	2
 1	1	ICE_ENABLE	0	2
-1	1	INITIAL_MODE	0	2
-1	1	INS_ACC1_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2OFFS_X	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Y	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Z	0.001000000047497451	9
-1	1	INS_ACC2SCAL_X	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Y	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Z	1.001000046730041504	9
-1	1	INS_ACC2_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2_ID	2753036	6
-1	1	INS_ACC3OFFS_X	0.000000000000000000	9
-1	1	INS_ACC3OFFS_Y	0.000000000000000000	9
-1	1	INS_ACC3OFFS_Z	0.000000000000000000	9
-1	1	INS_ACC3SCAL_X	1.000000000000000000	9
-1	1	INS_ACC3SCAL_Y	1.000000000000000000	9
-1	1	INS_ACC3SCAL_Z	1.000000000000000000	9
-1	1	INS_ACC3_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC3_ID	0	6
+1	1	INITIAL_MODE	19	2
+1	1	INS_ACC2OFFS_X	0.054712962359189987	9
+1	1	INS_ACC2OFFS_Y	-0.216669529676437378	9
+1	1	INS_ACC2OFFS_Z	0.314546972513198853	9
+1	1	INS_ACC2SCAL_X	0.997382998466491699	9
+1	1	INS_ACC2SCAL_Y	0.988359093666076660	9
+1	1	INS_ACC2SCAL_Z	0.998526811599731445	9
+1	1	INS_ACC2_ID	2883874	6
+1	1	INS_ACC3OFFS_X	-0.124825842678546906	9
+1	1	INS_ACC3OFFS_Y	-0.015632435679435730	9
+1	1	INS_ACC3OFFS_Z	0.176186725497245789	9
+1	1	INS_ACC3SCAL_X	0.997042357921600342	9
+1	1	INS_ACC3SCAL_Y	0.989098966121673584	9
+1	1	INS_ACC3SCAL_Z	0.994051754474639893	9
+1	1	INS_ACC3_ID	3015690	6
 1	1	INS_ACCEL_FILTER	20	4
-1	1	INS_ACCOFFS_X	0.001000000047497451	9
-1	1	INS_ACCOFFS_Y	0.001000000047497451	9
-1	1	INS_ACCOFFS_Z	0.001000000047497451	9
-1	1	INS_ACCSCAL_X	1.001000046730041504	9
-1	1	INS_ACCSCAL_Y	1.001000046730041504	9
-1	1	INS_ACCSCAL_Z	1.001000046730041504	9
+1	1	INS_ACCOFFS_X	0.171545445919036865	9
+1	1	INS_ACCOFFS_Y	-0.032949406653642654	9
+1	1	INS_ACCOFFS_Z	0.237508997321128845	9
+1	1	INS_ACCSCAL_X	0.998330771923065186	9
+1	1	INS_ACCSCAL_Y	0.896929979324340820	9
+1	1	INS_ACCSCAL_Z	1.001518845558166504	9
 1	1	INS_ACC_BODYFIX	2	2
-1	1	INS_ACC_ID	2753028	6
+1	1	INS_ACC_ID	3081250	6
 1	1	INS_ENABLE_MASK	127	2
-1	1	INS_FAST_SAMPLE	1	2
-1	1	INS_GYR1_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR2OFFS_X	0.000000000000000000	9
-1	1	INS_GYR2OFFS_Y	0.000000000000000000	9
-1	1	INS_GYR2OFFS_Z	0.000000000000000000	9
-1	1	INS_GYR2_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR2_ID	2752780	6
-1	1	INS_GYR3OFFS_X	0.000000000000000000	9
-1	1	INS_GYR3OFFS_Y	0.000000000000000000	9
-1	1	INS_GYR3OFFS_Z	0.000000000000000000	9
-1	1	INS_GYR3_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR3_ID	0	6
-1	1	INS_GYROFFS_X	0.000000000000000000	9
-1	1	INS_GYROFFS_Y	0.000000000000000000	9
-1	1	INS_GYROFFS_Z	0.000000000000000000	9
-1	1	INS_GYRO_FILTER	20	4
-1	1	INS_GYRO_RATE	0	2
-1	1	INS_GYR_CAL	0	2
-1	1	INS_GYR_ID	2752772	6
-1	1	INS_HNTC2_ENABLE	0	2
-1	1	INS_HNTCH_ENABLE	0	2
+1	1	INS_FAST_SAMPLE	2	2
+1	1	INS_GYR2OFFS_X	-0.004077028948813677	9
+1	1	INS_GYR2OFFS_Y	-0.010312342084944248	9
+1	1	INS_GYR2OFFS_Z	0.017256719991564751	9
+1	1	INS_GYR2_ID	2883874	6
+1	1	INS_GYR3OFFS_X	-0.009859869256615639	9
+1	1	INS_GYR3OFFS_Y	-0.002577690407633781	9
+1	1	INS_GYR3OFFS_Z	0.008385097607970238	9
+1	1	INS_GYR3_ID	3015690	6
+1	1	INS_GYROFFS_X	0.018343556672334671	9
+1	1	INS_GYROFFS_Y	-0.018574506044387817	9
+1	1	INS_GYROFFS_Z	0.018880937248468399	9
+1	1	INS_GYRO_FILTER	30	4
+1	1	INS_GYR_CAL	1	2
+1	1	INS_GYR_ID	3081250	6
+1	1	INS_HNTCH_ATT	50.000000000000000000	9
+1	1	INS_HNTCH_BW	50.000000000000000000	9
+1	1	INS_HNTCH_ENABLE	1	2
+1	1	INS_HNTCH_FREQ	100.000000000000000000	9
+1	1	INS_HNTCH_HMNCS	3	2
+1	1	INS_HNTCH_MODE	3	2
+1	1	INS_HNTCH_REF	1.000000000000000000	9
 1	1	INS_LOG_BAT_CNT	1024	4
 1	1	INS_LOG_BAT_LGCT	32	4
 1	1	INS_LOG_BAT_LGIN	20	2
-1	1	INS_LOG_BAT_MASK	0	2
-1	1	INS_LOG_BAT_OPT	0	2
-1	1	INS_POS1_X	0.000000000000000000	9
+1	1	INS_LOG_BAT_MASK	2	2
+1	1	INS_LOG_BAT_OPT	2	2
+1	1	INS_NOTCH_ENABLE	0	2
+1	1	INS_POS1_X	0.035999998450279236	9
 1	1	INS_POS1_Y	0.000000000000000000	9
 1	1	INS_POS1_Z	0.000000000000000000	9
-1	1	INS_POS2_X	0.000000000000000000	9
+1	1	INS_POS2_X	0.035999998450279236	9
 1	1	INS_POS2_Y	0.000000000000000000	9
 1	1	INS_POS2_Z	0.000000000000000000	9
-1	1	INS_POS3_X	0.000000000000000000	9
+1	1	INS_POS3_X	0.035999998450279236	9
 1	1	INS_POS3_Y	0.000000000000000000	9
 1	1	INS_POS3_Z	0.000000000000000000	9
-1	1	INS_RAW_LOG_OPT	0	4
-1	1	INS_STILL_THRESH	0.050000000745058060	9
-1	1	INS_TCAL1_ENABLE	0	2
-1	1	INS_TCAL2_ENABLE	0	2
-1	1	INS_TCAL3_ENABLE	0	2
-1	1	INS_TCAL_OPTIONS	0	6
-1	1	INS_TRIM_OPTION	1	2
+1	1	INS_STILL_THRESH	3.000000000000000000	9
+1	1	INS_TRIM_OPTION	2	2
 1	1	INS_USE	1	2
 1	1	INS_USE2	1	2
 1	1	INS_USE3	1	2
-1	1	KDE_NPOLE	14	2
-1	1	KFF_RDDRMIX	0.500000000000000000	9
+1	1	KFF_RDDRMIX	0.300000011920928955	9
 1	1	KFF_THR2PTCH	0.000000000000000000	9
 1	1	LAND_ABORT_DEG	0.000000000000000000	9
 1	1	LAND_ABORT_THR	0	2
-1	1	LAND_DISARMDELAY	20	2
-1	1	LAND_FLAP_PERCNT	0	2
-1	1	LAND_FLARE_AIM	50	2
-1	1	LAND_FLARE_ALT	3.000000000000000000	9
-1	1	LAND_FLARE_SEC	3.000000000000000000	9
-1	1	LAND_OPTIONS	0	4
-1	1	LAND_PF_ALT	10.000000000000000000	9
-1	1	LAND_PF_ARSPD	0.000000000000000000	9
-1	1	LAND_PF_SEC	6.000000000000000000	9
-1	1	LAND_PITCH_DEG	1.000000000000000000	9
+1	1	LAND_DISARMDELAY	2	2
+1	1	LAND_DS_ABORTALT	0.000000000000000000	9
+1	1	LAND_DS_AIL_SCL	1.000000000000000000	9
+1	1	LAND_DS_APP_EXT	50.000000000000000000	9
+1	1	LAND_DS_ARSP_MAX	15.000000000000000000	9
+1	1	LAND_DS_ARSP_MIN	10.000000000000000000	9
+1	1	LAND_DS_D	0.000000000000000000	9
+1	1	LAND_DS_ELEV_PWM	1500	4
+1	1	LAND_DS_I	0.000000000000000000	9
+1	1	LAND_DS_IMAX	0	4
+1	1	LAND_DS_L1	30.000000000000000000	9
+1	1	LAND_DS_L1_I	0.000000000000000000	9
+1	1	LAND_DS_L1_TCON	0.400000005960464478	9
+1	1	LAND_DS_P	0.000000000000000000	9
+1	1	LAND_DS_SLEW_SPD	0.500000000000000000	9
+1	1	LAND_DS_SLOPE_A	1.000000000000000000	9
+1	1	LAND_DS_SLOPE_B	1.000000000000000000	9
+1	1	LAND_DS_V_DWN	2.000000000000000000	9
+1	1	LAND_DS_V_FWD	1.000000000000000000	9
+1	1	LAND_DS_YAW_LIM	10.000000000000000000	9
+1	1	LAND_FLAP_PERCNT	50	2
+1	1	LAND_FLARE_ALT	2.000000000000000000	9
+1	1	LAND_FLARE_SEC	1.500000000000000000	9
+1	1	LAND_PF_ALT	15.000000000000000000	9
+1	1	LAND_PF_ARSPD	12.000000000000000000	9
+1	1	LAND_PF_SEC	5.000000000000000000	9
+1	1	LAND_PITCH_CD	500	4
 1	1	LAND_SLOPE_RCALC	2.000000000000000000	9
 1	1	LAND_THEN_NEUTRL	0	2
 1	1	LAND_THR_SLEW	0	2
 1	1	LAND_TYPE	0	2
-1	1	LAND_WIND_COMP	50.000000000000000000	9
 1	1	LEVEL_ROLL_LIMIT	5	2
-1	1	LGR_ENABLE	0	2
+1	1	LGR_DEPLOY_ALT	0	4
+1	1	LGR_DEPLOY_PIN	-1	2
+1	1	LGR_DEPLOY_POL	0	2
+1	1	LGR_OPTIONS	3	4
+1	1	LGR_RETRACT_ALT	0	4
+1	1	LGR_STARTUP	0	2
+1	1	LGR_WOW_PIN	-1	2
+1	1	LGR_WOW_POL	0	2
+1	1	LIM_PITCH_MAX	1600	4
+1	1	LIM_PITCH_MIN	-800	4
+1	1	LIM_ROLL_CD	4000	4
 1	1	LOG_BACKEND_TYPE	1	2
 1	1	LOG_BITMASK	65535	6
-1	1	LOG_BLK_RATEMAX	0.000000000000000000	9
-1	1	LOG_DARM_RATEMAX	0.000000000000000000	9
-1	1	LOG_DISARMED	0	2
-1	1	LOG_FILE_BUFSIZE	200	4
+1	1	LOG_DISARMED	1	2
+1	1	LOG_FILE_BUFSIZE	50	2
 1	1	LOG_FILE_DSRMROT	0	2
-1	1	LOG_FILE_MB_FREE	500	4
-1	1	LOG_FILE_RATEMAX	0.000000000000000000	9
 1	1	LOG_FILE_TIMEOUT	5	4
 1	1	LOG_MAV_BUFSIZE	8	2
-1	1	LOG_MAV_RATEMAX	0.000000000000000000	9
-1	1	LOG_MAX_FILES	500	4
 1	1	LOG_REPLAY	0	2
 1	1	MANUAL_RCMASK	0	6
-1	1	MAN_EXPO_PITCH	0	2
-1	1	MAN_EXPO_ROLL	0	2
-1	1	MAN_EXPO_RUDDER	0	2
-1	1	MIN_GROUNDSPEED	0.000000000000000000	9
+1	1	MIN_GNDSPD_CM	0	6
 1	1	MIS_OPTIONS	0	4
 1	1	MIS_RESTART	0	2
-1	1	MIS_TOTAL	0	4
-1	1	MIXING_GAIN	0.500000000000000000	9
-1	1	MIXING_OFFSET	0	4
-1	1	MNT1_TYPE	0	2
-1	1	MNT2_TYPE	0	2
-1	1	MSP_OPTIONS	0	2
-1	1	MSP_OSD_NCELLS	0	2
-1	1	NAVL1_DAMPING	0.750000000000000000	9
+1	1	MIS_TOTAL	40	4
+1	1	MIXING_GAIN	0.550000011920928955	9
+1	1	MIXING_OFFSET	-80	4
+1	1	MNT_ANGMAX_PAN	4500	4
+1	1	MNT_ANGMAX_ROL	4500	4
+1	1	MNT_ANGMAX_TIL	4500	4
+1	1	MNT_ANGMIN_PAN	-4500	4
+1	1	MNT_ANGMIN_ROL	-4500	4
+1	1	MNT_ANGMIN_TIL	-4500	4
+1	1	MNT_DEFLT_MODE	3	2
+1	1	MNT_JSTICK_SPD	0	2
+1	1	MNT_LEAD_PTCH	0.000000000000000000	9
+1	1	MNT_LEAD_RLL	0.000000000000000000	9
+1	1	MNT_NEUTRAL_X	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Y	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Z	0.000000000000000000	9
+1	1	MNT_RC_IN_PAN	0	2
+1	1	MNT_RC_IN_ROLL	0	2
+1	1	MNT_RC_IN_TILT	0	2
+1	1	MNT_RETRACT_X	0.000000000000000000	9
+1	1	MNT_RETRACT_Y	0.000000000000000000	9
+1	1	MNT_RETRACT_Z	0.000000000000000000	9
+1	1	MNT_STAB_PAN	0	2
+1	1	MNT_STAB_ROLL	0	2
+1	1	MNT_STAB_TILT	0	2
+1	1	MNT_TYPE	0	2
+1	1	NAVL1_DAMPING	0.829999983310699463	9
 1	1	NAVL1_LIM_BANK	0.000000000000000000	9
 1	1	NAVL1_PERIOD	15.000000000000000000	9
-1	1	NAVL1_XTRACK_I	0.019999999552965164	9
-1	1	NET_ENABLE	0	2
-1	1	NET_P1_TYPE	0	2
-1	1	NET_P2_TYPE	0	2
-1	1	NET_P3_TYPE	0	2
-1	1	NET_P4_TYPE	0	2
-1	1	NMEA_MSG_EN	3	4
-1	1	NMEA_RATE_MS	100	4
+1	1	NAVL1_XTRACK_I	0.100000001490116119	9
+1	1	NAV_CONTROLLER	1	2
+1	1	NTF_BUZZ_ENABLE	1	2
 1	1	NTF_BUZZ_ON_LVL	1	2
-1	1	NTF_BUZZ_PIN	-1	2
-1	1	NTF_BUZZ_TYPES	5	2
+1	1	NTF_BUZZ_PIN	0	2
 1	1	NTF_BUZZ_VOLUME	100	2
 1	1	NTF_DISPLAY_TYPE	0	2
 1	1	NTF_LED_BRIGHT	3	2
 1	1	NTF_LED_LEN	1	2
 1	1	NTF_LED_OVERRIDE	0	2
-1	1	NTF_LED_TYPES	123079	6
-1	1	ONESHOT_MASK	0	6
-1	1	OSD_TYPE	0	2
-1	1	PLND_ENABLED	0	2
-1	1	PTCH2SRV_RLL	1.000000000000000000	9
+1	1	NTF_LED_TYPES	231	6
+1	1	NTF_OREO_THEME	0	2
+1	1	OVERRIDE_CHAN	0	2
+1	1	OVERRIDE_SAFETY	1	2
+1	1	PTCH2SRV_D	0.039999999105930328	9
+1	1	PTCH2SRV_FF	0.000000000000000000	9
+1	1	PTCH2SRV_I	0.300000011920928955	9
+1	1	PTCH2SRV_IMAX	3000	4
+1	1	PTCH2SRV_P	1.000000000000000000	9
+1	1	PTCH2SRV_RLL	1.200000047683715820	9
 1	1	PTCH2SRV_RMAX_DN	90	4
 1	1	PTCH2SRV_RMAX_UP	90	4
-1	1	PTCH2SRV_TCONST	0.250000000000000000	9
-1	1	PTCH_LIM_MAX_DEG	25.000000000000000000	9
-1	1	PTCH_LIM_MIN_DEG	-20.000000000000000000	9
-1	1	PTCH_RATE_D	0.007265000138431787	9
-1	1	PTCH_RATE_D_FF	0.000000000000000000	9
-1	1	PTCH_RATE_FF	0.595722973346710205	9
-1	1	PTCH_RATE_FLTD	12.000000000000000000	9
-1	1	PTCH_RATE_FLTE	0.000000000000000000	9
-1	1	PTCH_RATE_FLTT	3.000000000000000000	9
-1	1	PTCH_RATE_I	0.109999999403953552	9
-1	1	PTCH_RATE_IMAX	0.666000008583068848	9
-1	1	PTCH_RATE_NEF	0	2
-1	1	PTCH_RATE_NTF	0	2
-1	1	PTCH_RATE_P	0.150000005960464478	9
-1	1	PTCH_RATE_PDMX	0.000000000000000000	9
-1	1	PTCH_RATE_SMAX	150.000000000000000000	9
-1	1	PTCH_TRIM_DEG	0.000000000000000000	9
-1	1	PUP_ENABLE	0	2
-1	1	QWIK_ENABLE	0	2
-1	1	Q_ENABLE	0	2
-1	1	RALLY_INCL_HOME	0	2
-1	1	RALLY_LIMIT_KM	5.000000000000000000	9
+1	1	PTCH2SRV_TCONST	0.379999995231628418	9
+1	1	Q_ACCEL_Z	250	4
+1	1	Q_ACRO_PIT_RATE	180.000000000000000000	9
+1	1	Q_ACRO_RLL_RATE	360.000000000000000000	9
+1	1	Q_ACRO_YAW_RATE	90.000000000000000000	9
+1	1	Q_ANGLE_MAX	1000	4
+1	1	Q_ASSIST_ALT	10	4
+1	1	Q_ASSIST_ANGLE	15	2
+1	1	Q_ASSIST_SPEED	11.000000000000000000	9
+1	1	Q_AUTOTUNE_AGGR	0.050000000745058060	9
+1	1	Q_AUTOTUNE_AXES	4	2
+1	1	Q_AUTOTUNE_MIN_D	0.001000000047497451	9
+1	1	Q_A_ACCEL_P_MAX	100000.000000000000000000	9
+1	1	Q_A_ACCEL_R_MAX	100000.000000000000000000	9
+1	1	Q_A_ACCEL_Y_MAX	4000.000000000000000000	9
+1	1	Q_A_ANGLE_BOOST	1	2
+1	1	Q_A_ANG_LIM_TC	0.500000000000000000	9
+1	1	Q_A_ANG_PIT_P	6.000000000000000000	9
+1	1	Q_A_ANG_RLL_P	6.000000000000000000	9
+1	1	Q_A_ANG_YAW_P	6.000000000000000000	9
+1	1	Q_A_INPUT_TC	0.400000005960464478	9
+1	1	Q_A_RATE_FF_ENAB	1	2
+1	1	Q_A_RATE_P_MAX	360.000000000000000000	9
+1	1	Q_A_RATE_R_MAX	360.000000000000000000	9
+1	1	Q_A_RATE_Y_MAX	20.000000000000000000	9
+1	1	Q_A_RAT_PIT_D	0.001000000047497451	9
+1	1	Q_A_RAT_PIT_FF	0.019999999552965164	9
+1	1	Q_A_RAT_PIT_FLTD	10.000000000000000000	9
+1	1	Q_A_RAT_PIT_FLTE	0.000000000000000000	9
+1	1	Q_A_RAT_PIT_FLTT	10.000000000000000000	9
+1	1	Q_A_RAT_PIT_I	0.300000011920928955	9
+1	1	Q_A_RAT_PIT_IMAX	0.250000000000000000	9
+1	1	Q_A_RAT_PIT_P	0.360000014305114746	9
+1	1	Q_A_RAT_RLL_D	0.004000000189989805	9
+1	1	Q_A_RAT_RLL_FF	0.059999998658895493	9
+1	1	Q_A_RAT_RLL_FLTD	10.000000000000000000	9
+1	1	Q_A_RAT_RLL_FLTE	0.000000000000000000	9
+1	1	Q_A_RAT_RLL_FLTT	10.000000000000000000	9
+1	1	Q_A_RAT_RLL_I	0.300000011920928955	9
+1	1	Q_A_RAT_RLL_IMAX	0.250000000000000000	9
+1	1	Q_A_RAT_RLL_P	0.550000011920928955	9
+1	1	Q_A_RAT_YAW_D	0.500000000000000000	9
+1	1	Q_A_RAT_YAW_FF	0.000000000000000000	9
+1	1	Q_A_RAT_YAW_FLTD	10.000000000000000000	9
+1	1	Q_A_RAT_YAW_FLTE	2.500000000000000000	9
+1	1	Q_A_RAT_YAW_FLTT	10.000000000000000000	9
+1	1	Q_A_RAT_YAW_I	0.500000000000000000	9
+1	1	Q_A_RAT_YAW_IMAX	0.100000016391277313	9
+1	1	Q_A_RAT_YAW_P	1.500000000000000000	9
+1	1	Q_A_SLEW_YAW	1000.000000000000000000	9
+1	1	Q_A_THR_MIX_MAN	0.500000000000000000	9
+1	1	Q_A_THR_MIX_MAX	0.660000026226043701	9
+1	1	Q_A_THR_MIX_MIN	0.200000002980232239	9
+1	1	Q_ENABLE	1	2
+1	1	Q_ESC_CAL	0	2
+1	1	Q_FRAME_CLASS	1	2
+1	1	Q_FRAME_TYPE	0	2
+1	1	Q_FW_LND_APR_RAD	90.000000000000000000	9
+1	1	Q_GUIDED_MODE	0	2
+1	1	Q_LAND_FINAL_ALT	6.000000000000000000	9
+1	1	Q_LAND_ICE_CUT	1	2
+1	1	Q_LAND_SPEED	30	4
+1	1	Q_LOIT_ACC_MAX	80.000000000000000000	9
+1	1	Q_LOIT_ANG_MAX	5.000000000000000000	9
+1	1	Q_LOIT_BRK_ACCEL	100.000000000000000000	9
+1	1	Q_LOIT_BRK_DELAY	0.100000001490116119	9
+1	1	Q_LOIT_BRK_JERK	1500.000000000000000000	9
+1	1	Q_LOIT_SPEED	200.000000000000000000	9
+1	1	Q_MAV_TYPE	0	2
+1	1	Q_M_BAT_CURR_MAX	120.000000000000000000	9
+1	1	Q_M_BAT_CURR_TC	5.000000000000000000	9
+1	1	Q_M_BAT_IDX	0	2
+1	1	Q_M_BAT_VOLT_MAX	16.799999237060546875	9
+1	1	Q_M_BAT_VOLT_MIN	13.199999809265136719	9
+1	1	Q_M_BOOST_SCALE	0.000000000000000000	9
+1	1	Q_M_HOVER_LEARN	1	2
+1	1	Q_M_PWM_MAX	2000	4
+1	1	Q_M_PWM_MIN	1000	4
+1	1	Q_M_PWM_TYPE	6	2
+1	1	Q_M_SAFE_DISARM	1	2
+1	1	Q_M_SAFE_TIME	1.000000000000000000	9
+1	1	Q_M_SLEW_DN_TIME	0.000000000000000000	9
+1	1	Q_M_SLEW_UP_TIME	0.000000000000000000	9
+1	1	Q_M_SPIN_ARM	0.079999998211860657	9
+1	1	Q_M_SPIN_MAX	1.000000000000000000	9
+1	1	Q_M_SPIN_MIN	0.119999997317790985	9
+1	1	Q_M_SPOOL_TIME	0.200000002980232239	9
+1	1	Q_M_THST_EXPO	0.660000026226043701	9
+1	1	Q_M_THST_HOVER	0.500000000000000000	9
+1	1	Q_M_YAW_HEADROOM	200	4
+1	1	Q_OPTIONS	448537	6
+1	1	Q_P_ACCZ_D	0.025000000372529030	9
+1	1	Q_P_ACCZ_FF	0.400000005960464478	9
+1	1	Q_P_ACCZ_FLTD	10.000000000000000000	9
+1	1	Q_P_ACCZ_FLTE	20.000000000000000000	9
+1	1	Q_P_ACCZ_FLTT	5.000000000000000000	9
+1	1	Q_P_ACCZ_I	0.250000000000000000	9
+1	1	Q_P_ACCZ_IMAX	500.000000000000000000	9
+1	1	Q_P_ACCZ_P	0.449999988079071045	9
+1	1	Q_P_ACC_XY_FILT	2.000000000000000000	9
+1	1	Q_P_ANGLE_MAX	10.000000000000000000	9
+1	1	Q_P_POSXY_P	0.600000023841857910	9
+1	1	Q_P_POSZ_P	1.750000000000000000	9
+1	1	Q_P_VELXY_D	0.250000000000000000	9
+1	1	Q_P_VELXY_D_FILT	10.000000000000000000	9
+1	1	Q_P_VELXY_FILT	20.000000000000000000	9
+1	1	Q_P_VELXY_I	0.300000011920928955	9
+1	1	Q_P_VELXY_IMAX	1000.000000000000000000	9
+1	1	Q_P_VELXY_P	2.799999952316284180	9
+1	1	Q_P_VELZ_P	6.000000000000000000	9
+1	1	Q_RC_SPEED	250	4
+1	1	Q_RTL_ALT	45	4
+1	1	Q_RTL_MODE	2	2
+1	1	Q_TAILSIT_ANGLE	45	2
+1	1	Q_TAILSIT_INPUT	0	2
+1	1	Q_TAILSIT_MASK	0	2
+1	1	Q_TAILSIT_MASKCH	0	2
+1	1	Q_TAILSIT_MOTMX	0	4
+1	1	Q_TAILSIT_RLL_MX	0.000000000000000000	9
+1	1	Q_TAILSIT_THSCMX	5.000000000000000000	9
+1	1	Q_TAILSIT_VFGAIN	0.000000000000000000	9
+1	1	Q_TAILSIT_VHGAIN	0.500000000000000000	9
+1	1	Q_TAILSIT_VHPOW	2.500000000000000000	9
+1	1	Q_THROTTLE_EXPO	0.200000002980232239	9
+1	1	Q_THR_MAX_PWM	2000	4
+1	1	Q_THR_MIN_PWM	1000	4
+1	1	Q_TILT_MASK	0	4
+1	1	Q_TILT_MAX	45	2
+1	1	Q_TILT_RATE_DN	0	4
+1	1	Q_TILT_RATE_UP	40	4
+1	1	Q_TILT_TYPE	0	2
+1	1	Q_TILT_YAW_ANGLE	0.000000000000000000	9
+1	1	Q_TKOFF_ARSP_LIM	0.000000000000000000	9
+1	1	Q_TKOFF_FAIL_SCL	0.000000000000000000	9
+1	1	Q_TRANSITION_MS	20000	4
+1	1	Q_TRANS_DECEL	0.300000011920928955	9
+1	1	Q_TRANS_FAIL	0	4
+1	1	Q_TRAN_PIT_MAX	7	2
+1	1	Q_TRIM_PITCH	0.000000000000000000	9
+1	1	Q_VELZ_MAX	250	4
+1	1	Q_VFWD_ALT	0.500000000000000000	9
+1	1	Q_VFWD_GAIN	0.050000000745058060	9
+1	1	Q_WP_ACCEL	85.000000000000000000	9
+1	1	Q_WP_ACCEL_Z	60.000000000000000000	9
+1	1	Q_WP_RADIUS	250.000000000000000000	9
+1	1	Q_WP_RFND_USE	0	2
+1	1	Q_WP_SPEED	200.000000000000000000	9
+1	1	Q_WP_SPEED_DN	120.000000000000000000	9
+1	1	Q_WP_SPEED_UP	150.000000000000000000	9
+1	1	Q_WVANE_GAIN	0.000000000000000000	9
+1	1	Q_WVANE_MINROLL	1.000000000000000000	9
+1	1	Q_YAW_RATE_MAX	7.500000000000000000	9
+1	1	RALLY_INCL_HOME	1	2
+1	1	RALLY_LIMIT_KM	2.500000000000000000	9
 1	1	RALLY_TOTAL	0	2
 1	1	RC10_DZ	0	4
-1	1	RC10_MAX	1900	4
-1	1	RC10_MIN	1100	4
+1	1	RC10_MAX	2000	4
+1	1	RC10_MIN	1000	4
 1	1	RC10_OPTION	0	4
 1	1	RC10_REVERSED	0	2
 1	1	RC10_TRIM	1500	4
 1	1	RC11_DZ	0	4
-1	1	RC11_MAX	1900	4
-1	1	RC11_MIN	1100	4
+1	1	RC11_MAX	2000	4
+1	1	RC11_MIN	1000	4
 1	1	RC11_OPTION	0	4
 1	1	RC11_REVERSED	0	2
 1	1	RC11_TRIM	1500	4
 1	1	RC12_DZ	0	4
-1	1	RC12_MAX	1900	4
-1	1	RC12_MIN	1100	4
+1	1	RC12_MAX	2000	4
+1	1	RC12_MIN	1000	4
 1	1	RC12_OPTION	0	4
 1	1	RC12_REVERSED	0	2
 1	1	RC12_TRIM	1500	4
 1	1	RC13_DZ	0	4
-1	1	RC13_MAX	1900	4
-1	1	RC13_MIN	1100	4
+1	1	RC13_MAX	2000	4
+1	1	RC13_MIN	1000	4
 1	1	RC13_OPTION	0	4
 1	1	RC13_REVERSED	0	2
 1	1	RC13_TRIM	1500	4
 1	1	RC14_DZ	0	4
-1	1	RC14_MAX	1900	4
-1	1	RC14_MIN	1100	4
+1	1	RC14_MAX	2000	4
+1	1	RC14_MIN	1000	4
 1	1	RC14_OPTION	0	4
 1	1	RC14_REVERSED	0	2
 1	1	RC14_TRIM	1500	4
 1	1	RC15_DZ	0	4
-1	1	RC15_MAX	1900	4
-1	1	RC15_MIN	1100	4
+1	1	RC15_MAX	2000	4
+1	1	RC15_MIN	1000	4
 1	1	RC15_OPTION	0	4
 1	1	RC15_REVERSED	0	2
 1	1	RC15_TRIM	1500	4
 1	1	RC16_DZ	0	4
-1	1	RC16_MAX	1900	4
-1	1	RC16_MIN	1100	4
+1	1	RC16_MAX	2000	4
+1	1	RC16_MIN	1000	4
 1	1	RC16_OPTION	0	4
 1	1	RC16_REVERSED	0	2
 1	1	RC16_TRIM	1500	4
-1	1	RC1_DZ	30	4
-1	1	RC1_MAX	2000	4
-1	1	RC1_MIN	1000	4
+1	1	RC1_DZ	50	4
+1	1	RC1_MAX	2006	4
+1	1	RC1_MIN	982	4
 1	1	RC1_OPTION	0	4
 1	1	RC1_REVERSED	0	2
 1	1	RC1_TRIM	1500	4
-1	1	RC2_DZ	30	4
-1	1	RC2_MAX	2000	4
-1	1	RC2_MIN	1000	4
+1	1	RC2_DZ	50	4
+1	1	RC2_MAX	2006	4
+1	1	RC2_MIN	982	4
 1	1	RC2_OPTION	0	4
-1	1	RC2_REVERSED	0	2
-1	1	RC2_TRIM	1500	4
-1	1	RC3_DZ	30	4
-1	1	RC3_MAX	2000	4
-1	1	RC3_MIN	1000	4
+1	1	RC2_REVERSED	1	2
+1	1	RC2_TRIM	1492	4
+1	1	RC3_DZ	50	4
+1	1	RC3_MAX	2006	4
+1	1	RC3_MIN	982	4
 1	1	RC3_OPTION	0	4
 1	1	RC3_REVERSED	0	2
-1	1	RC3_TRIM	1000	4
-1	1	RC4_DZ	30	4
-1	1	RC4_MAX	2000	4
-1	1	RC4_MIN	1000	4
+1	1	RC3_TRIM	982	4
+1	1	RC4_DZ	50	4
+1	1	RC4_MAX	2006	4
+1	1	RC4_MIN	982	4
 1	1	RC4_OPTION	0	4
 1	1	RC4_REVERSED	0	2
-1	1	RC4_TRIM	1500	4
+1	1	RC4_TRIM	1495	4
 1	1	RC5_DZ	0	4
-1	1	RC5_MAX	2000	4
-1	1	RC5_MIN	1000	4
-1	1	RC5_OPTION	0	4
+1	1	RC5_MAX	2006	4
+1	1	RC5_MIN	982	4
+1	1	RC5_OPTION	208	4
 1	1	RC5_REVERSED	0	2
-1	1	RC5_TRIM	1500	4
+1	1	RC5_TRIM	1494	4
 1	1	RC6_DZ	0	4
-1	1	RC6_MAX	2000	4
-1	1	RC6_MIN	1000	4
+1	1	RC6_MAX	1956	4
+1	1	RC6_MIN	1033	4
 1	1	RC6_OPTION	0	4
 1	1	RC6_REVERSED	0	2
-1	1	RC6_TRIM	1500	4
+1	1	RC6_TRIM	1494	4
 1	1	RC7_DZ	0	4
-1	1	RC7_MAX	2000	4
-1	1	RC7_MIN	1000	4
-1	1	RC7_OPTION	0	4
+1	1	RC7_MAX	2006	4
+1	1	RC7_MIN	982	4
+1	1	RC7_OPTION	31	4
 1	1	RC7_REVERSED	0	2
-1	1	RC7_TRIM	1500	4
+1	1	RC7_TRIM	1494	4
 1	1	RC8_DZ	0	4
 1	1	RC8_MAX	2000	4
 1	1	RC8_MIN	1000	4
@@ -716,8 +778,8 @@
 1	1	RC8_REVERSED	0	2
 1	1	RC8_TRIM	1500	4
 1	1	RC9_DZ	0	4
-1	1	RC9_MAX	1900	4
-1	1	RC9_MIN	1100	4
+1	1	RC9_MAX	2000	4
+1	1	RC9_MIN	1000	4
 1	1	RC9_OPTION	0	4
 1	1	RC9_REVERSED	0	2
 1	1	RC9_TRIM	1500	4
@@ -725,159 +787,309 @@
 1	1	RCMAP_ROLL	1	2
 1	1	RCMAP_THROTTLE	3	2
 1	1	RCMAP_YAW	4	2
-1	1	RC_OPTIONS	32	6
-1	1	RC_OVERRIDE_TIME	3.000000000000000000	9
-1	1	RC_PROTOCOLS	1	6
-1	1	RELAY1_DEFAULT	0	2
-1	1	RELAY1_FUNCTION	1	2
-1	1	RELAY1_INVERTED	0	2
-1	1	RELAY1_PIN	13	4
-1	1	RELAY2_FUNCTION	0	2
-1	1	RELAY3_FUNCTION	0	2
-1	1	RELAY4_FUNCTION	0	2
-1	1	RELAY5_FUNCTION	0	2
-1	1	RELAY6_FUNCTION	0	2
-1	1	RLL2SRV_RMAX	90	4
-1	1	RLL2SRV_TCONST	0.250000000000000000	9
-1	1	RLL_RATE_D	0.017430000007152557	9
-1	1	RLL_RATE_D_FF	0.000000000000000000	9
-1	1	RLL_RATE_FF	0.237212002277374268	9
-1	1	RLL_RATE_FLTD	12.000000000000000000	9
-1	1	RLL_RATE_FLTE	0.000000000000000000	9
-1	1	RLL_RATE_FLTT	3.000000000000000000	9
-1	1	RLL_RATE_I	0.250000000000000000	9
-1	1	RLL_RATE_IMAX	0.666000008583068848	9
-1	1	RLL_RATE_NEF	0	2
-1	1	RLL_RATE_NTF	0	2
-1	1	RLL_RATE_P	0.300000011920928955	9
-1	1	RLL_RATE_PDMX	0.000000000000000000	9
-1	1	RLL_RATE_SMAX	150.000000000000000000	9
-1	1	RNGFND1_TYPE	0	2
+1	1	RC_OPTIONS	40	6
+1	1	RC_OVERRIDE_TIME	0.000000000000000000	9
+1	1	RELAY_DEFAULT	0	2
+1	1	RELAY_PIN	-1	2
+1	1	RELAY_PIN2	55	2
+1	1	RELAY_PIN3	-1	2
+1	1	RELAY_PIN4	-1	2
+1	1	RELAY_PIN5	-1	2
+1	1	RELAY_PIN6	-1	2
+1	1	RLL2SRV_D	0.079999998211860657	9
+1	1	RLL2SRV_FF	0.000000000000000000	9
+1	1	RLL2SRV_I	0.300000011920928955	9
+1	1	RLL2SRV_IMAX	3000	4
+1	1	RLL2SRV_P	1.000000000000000000	9
+1	1	RLL2SRV_RMAX	120	4
+1	1	RLL2SRV_TCONST	0.379999995231628418	9
+1	1	RNGFND1_ADDR	102	2
+1	1	RNGFND1_FUNCTION	0	2
+1	1	RNGFND1_GNDCLEAR	9	2
+1	1	RNGFND1_MAX_CM	4000	4
+1	1	RNGFND1_MIN_CM	5	4
+1	1	RNGFND1_OFFSET	0.000000000000000000	9
+1	1	RNGFND1_ORIENT	25	2
+1	1	RNGFND1_PIN	-1	2
+1	1	RNGFND1_POS_X	0.000000000000000000	9
+1	1	RNGFND1_POS_Y	0.000000000000000000	9
+1	1	RNGFND1_POS_Z	0.100000001490116119	9
+1	1	RNGFND1_PWRRNG	0	4
+1	1	RNGFND1_RMETRIC	0	2
+1	1	RNGFND1_SCALING	1.000000000000000000	9
+1	1	RNGFND1_STOP_PIN	-1	2
+1	1	RNGFND1_TYPE	7	2
+1	1	RNGFND2_ADDR	0	2
+1	1	RNGFND2_FUNCTION	0	2
+1	1	RNGFND2_GNDCLEAR	9	2
+1	1	RNGFND2_MAX_CM	3000	4
+1	1	RNGFND2_MIN_CM	5	4
+1	1	RNGFND2_OFFSET	0.000000000000000000	9
+1	1	RNGFND2_ORIENT	25	2
+1	1	RNGFND2_PIN	-1	2
+1	1	RNGFND2_POS_X	0.000000000000000000	9
+1	1	RNGFND2_POS_Y	0.000000000000000000	9
+1	1	RNGFND2_POS_Z	0.100000001490116119	9
+1	1	RNGFND2_PWRRNG	0	4
+1	1	RNGFND2_RMETRIC	0	2
+1	1	RNGFND2_SCALING	3.000000000000000000	9
+1	1	RNGFND2_STOP_PIN	-1	2
 1	1	RNGFND2_TYPE	0	2
+1	1	RNGFND3_ADDR	0	2
+1	1	RNGFND3_FUNCTION	0	2
+1	1	RNGFND3_GNDCLEAR	10	2
+1	1	RNGFND3_MAX_CM	700	4
+1	1	RNGFND3_MIN_CM	20	4
+1	1	RNGFND3_OFFSET	0.000000000000000000	9
+1	1	RNGFND3_ORIENT	25	2
+1	1	RNGFND3_PIN	-1	2
+1	1	RNGFND3_POS_X	0.000000000000000000	9
+1	1	RNGFND3_POS_Y	0.000000000000000000	9
+1	1	RNGFND3_POS_Z	0.000000000000000000	9
+1	1	RNGFND3_PWRRNG	0	4
+1	1	RNGFND3_RMETRIC	1	2
+1	1	RNGFND3_SCALING	3.000000000000000000	9
+1	1	RNGFND3_STOP_PIN	-1	2
 1	1	RNGFND3_TYPE	0	2
+1	1	RNGFND4_ADDR	0	2
+1	1	RNGFND4_FUNCTION	0	2
+1	1	RNGFND4_GNDCLEAR	10	2
+1	1	RNGFND4_MAX_CM	700	4
+1	1	RNGFND4_MIN_CM	20	4
+1	1	RNGFND4_OFFSET	0.000000000000000000	9
+1	1	RNGFND4_ORIENT	25	2
+1	1	RNGFND4_PIN	-1	2
+1	1	RNGFND4_POS_X	0.000000000000000000	9
+1	1	RNGFND4_POS_Y	0.000000000000000000	9
+1	1	RNGFND4_POS_Z	0.000000000000000000	9
+1	1	RNGFND4_PWRRNG	0	4
+1	1	RNGFND4_RMETRIC	1	2
+1	1	RNGFND4_SCALING	3.000000000000000000	9
+1	1	RNGFND4_STOP_PIN	-1	2
 1	1	RNGFND4_TYPE	0	2
+1	1	RNGFND5_ADDR	0	2
+1	1	RNGFND5_FUNCTION	0	2
+1	1	RNGFND5_GNDCLEAR	10	2
+1	1	RNGFND5_MAX_CM	700	4
+1	1	RNGFND5_MIN_CM	20	4
+1	1	RNGFND5_OFFSET	0.000000000000000000	9
+1	1	RNGFND5_ORIENT	25	2
+1	1	RNGFND5_PIN	-1	2
+1	1	RNGFND5_POS_X	0.000000000000000000	9
+1	1	RNGFND5_POS_Y	0.000000000000000000	9
+1	1	RNGFND5_POS_Z	0.000000000000000000	9
+1	1	RNGFND5_PWRRNG	0	4
+1	1	RNGFND5_RMETRIC	1	2
+1	1	RNGFND5_SCALING	3.000000000000000000	9
+1	1	RNGFND5_STOP_PIN	-1	2
 1	1	RNGFND5_TYPE	0	2
+1	1	RNGFND6_ADDR	0	2
+1	1	RNGFND6_FUNCTION	0	2
+1	1	RNGFND6_GNDCLEAR	10	2
+1	1	RNGFND6_MAX_CM	700	4
+1	1	RNGFND6_MIN_CM	20	4
+1	1	RNGFND6_OFFSET	0.000000000000000000	9
+1	1	RNGFND6_ORIENT	25	2
+1	1	RNGFND6_PIN	-1	2
+1	1	RNGFND6_POS_X	0.000000000000000000	9
+1	1	RNGFND6_POS_Y	0.000000000000000000	9
+1	1	RNGFND6_POS_Z	0.000000000000000000	9
+1	1	RNGFND6_PWRRNG	0	4
+1	1	RNGFND6_RMETRIC	1	2
+1	1	RNGFND6_SCALING	3.000000000000000000	9
+1	1	RNGFND6_STOP_PIN	-1	2
 1	1	RNGFND6_TYPE	0	2
+1	1	RNGFND7_ADDR	0	2
+1	1	RNGFND7_FUNCTION	0	2
+1	1	RNGFND7_GNDCLEAR	10	2
+1	1	RNGFND7_MAX_CM	700	4
+1	1	RNGFND7_MIN_CM	20	4
+1	1	RNGFND7_OFFSET	0.000000000000000000	9
+1	1	RNGFND7_ORIENT	25	2
+1	1	RNGFND7_PIN	-1	2
+1	1	RNGFND7_POS_X	0.000000000000000000	9
+1	1	RNGFND7_POS_Y	0.000000000000000000	9
+1	1	RNGFND7_POS_Z	0.000000000000000000	9
+1	1	RNGFND7_PWRRNG	0	4
+1	1	RNGFND7_RMETRIC	1	2
+1	1	RNGFND7_SCALING	3.000000000000000000	9
+1	1	RNGFND7_STOP_PIN	-1	2
 1	1	RNGFND7_TYPE	0	2
+1	1	RNGFND8_ADDR	0	2
+1	1	RNGFND8_FUNCTION	0	2
+1	1	RNGFND8_GNDCLEAR	10	2
+1	1	RNGFND8_MAX_CM	700	4
+1	1	RNGFND8_MIN_CM	20	4
+1	1	RNGFND8_OFFSET	0.000000000000000000	9
+1	1	RNGFND8_ORIENT	25	2
+1	1	RNGFND8_PIN	-1	2
+1	1	RNGFND8_POS_X	0.000000000000000000	9
+1	1	RNGFND8_POS_Y	0.000000000000000000	9
+1	1	RNGFND8_POS_Z	0.000000000000000000	9
+1	1	RNGFND8_PWRRNG	0	4
+1	1	RNGFND8_RMETRIC	1	2
+1	1	RNGFND8_SCALING	3.000000000000000000	9
+1	1	RNGFND8_STOP_PIN	-1	2
 1	1	RNGFND8_TYPE	0	2
+1	1	RNGFND9_ADDR	0	2
+1	1	RNGFND9_FUNCTION	0	2
+1	1	RNGFND9_GNDCLEAR	10	2
+1	1	RNGFND9_MAX_CM	700	4
+1	1	RNGFND9_MIN_CM	20	4
+1	1	RNGFND9_OFFSET	0.000000000000000000	9
+1	1	RNGFND9_ORIENT	25	2
+1	1	RNGFND9_PIN	-1	2
+1	1	RNGFND9_POS_X	0.000000000000000000	9
+1	1	RNGFND9_POS_Y	0.000000000000000000	9
+1	1	RNGFND9_POS_Z	0.000000000000000000	9
+1	1	RNGFND9_PWRRNG	0	4
+1	1	RNGFND9_RMETRIC	1	2
+1	1	RNGFND9_SCALING	3.000000000000000000	9
+1	1	RNGFND9_STOP_PIN	-1	2
 1	1	RNGFND9_TYPE	0	2
+1	1	RNGFNDA_ADDR	0	2
+1	1	RNGFNDA_FUNCTION	0	2
+1	1	RNGFNDA_GNDCLEAR	10	2
+1	1	RNGFNDA_MAX_CM	700	4
+1	1	RNGFNDA_MIN_CM	20	4
+1	1	RNGFNDA_OFFSET	0.000000000000000000	9
+1	1	RNGFNDA_ORIENT	25	2
+1	1	RNGFNDA_PIN	-1	2
+1	1	RNGFNDA_POS_X	0.000000000000000000	9
+1	1	RNGFNDA_POS_Y	0.000000000000000000	9
+1	1	RNGFNDA_POS_Z	0.000000000000000000	9
+1	1	RNGFNDA_PWRRNG	0	4
+1	1	RNGFNDA_RMETRIC	1	2
+1	1	RNGFNDA_SCALING	3.000000000000000000	9
+1	1	RNGFNDA_STOP_PIN	-1	2
 1	1	RNGFNDA_TYPE	0	2
-1	1	RNGFND_LANDING	0	2
-1	1	RNGFND_LND_ORNT	25	2
-1	1	ROLL_LIMIT_DEG	65.000000000000000000	9
-1	1	RPM1_TYPE	0	2
+1	1	RNGFND_LANDING	1	2
+1	1	RPM2_PIN	-1	2
+1	1	RPM2_SCALING	1.000000000000000000	9
 1	1	RPM2_TYPE	0	2
-1	1	RSSI_TYPE	0	2
-1	1	RTL_ALTITUDE	100.000000000000000000	9
+1	1	RPM_MAX	100000.000000000000000000	9
+1	1	RPM_MIN	10.000000000000000000	9
+1	1	RPM_MIN_QUAL	0.500000000000000000	9
+1	1	RPM_PIN	54	2
+1	1	RPM_SCALING	1.000000000000000000	9
+1	1	RPM_TYPE	0	2
+1	1	RSSI_ANA_PIN	0	2
+1	1	RSSI_CHANNEL	8	2
+1	1	RSSI_CHAN_HIGH	2000	4
+1	1	RSSI_CHAN_LOW	1000	4
+1	1	RSSI_PIN_HIGH	5.000000000000000000	9
+1	1	RSSI_PIN_LOW	0.000000000000000000	9
+1	1	RSSI_TYPE	3	2
+1	1	RST_MISSION_CH	0	2
+1	1	RST_SWITCH_CH	0	2
 1	1	RTL_AUTOLAND	0	2
 1	1	RTL_CLIMB_MIN	0	4
-1	1	RTL_RADIUS	0	4
+1	1	RTL_RADIUS	65	4
 1	1	RUDDER_ONLY	0	2
 1	1	RUDD_DT_GAIN	10	2
-1	1	SCALING_SPEED	15.000000000000000000	9
+1	1	SCALING_SPEED	14.000000000000000000	9
 1	1	SCHED_DEBUG	0	2
-1	1	SCHED_LOOP_RATE	50	4
-1	1	SCHED_OPTIONS	0	2
-1	1	SCR_ENABLE	0	2
+1	1	SCHED_LOOP_RATE	300	4
+1	1	SCR_DEBUG_LVL	0	2
+1	1	SCR_ENABLE	1	2
+1	1	SCR_HEAP_SIZE	402400	6
+1	1	SCR_VM_I_COUNT	50000	6
 1	1	SERIAL0_BAUD	115	6
 1	1	SERIAL0_PROTOCOL	2	2
-1	1	SERIAL1_BAUD	57	6
+1	1	SERIAL1_BAUD	115	6
 1	1	SERIAL1_OPTIONS	0	4
 1	1	SERIAL1_PROTOCOL	2	2
 1	1	SERIAL2_BAUD	57	6
 1	1	SERIAL2_OPTIONS	0	4
-1	1	SERIAL2_PROTOCOL	2	2
-1	1	SERIAL3_BAUD	230	6
+1	1	SERIAL2_PROTOCOL	1	2
+1	1	SERIAL3_BAUD	115	6
 1	1	SERIAL3_OPTIONS	0	4
-1	1	SERIAL3_PROTOCOL	5	2
-1	1	SERIAL4_BAUD	230	6
+1	1	SERIAL3_PROTOCOL	20	2
+1	1	SERIAL4_BAUD	38	6
 1	1	SERIAL4_OPTIONS	0	4
-1	1	SERIAL4_PROTOCOL	5	2
+1	1	SERIAL4_PROTOCOL	-1	2
 1	1	SERIAL5_BAUD	57	6
 1	1	SERIAL5_OPTIONS	0	4
 1	1	SERIAL5_PROTOCOL	-1	2
 1	1	SERIAL6_BAUD	57	6
 1	1	SERIAL6_OPTIONS	0	4
 1	1	SERIAL6_PROTOCOL	-1	2
-1	1	SERIAL7_BAUD	57	6
-1	1	SERIAL7_OPTIONS	0	4
-1	1	SERIAL7_PROTOCOL	-1	2
-1	1	SERIAL_PASS1	0	2
+1	1	SERIAL_PASS1	-1	2
 1	1	SERIAL_PASS2	-1	2
 1	1	SERIAL_PASSTIMO	15	2
-1	1	SERVO10_FUNCTION	0	4
-1	1	SERVO10_MAX	1900	4
-1	1	SERVO10_MIN	1100	4
+1	1	SERVO10_FUNCTION	33	4
+1	1	SERVO10_MAX	2000	4
+1	1	SERVO10_MIN	1000	4
 1	1	SERVO10_REVERSED	0	2
-1	1	SERVO10_TRIM	1500	4
-1	1	SERVO11_FUNCTION	0	4
-1	1	SERVO11_MAX	1900	4
-1	1	SERVO11_MIN	1100	4
+1	1	SERVO10_TRIM	1000	4
+1	1	SERVO11_FUNCTION	34	4
+1	1	SERVO11_MAX	2000	4
+1	1	SERVO11_MIN	1000	4
 1	1	SERVO11_REVERSED	0	2
-1	1	SERVO11_TRIM	1500	4
+1	1	SERVO11_TRIM	1000	4
 1	1	SERVO12_FUNCTION	0	4
-1	1	SERVO12_MAX	1900	4
-1	1	SERVO12_MIN	1100	4
+1	1	SERVO12_MAX	2000	4
+1	1	SERVO12_MIN	1000	4
 1	1	SERVO12_REVERSED	0	2
-1	1	SERVO12_TRIM	1500	4
-1	1	SERVO13_FUNCTION	0	4
-1	1	SERVO13_MAX	1900	4
-1	1	SERVO13_MIN	1100	4
+1	1	SERVO12_TRIM	1000	4
+1	1	SERVO13_FUNCTION	35	4
+1	1	SERVO13_MAX	2000	4
+1	1	SERVO13_MIN	1000	4
 1	1	SERVO13_REVERSED	0	2
-1	1	SERVO13_TRIM	1500	4
-1	1	SERVO14_FUNCTION	0	4
-1	1	SERVO14_MAX	1900	4
-1	1	SERVO14_MIN	1100	4
+1	1	SERVO13_TRIM	1000	4
+1	1	SERVO14_FUNCTION	36	4
+1	1	SERVO14_MAX	2000	4
+1	1	SERVO14_MIN	1000	4
 1	1	SERVO14_REVERSED	0	2
-1	1	SERVO14_TRIM	1500	4
+1	1	SERVO14_TRIM	1000	4
 1	1	SERVO15_FUNCTION	0	4
-1	1	SERVO15_MAX	1900	4
-1	1	SERVO15_MIN	1100	4
+1	1	SERVO15_MAX	2000	4
+1	1	SERVO15_MIN	1000	4
 1	1	SERVO15_REVERSED	0	2
 1	1	SERVO15_TRIM	1500	4
 1	1	SERVO16_FUNCTION	0	4
-1	1	SERVO16_MAX	1900	4
-1	1	SERVO16_MIN	1100	4
+1	1	SERVO16_MAX	2000	4
+1	1	SERVO16_MIN	1000	4
 1	1	SERVO16_REVERSED	0	2
 1	1	SERVO16_TRIM	1500	4
-1	1	SERVO1_FUNCTION	4	4
-1	1	SERVO1_MAX	1900	4
-1	1	SERVO1_MIN	1100	4
+1	1	SERVO1_FUNCTION	10	4
+1	1	SERVO1_MAX	2100	4
+1	1	SERVO1_MIN	900	4
 1	1	SERVO1_REVERSED	0	2
 1	1	SERVO1_TRIM	1500	4
-1	1	SERVO2_FUNCTION	19	4
-1	1	SERVO2_MAX	1900	4
-1	1	SERVO2_MIN	1100	4
-1	1	SERVO2_REVERSED	0	2
-1	1	SERVO2_TRIM	1500	4
-1	1	SERVO3_FUNCTION	70	4
+1	1	SERVO2_FUNCTION	80	4
+1	1	SERVO2_MAX	1460	4
+1	1	SERVO2_MIN	1200	4
+1	1	SERVO2_REVERSED	1	2
+1	1	SERVO2_TRIM	1350	4
+1	1	SERVO3_FUNCTION	0	4
 1	1	SERVO3_MAX	2000	4
 1	1	SERVO3_MIN	1000	4
 1	1	SERVO3_REVERSED	0	2
-1	1	SERVO3_TRIM	1000	4
-1	1	SERVO4_FUNCTION	21	4
-1	1	SERVO4_MAX	1900	4
-1	1	SERVO4_MIN	1100	4
+1	1	SERVO3_TRIM	1500	4
+1	1	SERVO4_FUNCTION	79	4
+1	1	SERVO4_MAX	1575	4
+1	1	SERVO4_MIN	1330	4
 1	1	SERVO4_REVERSED	0	2
-1	1	SERVO4_TRIM	1500	4
-1	1	SERVO5_FUNCTION	0	4
-1	1	SERVO5_MAX	1900	4
-1	1	SERVO5_MIN	1100	4
+1	1	SERVO4_TRIM	1440	4
+1	1	SERVO5_FUNCTION	24	4
+1	1	SERVO5_MAX	1690	4
+1	1	SERVO5_MIN	1300	4
 1	1	SERVO5_REVERSED	0	2
-1	1	SERVO5_TRIM	1500	4
-1	1	SERVO6_FUNCTION	0	4
-1	1	SERVO6_MAX	1900	4
-1	1	SERVO6_MIN	1100	4
+1	1	SERVO5_TRIM	1550	4
+1	1	SERVO6_FUNCTION	41	4
+1	1	SERVO6_MAX	1990	4
+1	1	SERVO6_MIN	1135	4
 1	1	SERVO6_REVERSED	0	2
-1	1	SERVO6_TRIM	1500	4
+1	1	SERVO6_TRIM	1450	4
 1	1	SERVO7_FUNCTION	0	4
-1	1	SERVO7_MAX	1900	4
-1	1	SERVO7_MIN	1100	4
+1	1	SERVO7_MAX	2000	4
+1	1	SERVO7_MIN	1000	4
 1	1	SERVO7_REVERSED	0	2
 1	1	SERVO7_TRIM	1500	4
 1	1	SERVO8_FUNCTION	0	4
-1	1	SERVO8_MAX	1900	4
-1	1	SERVO8_MIN	1100	4
+1	1	SERVO8_MAX	2000	4
+1	1	SERVO8_MIN	1000	4
 1	1	SERVO8_REVERSED	0	2
 1	1	SERVO8_TRIM	1500	4
 1	1	SERVO9_FUNCTION	0	4
@@ -885,386 +1097,22 @@
 1	1	SERVO9_MIN	1100	4
 1	1	SERVO9_REVERSED	0	2
 1	1	SERVO9_TRIM	1500	4
-1	1	SERVO_32_ENABLE	0	2
 1	1	SERVO_AUTO_TRIM	0	2
-1	1	SERVO_DSHOT_ESC	0	2
-1	1	SERVO_DSHOT_RATE	0	2
-1	1	SERVO_FTW_MASK	0	6
-1	1	SERVO_FTW_POLES	14	2
-1	1	SERVO_FTW_RVMASK	0	6
-1	1	SERVO_GPIO_MASK	0	6
+1	1	SERVO_BLH_AUTO	1	2
+1	1	SERVO_BLH_DEBUG	1	2
+1	1	SERVO_BLH_MASK	0	6
+1	1	SERVO_BLH_OTYPE	0	2
+1	1	SERVO_BLH_POLES	14	2
+1	1	SERVO_BLH_PORT	0	2
+1	1	SERVO_BLH_REMASK	0	6
+1	1	SERVO_BLH_TEST	0	2
+1	1	SERVO_BLH_TMOUT	0	4
+1	1	SERVO_BLH_TRATE	100	4
 1	1	SERVO_RATE	50	4
-1	1	SERVO_RC_FS_MSK	0	6
 1	1	SERVO_ROB_POSMAX	4095	6
 1	1	SERVO_ROB_POSMIN	0	6
 1	1	SERVO_SBUS_RATE	50	4
 1	1	SERVO_VOLZ_MASK	0	6
-1	1	SERVO_VOLZ_RANGE	200	4
-1	1	SID_AXIS	0	2
-1	1	SIM_ACC1_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC1_RND	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC2_RND	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC3_RND	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACCEL1_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL2_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL3_FAIL	0.000000000000000000	9
-1	1	SIM_ACC_FAIL_MSK	0	2
-1	1	SIM_ACC_FILE_RW	0	2
-1	1	SIM_ACC_TRIM_X	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Y	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Z	0.000000000000000000	9
-1	1	SIM_ADSB_ALT	1000.000000000000000000	9
-1	1	SIM_ADSB_COUNT	-1	4
-1	1	SIM_ADSB_RADIUS	10000.000000000000000000	9
-1	1	SIM_ADSB_TX	0	2
-1	1	SIM_ADSB_TYPES	1	2
-1	1	SIM_ARSPD2_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD2_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD2_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD2_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD2_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD2_RND	2.000000000000000000	9
-1	1	SIM_ARSPD2_SIGN	0	2
-1	1	SIM_ARSPD_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD_RND	2.000000000000000000	9
-1	1	SIM_ARSPD_SIGN	0	2
-1	1	SIM_BAR2_DELAY	0	4
-1	1	SIM_BAR2_DISABLE	0	2
-1	1	SIM_BAR2_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR2_FREEZE	0	2
-1	1	SIM_BAR2_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR2_RND	0.200000002980232239	9
-1	1	SIM_BAR2_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_UP	0.000000000000000000	9
-1	1	SIM_BAR3_DELAY	0	4
-1	1	SIM_BAR3_DISABLE	0	2
-1	1	SIM_BAR3_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR3_FREEZE	0	2
-1	1	SIM_BAR3_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR3_RND	0.200000002980232239	9
-1	1	SIM_BAR3_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_UP	0.000000000000000000	9
-1	1	SIM_BARO_COUNT	2	2
-1	1	SIM_BARO_DELAY	0	4
-1	1	SIM_BARO_DISABLE	0	2
-1	1	SIM_BARO_DRIFT	0.000000000000000000	9
-1	1	SIM_BARO_FREEZE	0	2
-1	1	SIM_BARO_GLITCH	0.000000000000000000	9
-1	1	SIM_BARO_RND	0.200000002980232239	9
-1	1	SIM_BARO_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BARO_WCF_DN	0.000000000000000000	9
-1	1	SIM_BARO_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BARO_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_UP	0.000000000000000000	9
-1	1	SIM_BATT_CAP_AH	0.000000000000000000	9
-1	1	SIM_BATT_VOLTAGE	12.600000381469726563	9
-1	1	SIM_BAUDLIMIT_EN	0	2
-1	1	SIM_CAN_SRV_MSK	0	6
-1	1	SIM_CAN_TYPE1	1	2
-1	1	SIM_CAN_TYPE2	1	2
-1	1	SIM_CLAMP_CH	0	2
-1	1	SIM_DRIFT_SPEED	0.050000000745058060	9
-1	1	SIM_DRIFT_TIME	5.000000000000000000	9
-1	1	SIM_EFI_TYPE	0	2
-1	1	SIM_ENGINE_FAIL	0	2
-1	1	SIM_ENGINE_MUL	1.000000000000000000	9
-1	1	SIM_ESC_ARM_RPM	0.000000000000000000	9
-1	1	SIM_ESC_TELEM	1	2
-1	1	SIM_FLOAT_EXCEPT	1	2
-1	1	SIM_FLOW_DELAY	0	2
-1	1	SIM_FLOW_ENABLE	0	2
-1	1	SIM_FLOW_POS_X	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Y	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Z	0.000000000000000000	9
-1	1	SIM_FLOW_RATE	10	4
-1	1	SIM_FLOW_RND	0.050000000745058060	9
-1	1	SIM_FTOWESC_ENA	0	2
-1	1	SIM_FTOWESC_POW	4095	6
-1	1	SIM_GND_BEHAV	-1	2
-1	1	SIM_GPS2_ACC	0.300000011920928955	9
-1	1	SIM_GPS2_ALT_OFS	0	4
-1	1	SIM_GPS2_BYTELOS	0.000000000000000000	9
-1	1	SIM_GPS2_DISABLE	1	2
-1	1	SIM_GPS2_DRFTALT	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_X	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Y	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Z	0.000000000000000000	9
-1	1	SIM_GPS2_HDG	0	2
-1	1	SIM_GPS2_HZ	5	2
-1	1	SIM_GPS2_JAM	0	2
-1	1	SIM_GPS2_LAG_MS	100	4
-1	1	SIM_GPS2_LCKTIME	0	4
-1	1	SIM_GPS2_NOISE	0.000000000000000000	9
-1	1	SIM_GPS2_NUMSATS	10	2
-1	1	SIM_GPS2_POS_X	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS2_TYPE	1	2
-1	1	SIM_GPS2_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Z	0.000000000000000000	9
-1	1	SIM_GPS_ACC	0.300000011920928955	9
-1	1	SIM_GPS_ALT_OFS	0	4
-1	1	SIM_GPS_BYTELOSS	0.000000000000000000	9
-1	1	SIM_GPS_DISABLE	0	2
-1	1	SIM_GPS_DRIFTALT	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_X	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Y	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Z	0.000000000000000000	9
-1	1	SIM_GPS_HDG	0	2
-1	1	SIM_GPS_HZ	5	2
-1	1	SIM_GPS_JAM	0	2
-1	1	SIM_GPS_LAG_MS	100	4
-1	1	SIM_GPS_LOCKTIME	0	4
-1	1	SIM_GPS_LOG_NUM	0	4
-1	1	SIM_GPS_NOISE	0.000000000000000000	9
-1	1	SIM_GPS_NUMSATS	10	2
-1	1	SIM_GPS_POS_X	0.000000000000000000	9
-1	1	SIM_GPS_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS_TYPE	1	2
-1	1	SIM_GPS_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Z	0.000000000000000000	9
-1	1	SIM_GRPE_ENABLE	0	2
-1	1	SIM_GRPE_PIN	-1	2
-1	1	SIM_GRPS_ENABLE	0	2
-1	1	SIM_GRPS_GRAB	2000	4
-1	1	SIM_GRPS_PIN	-1	2
-1	1	SIM_GRPS_RELEASE	1000	4
-1	1	SIM_GRPS_REVERSE	0	2
-1	1	SIM_GYR1_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR1_RND	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR2_RND	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR3_RND	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR_FAIL_MSK	0	2
-1	1	SIM_GYR_FILE_RW	0	2
-1	1	SIM_IE24_ENABLE	0	2
-1	1	SIM_IE24_ERROR	0	6
-1	1	SIM_IE24_STATE	-1	2
-1	1	SIM_IMUT1_ENABLE	0	2
-1	1	SIM_IMUT2_ENABLE	0	2
-1	1	SIM_IMUT3_ENABLE	0	2
-1	1	SIM_IMUT_END	45.000000000000000000	9
-1	1	SIM_IMUT_FIXED	0.000000000000000000	9
-1	1	SIM_IMUT_START	25.000000000000000000	9
-1	1	SIM_IMUT_TCONST	300.000000000000000000	9
-1	1	SIM_IMU_COUNT	2	2
-1	1	SIM_IMU_ORIENT	0	2
-1	1	SIM_IMU_POS_X	0.000000000000000000	9
-1	1	SIM_IMU_POS_Y	0.000000000000000000	9
-1	1	SIM_IMU_POS_Z	0.000000000000000000	9
-1	1	SIM_INIT_ALT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LAT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LON_OFS	0.000000000000000000	9
-1	1	SIM_INS_THR_MIN	0.100000001490116119	9
-1	1	SIM_JSON_MASTER	0	2
-1	1	SIM_LED_LAYOUT	0	2
-1	1	SIM_LOOP_DELAY	0	6
-1	1	SIM_MAG1_DEVID	97539	6
-1	1	SIM_MAG1_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG1_FAIL	0	2
-1	1	SIM_MAG1_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG1_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG1_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG1_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG1_ORIENT	0	2
-1	1	SIM_MAG1_SCALING	1.000000000000000000	9
-1	1	SIM_MAG2_DEVID	131874	6
-1	1	SIM_MAG2_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG2_FAIL	0	2
-1	1	SIM_MAG2_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG2_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG2_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG2_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG2_ORIENT	0	2
-1	1	SIM_MAG2_SCALING	1.000000000000000000	9
-1	1	SIM_MAG3_DEVID	263178	6
-1	1	SIM_MAG3_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG3_FAIL	0	2
-1	1	SIM_MAG3_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG3_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG3_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG3_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG3_ORIENT	0	2
-1	1	SIM_MAG3_SCALING	1.000000000000000000	9
-1	1	SIM_MAG4_DEVID	97283	6
-1	1	SIM_MAG5_DEVID	97795	6
-1	1	SIM_MAG6_DEVID	98051	6
-1	1	SIM_MAG7_DEVID	0	6
-1	1	SIM_MAG8_DEVID	0	6
-1	1	SIM_MAG_ALY_HGT	1.000000000000000000	9
-1	1	SIM_MAG_ALY_X	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Y	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Z	0.000000000000000000	9
-1	1	SIM_MAG_DELAY	0	4
-1	1	SIM_MAG_MOT_X	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Y	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Z	0.000000000000000000	9
-1	1	SIM_MAG_RND	0.000000000000000000	9
-1	1	SIM_MAG_SAVE_IDS	1	2
-1	1	SIM_ODOM_ENABLE	0	2
-1	1	SIM_OH_MASK	0	6
-1	1	SIM_OH_RELAY_MSK	-1	4
-1	1	SIM_OPOS_ALT	584.000000000000000000	9
-1	1	SIM_OPOS_HDG	353.000000000000000000	9
-1	1	SIM_OPOS_LAT	-35.363262176513671875	9
-1	1	SIM_OPOS_LNG	149.165237426757812500	9
-1	1	SIM_PARA_ENABLE	0	2
-1	1	SIM_PARA_PIN	-1	2
-1	1	SIM_PIN_MASK	0	4
-1	1	SIM_PLD_ALT_LMT	15.000000000000000000	9
-1	1	SIM_PLD_DIST_LMT	10.000000000000000000	9
-1	1	SIM_PLD_ENABLE	0	2
-1	1	SIM_PLD_HEIGHT	0.000000000000000000	9
-1	1	SIM_PLD_LAT	0.000000000000000000	9
-1	1	SIM_PLD_LON	0.000000000000000000	9
-1	1	SIM_PLD_OPTIONS	0	2
-1	1	SIM_PLD_ORIENT	24	2
-1	1	SIM_PLD_RATE	100	6
-1	1	SIM_PLD_SHIP	0	2
-1	1	SIM_PLD_TYPE	0	2
-1	1	SIM_PLD_YAW	0	4
-1	1	SIM_RATE_HZ	1200	4
-1	1	SIM_RC_CHANCOUNT	16	2
-1	1	SIM_RC_FAIL	0	2
-1	1	SIM_RICH_CTRL	-1	2
-1	1	SIM_RICH_ENABLE	0	2
-1	1	SIM_SERVO_DELAY	0.000000000000000000	9
-1	1	SIM_SERVO_FILTER	0.000000000000000000	9
-1	1	SIM_SERVO_SPEED	0.140000000596046448	9
-1	1	SIM_SHIP_DSIZE	10.000000000000000000	9
-1	1	SIM_SHIP_ENABLE	0	2
-1	1	SIM_SHIP_OFS_X	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Y	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Z	0.000000000000000000	9
-1	1	SIM_SHIP_PSIZE	1000.000000000000000000	9
-1	1	SIM_SHIP_SPEED	3.000000000000000000	9
-1	1	SIM_SHIP_SYSID	17	2
-1	1	SIM_SHOVE_TIME	0	6
-1	1	SIM_SHOVE_X	0.000000000000000000	9
-1	1	SIM_SHOVE_Y	0.000000000000000000	9
-1	1	SIM_SHOVE_Z	0.000000000000000000	9
-1	1	SIM_SLUP_ENABLE	0	2
-1	1	SIM_SONAR_GLITCH	0.000000000000000000	9
-1	1	SIM_SONAR_POS_X	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Y	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Z	0.000000000000000000	9
-1	1	SIM_SONAR_RND	0.000000000000000000	9
-1	1	SIM_SONAR_ROT	25	2
-1	1	SIM_SONAR_SCALE	12.121199607849121094	9
-1	1	SIM_SPEEDUP	1.000000000000000000	9
-1	1	SIM_SPR_ENABLE	0	2
-1	1	SIM_SPR_PUMP	-1	2
-1	1	SIM_SPR_SPIN	-1	2
-1	1	SIM_TA_ENABLE	1	2
-1	1	SIM_TEMP_BFACTOR	0.000000000000000000	9
-1	1	SIM_TEMP_BRD_OFF	20.000000000000000000	9
-1	1	SIM_TEMP_START	25.000000000000000000	9
-1	1	SIM_TEMP_TCONST	30.000000000000000000	9
-1	1	SIM_TERRAIN	1	2
-1	1	SIM_THML_SCENARI	0	2
-1	1	SIM_TIDE_DIR	0.000000000000000000	9
-1	1	SIM_TIDE_SPEED	0.000000000000000000	9
-1	1	SIM_TIME_JITTER	0	4
-1	1	SIM_TWIST_TIME	0	6
-1	1	SIM_TWIST_X	0.000000000000000000	9
-1	1	SIM_TWIST_Y	0.000000000000000000	9
-1	1	SIM_TWIST_Z	0.000000000000000000	9
-1	1	SIM_UART_LOSS	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_X	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Y	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Z	0.000000000000000000	9
-1	1	SIM_VIB_MOT_HMNC	1	4
-1	1	SIM_VIB_MOT_MASK	0	6
-1	1	SIM_VIB_MOT_MAX	0.000000000000000000	9
-1	1	SIM_VIB_MOT_MULT	1.000000000000000000	9
-1	1	SIM_VICON_FAIL	0	2
-1	1	SIM_VICON_GLIT_X	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Y	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Z	0.000000000000000000	9
-1	1	SIM_VICON_POS_X	0.000000000000000000	9
-1	1	SIM_VICON_POS_Y	0.000000000000000000	9
-1	1	SIM_VICON_POS_Z	0.000000000000000000	9
-1	1	SIM_VICON_TMASK	3	2
-1	1	SIM_VICON_VGLI_X	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Y	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Z	0.000000000000000000	9
-1	1	SIM_VICON_YAW	0	4
-1	1	SIM_VICON_YAWERR	0	4
-1	1	SIM_WAVE_AMP	0.500000000000000000	9
-1	1	SIM_WAVE_DIR	0.000000000000000000	9
-1	1	SIM_WAVE_ENABLE	0	2
-1	1	SIM_WAVE_LENGTH	10.000000000000000000	9
-1	1	SIM_WAVE_SPEED	0.500000000000000000	9
-1	1	SIM_WIND_DIR	180.000000000000000000	9
-1	1	SIM_WIND_DIR_Z	0.000000000000000000	9
-1	1	SIM_WIND_SPD	0.000000000000000000	9
-1	1	SIM_WIND_T	0	2
-1	1	SIM_WIND_TC	5.000000000000000000	9
-1	1	SIM_WIND_TURB	0.000000000000000000	9
-1	1	SIM_WIND_T_ALT	60.000000000000000000	9
-1	1	SIM_WIND_T_COEF	0.009999999776482582	9
-1	1	SIM_WOW_PIN	-1	2
 1	1	SOAR_ENABLE	0	2
 1	1	SR0_ADSB	4	4
 1	1	SR0_EXTRA1	4	4
@@ -1276,26 +1124,26 @@
 1	1	SR0_RAW_CTRL	4	4
 1	1	SR0_RAW_SENS	4	4
 1	1	SR0_RC_CHAN	4	4
-1	1	SR1_ADSB	5	4
-1	1	SR1_EXTRA1	1	4
-1	1	SR1_EXTRA2	1	4
-1	1	SR1_EXTRA3	1	4
-1	1	SR1_EXT_STAT	1	4
+1	1	SR1_ADSB	4	4
+1	1	SR1_EXTRA1	10	4
+1	1	SR1_EXTRA2	10	4
+1	1	SR1_EXTRA3	3	4
+1	1	SR1_EXT_STAT	2	4
 1	1	SR1_PARAMS	10	4
-1	1	SR1_POSITION	1	4
-1	1	SR1_RAW_CTRL	1	4
-1	1	SR1_RAW_SENS	1	4
-1	1	SR1_RC_CHAN	1	4
+1	1	SR1_POSITION	3	4
+1	1	SR1_RAW_CTRL	4	4
+1	1	SR1_RAW_SENS	2	4
+1	1	SR1_RC_CHAN	2	4
 1	1	SR2_ADSB	5	4
-1	1	SR2_EXTRA1	1	4
+1	1	SR2_EXTRA1	2	4
 1	1	SR2_EXTRA2	1	4
-1	1	SR2_EXTRA3	1	4
+1	1	SR2_EXTRA3	2	4
 1	1	SR2_EXT_STAT	1	4
 1	1	SR2_PARAMS	10	4
-1	1	SR2_POSITION	1	4
-1	1	SR2_RAW_CTRL	1	4
-1	1	SR2_RAW_SENS	1	4
-1	1	SR2_RC_CHAN	1	4
+1	1	SR2_POSITION	2	4
+1	1	SR2_RAW_CTRL	2	4
+1	1	SR2_RAW_SENS	2	4
+1	1	SR2_RC_CHAN	2	4
 1	1	SR3_ADSB	5	4
 1	1	SR3_EXTRA1	1	4
 1	1	SR3_EXTRA2	1	4
@@ -1306,42 +1154,12 @@
 1	1	SR3_RAW_CTRL	1	4
 1	1	SR3_RAW_SENS	1	4
 1	1	SR3_RC_CHAN	1	4
-1	1	SR4_ADSB	5	4
-1	1	SR4_EXTRA1	1	4
-1	1	SR4_EXTRA2	1	4
-1	1	SR4_EXTRA3	1	4
-1	1	SR4_EXT_STAT	1	4
-1	1	SR4_PARAMS	10	4
-1	1	SR4_POSITION	1	4
-1	1	SR4_RAW_CTRL	1	4
-1	1	SR4_RAW_SENS	1	4
-1	1	SR4_RC_CHAN	1	4
-1	1	SR5_ADSB	5	4
-1	1	SR5_EXTRA1	1	4
-1	1	SR5_EXTRA2	1	4
-1	1	SR5_EXTRA3	1	4
-1	1	SR5_EXT_STAT	1	4
-1	1	SR5_PARAMS	10	4
-1	1	SR5_POSITION	1	4
-1	1	SR5_RAW_CTRL	1	4
-1	1	SR5_RAW_SENS	1	4
-1	1	SR5_RC_CHAN	1	4
-1	1	SR6_ADSB	5	4
-1	1	SR6_EXTRA1	1	4
-1	1	SR6_EXTRA2	1	4
-1	1	SR6_EXTRA3	1	4
-1	1	SR6_EXT_STAT	1	4
-1	1	SR6_PARAMS	10	4
-1	1	SR6_POSITION	1	4
-1	1	SR6_RAW_CTRL	1	4
-1	1	SR6_RAW_SENS	1	4
-1	1	SR6_RC_CHAN	1	4
-1	1	STAB_PITCH_DOWN	2.000000000000000000	9
+1	1	STAB_PITCH_DOWN	0.000000000000000000	9
 1	1	STALL_PREVENTION	1	2
-1	1	STAT_BOOTCNT	1	4
-1	1	STAT_FLTTIME	0	6
-1	1	STAT_RESET	1	6
-1	1	STAT_RUNTIME	61	6
+1	1	STAT_BOOTCNT	1436	4
+1	1	STAT_FLTTIME	54585	6
+1	1	STAT_RESET	214388672	6
+1	1	STAT_RUNTIME	538390	6
 1	1	STEER2SRV_D	0.004999999888241291	9
 1	1	STEER2SRV_DRTFCT	10.000000000000000000	9
 1	1	STEER2SRV_DRTMIN	4500.000000000000000000	9
@@ -1349,105 +1167,91 @@
 1	1	STEER2SRV_FF	0.000000000000000000	9
 1	1	STEER2SRV_I	0.200000002980232239	9
 1	1	STEER2SRV_IMAX	1500	4
-1	1	STEER2SRV_MINSPD	1.000000000000000000	9
-1	1	STEER2SRV_P	1.799999952316284180	9
+1	1	STEER2SRV_MINSPD	4.000000000000000000	9
+1	1	STEER2SRV_P	0.400000005960464478	9
 1	1	STEER2SRV_TCONST	0.750000000000000000	9
 1	1	STICK_MIXING	1	2
-1	1	SYSID_ENFORCE	0	2
+1	1	SYSID_ENFORCE	1	2
 1	1	SYSID_MYGCS	255	4
 1	1	SYSID_THISMAV	1	4
+1	1	SYS_NUM_RESETS	1408	4
 1	1	TECS_APPR_SMAX	0.000000000000000000	9
-1	1	TECS_CLMB_MAX	5.000000000000000000	9
-1	1	TECS_FLARE_HGT	1.000000000000000000	9
-1	1	TECS_HDEM_TCONST	3.000000000000000000	9
+1	1	TECS_CLMB_MAX	3.000000000000000000	9
 1	1	TECS_HGT_OMEGA	3.000000000000000000	9
 1	1	TECS_INTEG_GAIN	0.300000011920928955	9
-1	1	TECS_LAND_ARSPD	-1.000000000000000000	9
+1	1	TECS_LAND_ARSPD	10.000000000000000000	9
 1	1	TECS_LAND_DAMP	0.500000000000000000	9
 1	1	TECS_LAND_IGAIN	0.000000000000000000	9
 1	1	TECS_LAND_PDAMP	0.000000000000000000	9
 1	1	TECS_LAND_PMAX	10	2
 1	1	TECS_LAND_SINK	0.250000000000000000	9
 1	1	TECS_LAND_SPDWGT	-1.000000000000000000	9
-1	1	TECS_LAND_SRC	0.000000000000000000	9
+1	1	TECS_LAND_SRC	0.200000002980232239	9
 1	1	TECS_LAND_TCONST	2.000000000000000000	9
-1	1	TECS_LAND_TDAMP	0.000000000000000000	9
+1	1	TECS_LAND_TDAMP	0.600000023841857910	9
 1	1	TECS_LAND_THR	-1.000000000000000000	9
 1	1	TECS_OPTIONS	0	6
-1	1	TECS_PITCH_MAX	15	2
-1	1	TECS_PITCH_MIN	0	2
-1	1	TECS_PTCH_DAMP	0.300000011920928955	9
-1	1	TECS_PTCH_FF_K	0.000000000000000000	9
-1	1	TECS_PTCH_FF_V0	12.000000000000000000	9
+1	1	TECS_PITCH_MAX	12	2
+1	1	TECS_PITCH_MIN	-6	2
+1	1	TECS_PTCH_DAMP	0.400000005960464478	9
 1	1	TECS_RLL2THR	10.000000000000000000	9
-1	1	TECS_SINK_MAX	5.000000000000000000	9
-1	1	TECS_SINK_MIN	2.000000000000000000	9
-1	1	TECS_SPDWEIGHT	1.000000000000000000	9
+1	1	TECS_SINK_MAX	3.000000000000000000	9
+1	1	TECS_SINK_MIN	1.500000000000000000	9
+1	1	TECS_SPDWEIGHT	1.250000000000000000	9
 1	1	TECS_SPD_OMEGA	2.000000000000000000	9
 1	1	TECS_SYNAIRSPEED	0	2
-1	1	TECS_THR_DAMP	0.500000000000000000	9
-1	1	TECS_TIME_CONST	5.000000000000000000	9
+1	1	TECS_THR_DAMP	0.349999994039535522	9
+1	1	TECS_TIME_CONST	3.000000000000000000	9
 1	1	TECS_TKOFF_IGAIN	0.000000000000000000	9
 1	1	TECS_VERT_ACC	7.000000000000000000	9
 1	1	TELEM_DELAY	0	2
-1	1	TEMP1_TYPE	0	2
-1	1	TEMP2_TYPE	0	2
-1	1	TEMP3_TYPE	0	2
-1	1	TEMP_LOG	0	2
-1	1	TERRAIN_CACHE_SZ	12	4
 1	1	TERRAIN_ENABLE	1	2
-1	1	TERRAIN_FOLLOW	0	6
+1	1	TERRAIN_FOLLOW	0	2
 1	1	TERRAIN_LOOKAHD	2000	4
-1	1	TERRAIN_MARGIN	0.050000000745058060	9
-1	1	TERRAIN_OFS_MAX	30.000000000000000000	9
 1	1	TERRAIN_OPTIONS	0	4
 1	1	TERRAIN_SPACING	100	4
 1	1	THROTTLE_NUDGE	1	2
 1	1	THR_FAILSAFE	1	2
 1	1	THR_FS_VALUE	950	4
-1	1	THR_MAX	100	2
+1	1	THR_MAX	95	2
 1	1	THR_MIN	0	2
 1	1	THR_PASS_STAB	0	2
 1	1	THR_SLEWRATE	100	2
 1	1	THR_SUPP_MAN	0	2
 1	1	TKOFF_ACCEL_CNT	1	2
-1	1	TKOFF_ALT	50	4
-1	1	TKOFF_DIST	200	4
-1	1	TKOFF_FLAP_PCNT	0	2
-1	1	TKOFF_GND_PITCH	5.000000000000000000	9
-1	1	TKOFF_LVL_ALT	10	4
-1	1	TKOFF_LVL_PITCH	15	2
-1	1	TKOFF_OPTIONS	0	6
+1	1	TKOFF_ALT	10	4
+1	1	TKOFF_DIST	500	4
+1	1	TKOFF_FLAP_PCNT	15	2
+1	1	TKOFF_LVL_ALT	15	4
+1	1	TKOFF_LVL_PITCH	10	2
 1	1	TKOFF_PLIM_SEC	2.000000000000000000	9
 1	1	TKOFF_ROTATE_SPD	0.000000000000000000	9
 1	1	TKOFF_TDRAG_ELEV	0	2
 1	1	TKOFF_TDRAG_SPD1	0.000000000000000000	9
 1	1	TKOFF_THR_DELAY	2	2
 1	1	TKOFF_THR_MAX	0	2
-1	1	TKOFF_THR_MAX_T	4.000000000000000000	9
-1	1	TKOFF_THR_MIN	0	2
 1	1	TKOFF_THR_MINACC	0.000000000000000000	9
 1	1	TKOFF_THR_MINSPD	0.000000000000000000	9
 1	1	TKOFF_THR_SLEW	0	2
 1	1	TKOFF_TIMEOUT	0	2
-1	1	TRIM_THROTTLE	50	2
+1	1	TRIM_ARSPD_CM	1500	6
+1	1	TRIM_AUTO	0	2
+1	1	TRIM_PITCH_CD	0	4
+1	1	TRIM_THROTTLE	65	2
 1	1	TUNE_CHAN	0	2
 1	1	TUNE_CHAN_MAX	2000	4
 1	1	TUNE_CHAN_MIN	1000	4
 1	1	TUNE_ERR_THRESH	0.150000005960464478	9
-1	1	TUNE_MODE_REVERT	1	2
+1	1	TUNE_MODE_REVERT	0	2
 1	1	TUNE_PARAM	0	4
 1	1	TUNE_RANGE	2.000000000000000000	9
 1	1	TUNE_SELECTOR	0	2
-1	1	USE_REV_THRUST	2	6
-1	1	VISO_TYPE	0	2
-1	1	VTX_ENABLE	0	2
+1	1	USE_REV_THRUST	2	4
 1	1	WP_LOITER_RAD	80	4
 1	1	WP_MAX_RADIUS	0	4
-1	1	WP_RADIUS	50	4
-1	1	YAW2SRV_DAMP	0.000000000000000000	9
+1	1	WP_RADIUS	15	4
+1	1	YAW2SRV_DAMP	0.419999986886978149	9
 1	1	YAW2SRV_IMAX	1500	4
-1	1	YAW2SRV_INT	0.000000000000000000	9
+1	1	YAW2SRV_INT	0.200000002980232239	9
 1	1	YAW2SRV_RLL	1.000000000000000000	9
 1	1	YAW2SRV_SLIP	0.000000000000000000	9
-1	1	YAW_RATE_ENABLE	0	2
diff --git a/src/FirmwarePlugin/APM/Rover.OfflineEditing.params b/src/FirmwarePlugin/APM/Rover.OfflineEditing.params
index b7119e3d02d4..5e9dec30bc7c 100644
--- a/src/FirmwarePlugin/APM/Rover.OfflineEditing.params
+++ b/src/FirmwarePlugin/APM/Rover.OfflineEditing.params
@@ -1,18 +1,20 @@
 # Onboard parameters for Vehicle 1
 #
 # Stack: ArduPilot
-# Vehicle: Ground rover
-# Version: 4.6.2 
-# Git Revision: 1ebd4d99
+# Vehicle: Rover
+# Version: 4.0.0 dev
+# Git Revision: b319b27
 #
 # Vehicle-Id Component-Id Name Value Type
 1	1	ACRO_TURN_RATE	180.000000000000000000	9
 1	1	AHRS_COMP_BETA	0.100000001490116119	9
-1	1	AHRS_EKF_TYPE	3	2
+1	1	AHRS_CUSTOM_PIT	0.000000000000000000	9
+1	1	AHRS_CUSTOM_ROLL	0.000000000000000000	9
+1	1	AHRS_CUSTOM_YAW	0.000000000000000000	9
+1	1	AHRS_EKF_TYPE	2	2
 1	1	AHRS_GPS_GAIN	1.000000000000000000	9
 1	1	AHRS_GPS_MINSATS	6	2
 1	1	AHRS_GPS_USE	1	2
-1	1	AHRS_OPTIONS	0	4
 1	1	AHRS_ORIENTATION	0	2
 1	1	AHRS_RP_P	0.200000002980232239	9
 1	1	AHRS_TRIM_X	0.000000000000000000	9
@@ -20,105 +22,61 @@
 1	1	AHRS_TRIM_Z	0.000000000000000000	9
 1	1	AHRS_WIND_MAX	0	2
 1	1	AHRS_YAW_P	0.200000002980232239	9
-1	1	AIS_TYPE	0	2
 1	1	ARMING_ACCTHRESH	0.750000000000000000	9
 1	1	ARMING_CHECK	1	6
-1	1	ARMING_MAGTHRESH	100	4
 1	1	ARMING_MIS_ITEMS	0	6
-1	1	ARMING_OPTIONS	0	6
 1	1	ARMING_REQUIRE	1	2
 1	1	ARMING_RUDDER	2	2
-1	1	ARSPD_ENABLE	0	2
-1	1	ATC_ACCEL_MAX	1.000000000000000000	9
+1	1	ARSPD_TYPE	0	2
+1	1	ATC_ACCEL_MAX	2.000000000000000000	9
 1	1	ATC_BAL_D	0.029999999329447746	9
-1	1	ATC_BAL_D_FF	0.000000000000000000	9
 1	1	ATC_BAL_FF	0.000000000000000000	9
 1	1	ATC_BAL_FLTD	0.000000000000000000	9
 1	1	ATC_BAL_FLTE	10.000000000000000000	9
 1	1	ATC_BAL_FLTT	0.000000000000000000	9
 1	1	ATC_BAL_I	1.500000000000000000	9
 1	1	ATC_BAL_IMAX	1.000000000000000000	9
-1	1	ATC_BAL_LIM_TC	0.500000000000000000	9
-1	1	ATC_BAL_LIM_THR	0.600000023841857910	9
-1	1	ATC_BAL_NEF	0	2
-1	1	ATC_BAL_NTF	0	2
 1	1	ATC_BAL_P	1.799999952316284180	9
-1	1	ATC_BAL_PDMX	0.000000000000000000	9
-1	1	ATC_BAL_PIT_FF	0.400000005960464478	9
-1	1	ATC_BAL_SMAX	0.000000000000000000	9
+1	1	ATC_BAL_SPD_FF	1.000000000000000000	9
 1	1	ATC_BRAKE	1	2
 1	1	ATC_DECEL_MAX	0.000000000000000000	9
 1	1	ATC_SAIL_D	0.000000000000000000	9
-1	1	ATC_SAIL_D_FF	0.000000000000000000	9
 1	1	ATC_SAIL_FF	0.000000000000000000	9
 1	1	ATC_SAIL_FLTD	0.000000000000000000	9
 1	1	ATC_SAIL_FLTE	10.000000000000000000	9
 1	1	ATC_SAIL_FLTT	0.000000000000000000	9
 1	1	ATC_SAIL_I	0.100000001490116119	9
 1	1	ATC_SAIL_IMAX	1.000000000000000000	9
-1	1	ATC_SAIL_NEF	0	2
-1	1	ATC_SAIL_NTF	0	2
 1	1	ATC_SAIL_P	1.000000000000000000	9
-1	1	ATC_SAIL_PDMX	0.000000000000000000	9
-1	1	ATC_SAIL_SMAX	0.000000000000000000	9
 1	1	ATC_SPEED_D	0.000000000000000000	9
-1	1	ATC_SPEED_D_FF	0.000000000000000000	9
 1	1	ATC_SPEED_FF	0.000000000000000000	9
 1	1	ATC_SPEED_FLTD	0.000000000000000000	9
 1	1	ATC_SPEED_FLTE	10.000000000000000000	9
 1	1	ATC_SPEED_FLTT	0.000000000000000000	9
 1	1	ATC_SPEED_I	0.200000002980232239	9
 1	1	ATC_SPEED_IMAX	1.000000000000000000	9
-1	1	ATC_SPEED_NEF	0	2
-1	1	ATC_SPEED_NTF	0	2
-1	1	ATC_SPEED_P	0.100000001490116119	9
-1	1	ATC_SPEED_PDMX	0.000000000000000000	9
-1	1	ATC_SPEED_SMAX	0.000000000000000000	9
+1	1	ATC_SPEED_P	0.200000002980232239	9
 1	1	ATC_STOP_SPEED	0.100000001490116119	9
-1	1	ATC_STR_ACC_MAX	120.000000000000000000	9
-1	1	ATC_STR_ANG_P	2.000000000000000000	9
+1	1	ATC_STR_ACC_MAX	180.000000000000000000	9
+1	1	ATC_STR_ANG_P	2.500000000000000000	9
 1	1	ATC_STR_RAT_D	0.000000000000000000	9
-1	1	ATC_STR_RAT_D_FF	0.000000000000000000	9
-1	1	ATC_STR_RAT_FF	0.750000000000000000	9
+1	1	ATC_STR_RAT_FF	0.200000002980232239	9
 1	1	ATC_STR_RAT_FLTD	0.000000000000000000	9
 1	1	ATC_STR_RAT_FLTE	10.000000000000000000	9
 1	1	ATC_STR_RAT_FLTT	0.000000000000000000	9
 1	1	ATC_STR_RAT_I	0.200000002980232239	9
 1	1	ATC_STR_RAT_IMAX	1.000000000000000000	9
-1	1	ATC_STR_RAT_MAX	120.000000000000000000	9
-1	1	ATC_STR_RAT_NEF	0	2
-1	1	ATC_STR_RAT_NTF	0	2
+1	1	ATC_STR_RAT_MAX	360.000000000000000000	9
 1	1	ATC_STR_RAT_P	0.200000002980232239	9
-1	1	ATC_STR_RAT_PDMX	0.000000000000000000	9
-1	1	ATC_STR_RAT_SMAX	0.000000000000000000	9
-1	1	ATC_TURN_MAX_G	0.600000023841857910	9
 1	1	AUTO_KICKSTART	0.000000000000000000	9
 1	1	AUTO_TRIGGER_PIN	-1	2
-1	1	AVOID_ACCEL_MAX	3.000000000000000000	9
-1	1	AVOID_BACKUP_DZ	0.100000001490116119	9
-1	1	AVOID_BACKUP_SPD	0.750000000000000000	9
-1	1	AVOID_BACKZ_SPD	0.750000000000000000	9
+1	1	AVOID_ANGLE_MAX	1000	4
 1	1	AVOID_BEHAVE	1	2
+1	1	AVOID_DIST_MAX	5.000000000000000000	9
 1	1	AVOID_ENABLE	3	2
 1	1	AVOID_MARGIN	2.000000000000000000	9
-1	1	BAL_PITCH_MAX	10.000000000000000000	9
+1	1	BAL_PITCH_MAX	2.000000000000000000	9
 1	1	BAL_PITCH_TRIM	0.000000000000000000	9
-1	1	BARO1_DEVID	65540	6
-1	1	BARO1_GND_PRESS	101323.500000000000000000	9
-1	1	BARO1_WCF_ENABLE	0	2
-1	1	BARO2_DEVID	65796	6
-1	1	BARO2_GND_PRESS	101323.945312500000000000	9
-1	1	BARO2_WCF_ENABLE	0	2
-1	1	BARO3_DEVID	0	6
-1	1	BARO3_GND_PRESS	0.000000000000000000	9
-1	1	BARO3_WCF_ENABLE	0	2
-1	1	BARO_ALT_OFFSET	0.000000000000000000	9
-1	1	BARO_EXT_BUS	-1	2
-1	1	BARO_FIELD_ELV	0.000000000000000000	9
-1	1	BARO_FLTR_RNG	0	2
-1	1	BARO_GND_TEMP	0.000000000000000000	9
-1	1	BARO_PRIMARY	0	2
-1	1	BARO_PROBE_EXT	0	6
 1	1	BATT2_MONITOR	0	2
 1	1	BATT3_MONITOR	0	2
 1	1	BATT4_MONITOR	0	2
@@ -127,81 +85,83 @@
 1	1	BATT7_MONITOR	0	2
 1	1	BATT8_MONITOR	0	2
 1	1	BATT9_MONITOR	0	2
-1	1	BATT_AMP_OFFSET	0.000000000000000000	9
-1	1	BATT_AMP_PERVLT	17.000000000000000000	9
-1	1	BATT_ARM_MAH	0	6
-1	1	BATT_ARM_VOLT	0.000000000000000000	9
-1	1	BATT_CAPACITY	3300	6
-1	1	BATT_CRT_MAH	0.000000000000000000	9
-1	1	BATT_CRT_VOLT	0.000000000000000000	9
-1	1	BATT_CURR_PIN	12	2
-1	1	BATT_FS_CRT_ACT	0	2
-1	1	BATT_FS_LOW_ACT	0	2
-1	1	BATT_FS_VOLTSRC	0	2
-1	1	BATT_LOW_MAH	0.000000000000000000	9
-1	1	BATT_LOW_TIMER	10	2
-1	1	BATT_LOW_VOLT	0.000000000000000000	9
-1	1	BATT_MONITOR	4	2
-1	1	BATT_OPTIONS	0	6
-1	1	BATT_SERIAL_NUM	-1	6
-1	1	BATT_VLT_OFFSET	0.000000000000000000	9
-1	1	BATT_VOLT_MULT	10.100000381469726563	9
-1	1	BATT_VOLT_PIN	13	2
+1	1	BATT_MONITOR	0	2
+1	1	BCN_ALT	0.000000000000000000	9
+1	1	BCN_LATITUDE	0.000000000000000000	9
+1	1	BCN_LONGITUDE	0.000000000000000000	9
+1	1	BCN_ORIENT_YAW	0	4
 1	1	BCN_TYPE	0	2
+1	1	BRD_ALT_CONFIG	0	2
 1	1	BRD_BOOT_DELAY	0	4
-1	1	BRD_OPTIONS	0	6
+1	1	BRD_IMUHEAT_I	0.070000000298023224	9
+1	1	BRD_IMUHEAT_IMAX	70.000000000000000000	9
+1	1	BRD_IMUHEAT_P	50.000000000000000000	9
+1	1	BRD_IMU_TARGTEMP	45	2
+1	1	BRD_IO_ENABLE	1	2
+1	1	BRD_OPTIONS	1	6
+1	1	BRD_PWM_COUNT	4	2
+1	1	BRD_PWM_VOLT_SEL	0	2
 1	1	BRD_RTC_TYPES	1	2
 1	1	BRD_RTC_TZ_MIN	0	4
+1	1	BRD_SAFETYENABLE	1	2
 1	1	BRD_SAFETYOPTION	7	4
-1	1	BRD_SAFETY_DEFLT	0	2
 1	1	BRD_SAFETY_MASK	0	6
-1	1	BRD_SD_FENCE	0	4
-1	1	BRD_SD_MISSION	0	4
-1	1	BRD_SERIAL_NUM	0	6
+1	1	BRD_SBUS_OUT	0	2
+1	1	BRD_SD_SLOWDOWN	0	2
+1	1	BRD_SER1_RTSCTS	2	2
+1	1	BRD_SER2_RTSCTS	2	2
+1	1	BRD_SERIAL_NUM	0	4
+1	1	BRD_TYPE	3	2
 1	1	BRD_VBUS_MIN	4.300000190734863281	9
 1	1	BRD_VSERVO_MIN	0.000000000000000000	9
 1	1	BTN_ENABLE	0	2
-1	1	CAM1_TYPE	0	2
-1	1	CAM2_TYPE	0	2
 1	1	CAM_AUTO_ONLY	0	2
+1	1	CAM_DURATION	10	2
+1	1	CAM_FEEDBACK_PIN	-1	2
+1	1	CAM_FEEDBACK_POL	1	2
 1	1	CAM_MAX_ROLL	0	4
-1	1	CAM_RC_TYPE	0	2
+1	1	CAM_MIN_INTERVAL	0	4
+1	1	CAM_RELAY_ON	1	2
+1	1	CAM_SERVO_OFF	1100	4
+1	1	CAM_SERVO_ON	1300	4
+1	1	CAM_TRIGG_DIST	0.000000000000000000	9
+1	1	CAM_TRIGG_TYPE	0	2
+1	1	CAM_TYPE	0	2
 1	1	CAN_D1_PROTOCOL	1	2
-1	1	CAN_D1_PROTOCOL2	0	2
 1	1	CAN_D2_PROTOCOL	1	2
-1	1	CAN_D2_PROTOCOL2	0	2
-1	1	CAN_LOGLEVEL	0	2
 1	1	CAN_P1_DRIVER	0	2
 1	1	CAN_P2_DRIVER	0	2
-1	1	CIRC_DIR	0	2
-1	1	CIRC_RADIUS	20.000000000000000000	9
-1	1	CIRC_SPEED	0.000000000000000000	9
+1	1	CAN_SLCAN_CPORT	0	2
+1	1	CAN_SLCAN_SERNUM	-1	2
+1	1	CAN_SLCAN_TIMOUT	0	4
 1	1	COMPASS_AUTODEC	1	2
 1	1	COMPASS_AUTO_ROT	2	2
 1	1	COMPASS_CAL_FIT	16.000000000000000000	9
-1	1	COMPASS_DEC	0.223357245326042175	9
-1	1	COMPASS_DEV_ID	97539	6
-1	1	COMPASS_DEV_ID2	131874	6
-1	1	COMPASS_DEV_ID3	263178	6
-1	1	COMPASS_DEV_ID4	97283	6
-1	1	COMPASS_DEV_ID5	97795	6
-1	1	COMPASS_DEV_ID6	98051	6
+1	1	COMPASS_CUS_PIT	0.000000000000000000	9
+1	1	COMPASS_CUS_ROLL	0.000000000000000000	9
+1	1	COMPASS_CUS_YAW	0.000000000000000000	9
+1	1	COMPASS_DEC	0.000000000000000000	9
+1	1	COMPASS_DEV_ID	590114	6
+1	1	COMPASS_DEV_ID2	0	6
+1	1	COMPASS_DEV_ID3	0	6
+1	1	COMPASS_DEV_ID4	0	6
+1	1	COMPASS_DEV_ID5	0	6
+1	1	COMPASS_DEV_ID6	0	6
 1	1	COMPASS_DEV_ID7	0	6
 1	1	COMPASS_DEV_ID8	0	6
-1	1	COMPASS_DIA2_X	1.000000000000000000	9
-1	1	COMPASS_DIA2_Y	1.000000000000000000	9
-1	1	COMPASS_DIA2_Z	1.000000000000000000	9
-1	1	COMPASS_DIA3_X	1.000000000000000000	9
-1	1	COMPASS_DIA3_Y	1.000000000000000000	9
-1	1	COMPASS_DIA3_Z	1.000000000000000000	9
+1	1	COMPASS_DIA2_X	0.000000000000000000	9
+1	1	COMPASS_DIA2_Y	0.000000000000000000	9
+1	1	COMPASS_DIA2_Z	0.000000000000000000	9
+1	1	COMPASS_DIA3_X	0.000000000000000000	9
+1	1	COMPASS_DIA3_Y	0.000000000000000000	9
+1	1	COMPASS_DIA3_Z	0.000000000000000000	9
 1	1	COMPASS_DIA_X	1.000000000000000000	9
 1	1	COMPASS_DIA_Y	1.000000000000000000	9
 1	1	COMPASS_DIA_Z	1.000000000000000000	9
-1	1	COMPASS_DISBLMSK	0	6
 1	1	COMPASS_ENABLE	1	2
 1	1	COMPASS_EXTERN2	0	2
 1	1	COMPASS_EXTERN3	0	2
-1	1	COMPASS_EXTERNAL	1	2
+1	1	COMPASS_EXTERNAL	0	2
 1	1	COMPASS_FLTR_RNG	0	2
 1	1	COMPASS_LEARN	0	2
 1	1	COMPASS_MOT2_X	0.000000000000000000	9
@@ -224,244 +184,190 @@
 1	1	COMPASS_ODI_Y	0.000000000000000000	9
 1	1	COMPASS_ODI_Z	0.000000000000000000	9
 1	1	COMPASS_OFFS_MAX	1800	4
-1	1	COMPASS_OFS2_X	5.000000000000000000	9
-1	1	COMPASS_OFS2_Y	13.000000000000000000	9
-1	1	COMPASS_OFS2_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS3_X	5.000000000000000000	9
-1	1	COMPASS_OFS3_Y	13.000000000000000000	9
-1	1	COMPASS_OFS3_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS_X	5.000000000000000000	9
-1	1	COMPASS_OFS_Y	13.000000000000000000	9
-1	1	COMPASS_OFS_Z	-18.000000000000000000	9
+1	1	COMPASS_OFS2_X	0.000000000000000000	9
+1	1	COMPASS_OFS2_Y	0.000000000000000000	9
+1	1	COMPASS_OFS2_Z	0.000000000000000000	9
+1	1	COMPASS_OFS3_X	0.000000000000000000	9
+1	1	COMPASS_OFS3_Y	0.000000000000000000	9
+1	1	COMPASS_OFS3_Z	0.000000000000000000	9
+1	1	COMPASS_OFS_X	0.000000000000000000	9
+1	1	COMPASS_OFS_Y	0.000000000000000000	9
+1	1	COMPASS_OFS_Z	0.000000000000000000	9
 1	1	COMPASS_OPTIONS	0	4
 1	1	COMPASS_ORIENT	0	2
 1	1	COMPASS_ORIENT2	0	2
 1	1	COMPASS_ORIENT3	0	2
 1	1	COMPASS_PMOT_EN	0	2
-1	1	COMPASS_PRIO1_ID	97539	6
-1	1	COMPASS_PRIO2_ID	131874	6
-1	1	COMPASS_PRIO3_ID	263178	6
-1	1	COMPASS_SCALE	1.000000000000000000	9
-1	1	COMPASS_SCALE2	1.000000000000000000	9
-1	1	COMPASS_SCALE3	1.000000000000000000	9
+1	1	COMPASS_PRIO1_ID	590114	6
+1	1	COMPASS_PRIO2_ID	0	6
+1	1	COMPASS_PRIO3_ID	0	6
+1	1	COMPASS_SCALE	0.000000000000000000	9
+1	1	COMPASS_SCALE2	0.000000000000000000	9
+1	1	COMPASS_SCALE3	0.000000000000000000	9
+1	1	COMPASS_TYPEMASK	32	6
 1	1	COMPASS_USE	1	2
 1	1	COMPASS_USE2	1	2
 1	1	COMPASS_USE3	1	2
 1	1	CRASH_ANGLE	0	2
-1	1	CRUISE_SPEED	5.000000000000000000	9
-1	1	CRUISE_THROTTLE	30	2
-1	1	CUST_ROT_ENABLE	0	2
-1	1	DID_ENABLE	0	2
-1	1	DOCK_DIR	-1.000000000000000000	9
-1	1	DOCK_HDG_CORR_EN	0	2
-1	1	DOCK_HDG_CORR_WT	0.750000000000000000	9
-1	1	DOCK_SPEED	0.000000000000000000	9
-1	1	DOCK_STOP_DIST	0.300000011920928955	9
-1	1	EAHRS_TYPE	0	2
-1	1	EFI_TYPE	0	2
-1	1	EK2_ENABLE	0	2
-1	1	EK3_ABIAS_P_NSE	0.019999999552965164	9
-1	1	EK3_ACC_BIAS_LIM	1.000000000000000000	9
-1	1	EK3_ACC_P_NSE	0.349999994039535522	9
-1	1	EK3_AFFINITY	0	6
-1	1	EK3_ALT_M_NSE	2.000000000000000000	9
-1	1	EK3_BCN_DELAY	50	2
-1	1	EK3_BCN_I_GTE	500	4
-1	1	EK3_BCN_M_NSE	1.000000000000000000	9
-1	1	EK3_BETA_MASK	0	2
-1	1	EK3_CHECK_SCALE	100	4
-1	1	EK3_DRAG_BCOEF_X	0.000000000000000000	9
-1	1	EK3_DRAG_BCOEF_Y	0.000000000000000000	9
-1	1	EK3_DRAG_MCOEF	0.000000000000000000	9
-1	1	EK3_DRAG_M_NSE	0.500000000000000000	9
-1	1	EK3_EAS_I_GATE	400	4
-1	1	EK3_EAS_M_NSE	1.399999976158142090	9
-1	1	EK3_ENABLE	1	2
-1	1	EK3_ERR_THRESH	0.200000002980232239	9
-1	1	EK3_FLOW_DELAY	10	2
-1	1	EK3_FLOW_I_GATE	300	4
-1	1	EK3_FLOW_M_NSE	0.250000000000000000	9
-1	1	EK3_FLOW_USE	1	2
-1	1	EK3_GBIAS_P_NSE	0.001000000047497451	9
-1	1	EK3_GLITCH_RAD	25	2
-1	1	EK3_GND_EFF_DZ	4.000000000000000000	9
-1	1	EK3_GPS_CHECK	31	2
-1	1	EK3_GPS_VACC_MAX	0.000000000000000000	9
-1	1	EK3_GSF_RST_MAX	2	2
-1	1	EK3_GSF_RUN_MASK	3	2
-1	1	EK3_GSF_USE_MASK	3	2
-1	1	EK3_GYRO_P_NSE	0.014999999664723873	9
-1	1	EK3_HGT_DELAY	60	4
-1	1	EK3_HGT_I_GATE	500	4
-1	1	EK3_HRT_FILT	2.000000000000000000	9
-1	1	EK3_IMU_MASK	3	2
-1	1	EK3_LOG_LEVEL	0	2
-1	1	EK3_MAGB_P_NSE	0.000099999997473788	9
-1	1	EK3_MAGE_P_NSE	0.001000000047497451	9
-1	1	EK3_MAG_CAL	2	2
-1	1	EK3_MAG_EF_LIM	50	4
-1	1	EK3_MAG_I_GATE	300	4
-1	1	EK3_MAG_MASK	0	2
-1	1	EK3_MAG_M_NSE	0.050000000745058060	9
-1	1	EK3_MAX_FLOW	2.500000000000000000	9
-1	1	EK3_NOAID_M_NSE	10.000000000000000000	9
-1	1	EK3_OGNM_TEST_SF	2.000000000000000000	9
-1	1	EK3_OGN_HGT_MASK	0	2
-1	1	EK3_OPTIONS	0	6
-1	1	EK3_POSNE_M_NSE	0.500000000000000000	9
-1	1	EK3_POS_I_GATE	500	4
-1	1	EK3_PRIMARY	0	2
-1	1	EK3_RNG_I_GATE	500	4
-1	1	EK3_RNG_M_NSE	0.500000000000000000	9
-1	1	EK3_RNG_USE_HGT	-1	2
-1	1	EK3_RNG_USE_SPD	2.000000000000000000	9
-1	1	EK3_SRC1_POSXY	3	2
-1	1	EK3_SRC1_POSZ	1	2
-1	1	EK3_SRC1_VELXY	3	2
-1	1	EK3_SRC1_VELZ	3	2
-1	1	EK3_SRC1_YAW	1	2
-1	1	EK3_SRC2_POSXY	0	2
-1	1	EK3_SRC2_POSZ	1	2
-1	1	EK3_SRC2_VELXY	0	2
-1	1	EK3_SRC2_VELZ	0	2
-1	1	EK3_SRC2_YAW	0	2
-1	1	EK3_SRC3_POSXY	0	2
-1	1	EK3_SRC3_POSZ	1	2
-1	1	EK3_SRC3_VELXY	0	2
-1	1	EK3_SRC3_VELZ	0	2
-1	1	EK3_SRC3_YAW	0	2
-1	1	EK3_SRC_OPTIONS	1	4
-1	1	EK3_TAU_OUTPUT	25	2
-1	1	EK3_TERR_GRAD	0.100000001490116119	9
-1	1	EK3_VELD_M_NSE	0.699999988079071045	9
-1	1	EK3_VELNE_M_NSE	0.500000000000000000	9
-1	1	EK3_VEL_I_GATE	500	4
-1	1	EK3_VIS_VERR_MAX	0.899999976158142090	9
-1	1	EK3_VIS_VERR_MIN	0.100000001490116119	9
-1	1	EK3_WENC_VERR	0.100000001490116119	9
-1	1	EK3_WIND_PSCALE	1.000000000000000000	9
-1	1	EK3_WIND_P_NSE	0.100000001490116119	9
-1	1	EK3_YAW_I_GATE	300	4
-1	1	EK3_YAW_M_NSE	0.500000000000000000	9
-1	1	ESC_TLM_MAV_OFS	0	2
+1	1	CRUISE_SPEED	2.000000000000000000	9
+1	1	CRUISE_THROTTLE	50	2
+1	1	EK2_ABIAS_P_NSE	0.004999999888241291	9
+1	1	EK2_ACC_P_NSE	0.600000023841857910	9
+1	1	EK2_ALT_M_NSE	3.000000000000000000	9
+1	1	EK2_ALT_SOURCE	0	2
+1	1	EK2_BCN_DELAY	50	2
+1	1	EK2_BCN_I_GTE	500	4
+1	1	EK2_BCN_M_NSE	1.000000000000000000	9
+1	1	EK2_CHECK_SCALE	100	4
+1	1	EK2_EAS_I_GATE	400	4
+1	1	EK2_EAS_M_NSE	1.399999976158142090	9
+1	1	EK2_ENABLE	1	2
+1	1	EK2_EXTNAV_DELAY	10	2
+1	1	EK2_FLOW_DELAY	10	2
+1	1	EK2_FLOW_I_GATE	300	4
+1	1	EK2_FLOW_M_NSE	0.250000000000000000	9
+1	1	EK2_FLOW_USE	1	2
+1	1	EK2_GBIAS_P_NSE	0.000099999997473788	9
+1	1	EK2_GLITCH_RAD	25	2
+1	1	EK2_GPS_CHECK	31	2
+1	1	EK2_GPS_TYPE	0	2
+1	1	EK2_GSCL_P_NSE	0.000500000023748726	9
+1	1	EK2_GYRO_P_NSE	0.029999999329447746	9
+1	1	EK2_HGT_DELAY	60	4
+1	1	EK2_HGT_I_GATE	500	4
+1	1	EK2_HRT_FILT	2.000000000000000000	9
+1	1	EK2_IMU_MASK	3	2
+1	1	EK2_LOG_MASK	1	2
+1	1	EK2_MAGB_P_NSE	0.000099999997473788	9
+1	1	EK2_MAGE_P_NSE	0.001000000047497451	9
+1	1	EK2_MAG_CAL	2	2
+1	1	EK2_MAG_EF_LIM	50	4
+1	1	EK2_MAG_I_GATE	300	4
+1	1	EK2_MAG_MASK	0	2
+1	1	EK2_MAG_M_NSE	0.050000000745058060	9
+1	1	EK2_MAX_FLOW	2.500000000000000000	9
+1	1	EK2_NOAID_M_NSE	10.000000000000000000	9
+1	1	EK2_OGN_HGT_MASK	0	2
+1	1	EK2_POSNE_M_NSE	1.000000000000000000	9
+1	1	EK2_POS_I_GATE	500	4
+1	1	EK2_RNG_I_GATE	500	4
+1	1	EK2_RNG_M_NSE	0.500000000000000000	9
+1	1	EK2_RNG_USE_HGT	-1	2
+1	1	EK2_RNG_USE_SPD	2.000000000000000000	9
+1	1	EK2_TAU_OUTPUT	25	2
+1	1	EK2_TERR_GRAD	0.100000001490116119	9
+1	1	EK2_VELD_M_NSE	0.699999988079071045	9
+1	1	EK2_VELNE_M_NSE	0.500000000000000000	9
+1	1	EK2_VEL_I_GATE	500	4
+1	1	EK2_WIND_PSCALE	0.500000000000000000	9
+1	1	EK2_WIND_P_NSE	0.100000001490116119	9
+1	1	EK2_YAW_I_GATE	300	4
+1	1	EK2_YAW_M_NSE	0.500000000000000000	9
+1	1	EK3_ENABLE	0	2
 1	1	FENCE_ACTION	1	2
 1	1	FENCE_ENABLE	0	2
 1	1	FENCE_MARGIN	2.000000000000000000	9
 1	1	FENCE_RADIUS	300.000000000000000000	9
 1	1	FENCE_TOTAL	0	2
 1	1	FENCE_TYPE	6	2
-1	1	FFT_ENABLE	0	2
-1	1	FILT1_TYPE	0	2
-1	1	FILT2_TYPE	0	2
-1	1	FILT3_TYPE	0	2
-1	1	FILT4_TYPE	0	2
-1	1	FILT5_TYPE	0	2
-1	1	FILT6_TYPE	0	2
-1	1	FILT7_TYPE	0	2
-1	1	FILT8_TYPE	0	2
-1	1	FLOW_TYPE	0	2
-1	1	FLTMODE_GCSBLOCK	0	6
 1	1	FOLL_ENABLE	0	2
 1	1	FORMAT_VERSION	16	4
 1	1	FRAME_CLASS	1	2
 1	1	FRAME_TYPE	0	2
-1	1	FRSKY_DNLINK1_ID	20	2
-1	1	FRSKY_DNLINK2_ID	7	2
-1	1	FRSKY_DNLINK_ID	27	2
-1	1	FRSKY_OPTIONS	0	2
-1	1	FRSKY_UPLINK_ID	13	2
 1	1	FS_ACTION	2	2
 1	1	FS_CRASH_CHECK	0	2
 1	1	FS_EKF_ACTION	1	2
 1	1	FS_EKF_THRESH	0.800000011920928955	9
 1	1	FS_GCS_ENABLE	0	2
-1	1	FS_GCS_TIMEOUT	5.000000000000000000	9
 1	1	FS_OPTIONS	0	6
 1	1	FS_THR_ENABLE	1	2
 1	1	FS_THR_VALUE	910	4
 1	1	FS_TIMEOUT	1.500000000000000000	9
 1	1	GCS_PID_MASK	0	4
-1	1	GEN_TYPE	0	2
-1	1	GPS1_CAN_NODEID	0	6
-1	1	GPS1_CAN_OVRIDE	0	6
-1	1	GPS1_COM_PORT	1	2
-1	1	GPS1_DELAY_MS	0	4
-1	1	GPS1_GNSS_MODE	0	2
-1	1	GPS1_MB_TYPE	0	2
-1	1	GPS1_POS_X	0.000000000000000000	9
-1	1	GPS1_POS_Y	0.000000000000000000	9
-1	1	GPS1_POS_Z	0.000000000000000000	9
-1	1	GPS1_RATE_MS	200	4
-1	1	GPS1_TYPE	1	2
-1	1	GPS2_TYPE	0	2
+1	1	GND_ABS_PRESS	85525.578125000000000000	9
+1	1	GND_ABS_PRESS2	85537.359375000000000000	9
+1	1	GND_ABS_PRESS3	0.000000000000000000	9
+1	1	GND_ALT_OFFSET	0.000000000000000000	9
+1	1	GND_EXT_BUS	-1	2
+1	1	GND_FLTR_RNG	0	2
+1	1	GND_PRIMARY	0	2
+1	1	GND_PROBE_EXT	0	6
+1	1	GND_TEMP	0.000000000000000000	9
 1	1	GPS_AUTO_CONFIG	1	2
 1	1	GPS_AUTO_SWITCH	1	2
 1	1	GPS_BLEND_MASK	5	2
+1	1	GPS_BLEND_TC	10.000000000000000000	9
+1	1	GPS_DELAY_MS	0	4
+1	1	GPS_DELAY_MS2	0	4
 1	1	GPS_DRV_OPTIONS	0	4
+1	1	GPS_GNSS_MODE	0	2
+1	1	GPS_GNSS_MODE2	0	2
 1	1	GPS_INJECT_TO	127	2
+1	1	GPS_MIN_DGPS	100	2
 1	1	GPS_MIN_ELEV	-100	2
 1	1	GPS_NAVFILTER	8	2
-1	1	GPS_PRIMARY	0	2
+1	1	GPS_POS1_X	0.000000000000000000	9
+1	1	GPS_POS1_Y	0.000000000000000000	9
+1	1	GPS_POS1_Z	0.000000000000000000	9
+1	1	GPS_POS2_X	0.000000000000000000	9
+1	1	GPS_POS2_Y	0.000000000000000000	9
+1	1	GPS_POS2_Z	0.000000000000000000	9
+1	1	GPS_RATE_MS	200	4
+1	1	GPS_RATE_MS2	200	4
 1	1	GPS_RAW_DATA	0	2
 1	1	GPS_SAVE_CFG	2	2
 1	1	GPS_SBAS_MODE	2	2
 1	1	GPS_SBP_LOGMASK	-256	4
+1	1	GPS_TYPE	1	2
+1	1	GPS_TYPE2	0	2
 1	1	GRIP_ENABLE	0	2
-1	1	GUID_OPTIONS	0	6
 1	1	INITIAL_MODE	0	2
-1	1	INS_ACC1_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2OFFS_X	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Y	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Z	0.001000000047497451	9
-1	1	INS_ACC2SCAL_X	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Y	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Z	1.001000046730041504	9
-1	1	INS_ACC2_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2_ID	2753036	6
+1	1	INS_ACC2OFFS_X	0.000000000000000000	9
+1	1	INS_ACC2OFFS_Y	0.000000000000000000	9
+1	1	INS_ACC2OFFS_Z	0.000000000000000000	9
+1	1	INS_ACC2SCAL_X	1.000000000000000000	9
+1	1	INS_ACC2SCAL_Y	1.000000000000000000	9
+1	1	INS_ACC2SCAL_Z	1.000000000000000000	9
+1	1	INS_ACC2_ID	2883874	6
 1	1	INS_ACC3OFFS_X	0.000000000000000000	9
 1	1	INS_ACC3OFFS_Y	0.000000000000000000	9
 1	1	INS_ACC3OFFS_Z	0.000000000000000000	9
 1	1	INS_ACC3SCAL_X	1.000000000000000000	9
 1	1	INS_ACC3SCAL_Y	1.000000000000000000	9
 1	1	INS_ACC3SCAL_Z	1.000000000000000000	9
-1	1	INS_ACC3_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC3_ID	0	6
+1	1	INS_ACC3_ID	3015690	6
 1	1	INS_ACCEL_FILTER	10	4
-1	1	INS_ACCOFFS_X	0.001000000047497451	9
-1	1	INS_ACCOFFS_Y	0.001000000047497451	9
-1	1	INS_ACCOFFS_Z	0.001000000047497451	9
-1	1	INS_ACCSCAL_X	1.001000046730041504	9
-1	1	INS_ACCSCAL_Y	1.001000046730041504	9
-1	1	INS_ACCSCAL_Z	1.001000046730041504	9
+1	1	INS_ACCOFFS_X	0.000000000000000000	9
+1	1	INS_ACCOFFS_Y	0.000000000000000000	9
+1	1	INS_ACCOFFS_Z	0.000000000000000000	9
+1	1	INS_ACCSCAL_X	1.000000000000000000	9
+1	1	INS_ACCSCAL_Y	1.000000000000000000	9
+1	1	INS_ACCSCAL_Z	1.000000000000000000	9
 1	1	INS_ACC_BODYFIX	2	2
-1	1	INS_ACC_ID	2753028	6
+1	1	INS_ACC_ID	3081250	6
 1	1	INS_ENABLE_MASK	127	2
-1	1	INS_FAST_SAMPLE	1	2
-1	1	INS_GYR1_CALTEMP	25.018352508544921875	9
-1	1	INS_GYR2OFFS_X	-0.000019538194464985	9
-1	1	INS_GYR2OFFS_Y	0.000107690095319413	9
-1	1	INS_GYR2OFFS_Z	0.000016318013877026	9
-1	1	INS_GYR2_CALTEMP	25.018352508544921875	9
-1	1	INS_GYR2_ID	2752780	6
-1	1	INS_GYR3OFFS_X	0.000000000000000000	9
-1	1	INS_GYR3OFFS_Y	0.000000000000000000	9
-1	1	INS_GYR3OFFS_Z	0.000000000000000000	9
-1	1	INS_GYR3_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR3_ID	0	6
-1	1	INS_GYROFFS_X	-0.000007733098755125	9
-1	1	INS_GYROFFS_Y	0.000048677153245080	9
-1	1	INS_GYROFFS_Z	0.000043519139580894	9
+1	1	INS_FAST_SAMPLE	7	2
+1	1	INS_GYR2OFFS_X	0.001012568362057209	9
+1	1	INS_GYR2OFFS_Y	-0.013606202788650990	9
+1	1	INS_GYR2OFFS_Z	0.016851436346769333	9
+1	1	INS_GYR2_ID	2883874	6
+1	1	INS_GYR3OFFS_X	-0.014680972322821617	9
+1	1	INS_GYR3OFFS_Y	-0.000609529088251293	9
+1	1	INS_GYR3OFFS_Z	0.013640789315104485	9
+1	1	INS_GYR3_ID	3015690	6
+1	1	INS_GYROFFS_X	0.020715419203042984	9
+1	1	INS_GYROFFS_Y	-0.024957574903964996	9
+1	1	INS_GYROFFS_Z	0.019266281276941299	9
 1	1	INS_GYRO_FILTER	4	4
-1	1	INS_GYRO_RATE	0	2
 1	1	INS_GYR_CAL	1	2
-1	1	INS_GYR_ID	2752772	6
-1	1	INS_HNTC2_ENABLE	0	2
+1	1	INS_GYR_ID	3081250	6
 1	1	INS_HNTCH_ENABLE	0	2
 1	1	INS_LOG_BAT_CNT	1024	4
 1	1	INS_LOG_BAT_LGCT	32	4
 1	1	INS_LOG_BAT_LGIN	20	2
-1	1	INS_LOG_BAT_MASK	127	2
+1	1	INS_LOG_BAT_MASK	0	2
 1	1	INS_LOG_BAT_OPT	0	2
+1	1	INS_NOTCH_ENABLE	0	2
 1	1	INS_POS1_X	0.000000000000000000	9
 1	1	INS_POS1_Y	0.000000000000000000	9
 1	1	INS_POS1_Z	0.000000000000000000	9
@@ -471,47 +377,54 @@
 1	1	INS_POS3_X	0.000000000000000000	9
 1	1	INS_POS3_Y	0.000000000000000000	9
 1	1	INS_POS3_Z	0.000000000000000000	9
-1	1	INS_RAW_LOG_OPT	0	4
 1	1	INS_STILL_THRESH	0.100000001490116119	9
-1	1	INS_TCAL1_ENABLE	0	2
-1	1	INS_TCAL2_ENABLE	0	2
-1	1	INS_TCAL3_ENABLE	0	2
-1	1	INS_TCAL_OPTIONS	0	6
 1	1	INS_TRIM_OPTION	1	2
 1	1	INS_USE	1	2
 1	1	INS_USE2	1	2
 1	1	INS_USE3	1	2
-1	1	KDE_NPOLE	14	2
 1	1	LOG_BACKEND_TYPE	1	2
 1	1	LOG_BITMASK	65535	6
-1	1	LOG_BLK_RATEMAX	0.000000000000000000	9
-1	1	LOG_DARM_RATEMAX	0.000000000000000000	9
 1	1	LOG_DISARMED	0	2
-1	1	LOG_FILE_BUFSIZE	200	4
+1	1	LOG_FILE_BUFSIZE	50	2
 1	1	LOG_FILE_DSRMROT	0	2
-1	1	LOG_FILE_MB_FREE	500	4
-1	1	LOG_FILE_RATEMAX	0.000000000000000000	9
 1	1	LOG_FILE_TIMEOUT	5	4
 1	1	LOG_MAV_BUFSIZE	8	2
-1	1	LOG_MAV_RATEMAX	0.000000000000000000	9
-1	1	LOG_MAX_FILES	500	4
 1	1	LOG_REPLAY	0	2
 1	1	LOIT_RADIUS	2.000000000000000000	9
 1	1	LOIT_SPEED_GAIN	0.500000000000000000	9
 1	1	LOIT_TYPE	0	2
-1	1	MANUAL_OPTIONS	0	6
-1	1	MANUAL_STR_EXPO	0.000000000000000000	9
 1	1	MIS_DONE_BEHAVE	0	2
 1	1	MIS_OPTIONS	0	4
 1	1	MIS_RESTART	0	2
 1	1	MIS_TOTAL	0	4
-1	1	MNT1_TYPE	0	2
-1	1	MNT2_TYPE	0	2
+1	1	MNT_ANGMAX_PAN	4500	4
+1	1	MNT_ANGMAX_ROL	4500	4
+1	1	MNT_ANGMAX_TIL	4500	4
+1	1	MNT_ANGMIN_PAN	-4500	4
+1	1	MNT_ANGMIN_ROL	-4500	4
+1	1	MNT_ANGMIN_TIL	-4500	4
+1	1	MNT_DEFLT_MODE	3	2
+1	1	MNT_JSTICK_SPD	0	2
+1	1	MNT_LEAD_PTCH	0.000000000000000000	9
+1	1	MNT_LEAD_RLL	0.000000000000000000	9
+1	1	MNT_NEUTRAL_X	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Y	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Z	0.000000000000000000	9
+1	1	MNT_RC_IN_PAN	0	2
+1	1	MNT_RC_IN_ROLL	0	2
+1	1	MNT_RC_IN_TILT	0	2
+1	1	MNT_RETRACT_X	0.000000000000000000	9
+1	1	MNT_RETRACT_Y	0.000000000000000000	9
+1	1	MNT_RETRACT_Z	0.000000000000000000	9
+1	1	MNT_STAB_PAN	0	2
+1	1	MNT_STAB_ROLL	0	2
+1	1	MNT_STAB_TILT	0	2
+1	1	MNT_TYPE	0	2
 1	1	MODE1	0	2
 1	1	MODE2	0	2
-1	1	MODE3	11	2
-1	1	MODE4	10	2
-1	1	MODE5	2	2
+1	1	MODE3	0	2
+1	1	MODE4	0	2
+1	1	MODE5	0	2
 1	1	MODE6	0	2
 1	1	MODE_CH	8	2
 1	1	MOT_PWM_FREQ	16	2
@@ -519,49 +432,40 @@
 1	1	MOT_SAFE_DISARM	0	2
 1	1	MOT_SLEWRATE	100	4
 1	1	MOT_SPD_SCA_BASE	1.000000000000000000	9
-1	1	MOT_STR_THR_MIX	0.500000000000000000	9
 1	1	MOT_THR_MAX	100	2
 1	1	MOT_THR_MIN	0	2
-1	1	MOT_THST_ASYM	1.000000000000000000	9
 1	1	MOT_THST_EXPO	0.000000000000000000	9
-1	1	MOT_VEC_ANGLEMAX	0.000000000000000000	9
-1	1	MSP_OPTIONS	0	2
-1	1	MSP_OSD_NCELLS	0	2
-1	1	NET_ENABLE	0	2
-1	1	NET_P1_TYPE	0	2
-1	1	NET_P2_TYPE	0	2
-1	1	NET_P3_TYPE	0	2
-1	1	NET_P4_TYPE	0	2
-1	1	NMEA_MSG_EN	3	4
-1	1	NMEA_RATE_MS	100	4
+1	1	MOT_VEC_THR_BASE	0.000000000000000000	9
+1	1	NAVL1_DAMPING	0.750000000000000000	9
+1	1	NAVL1_PERIOD	8.000000000000000000	9
+1	1	NAVL1_XTRACK_I	0.019999999552965164	9
+1	1	NTF_BUZZ_ENABLE	1	2
 1	1	NTF_BUZZ_ON_LVL	1	2
-1	1	NTF_BUZZ_PIN	-1	2
-1	1	NTF_BUZZ_TYPES	5	2
+1	1	NTF_BUZZ_PIN	0	2
 1	1	NTF_BUZZ_VOLUME	100	2
 1	1	NTF_DISPLAY_TYPE	0	2
 1	1	NTF_LED_BRIGHT	3	2
 1	1	NTF_LED_LEN	1	2
 1	1	NTF_LED_OVERRIDE	0	2
-1	1	NTF_LED_TYPES	123079	6
+1	1	NTF_LED_TYPES	199	6
+1	1	NTF_OREO_THEME	0	2
 1	1	OA_TYPE	0	2
-1	1	OSD_TYPE	0	2
 1	1	PILOT_STEER_TYPE	0	2
-1	1	PLND_ENABLED	0	2
-1	1	PRX1_TYPE	0	2
-1	1	PRX2_TYPE	0	2
-1	1	PRX3_TYPE	0	2
-1	1	PRX4_TYPE	0	2
-1	1	PRX5_TYPE	0	2
-1	1	PRX_FILT	0.250000000000000000	9
-1	1	PRX_LOG_RAW	0	2
-1	1	PSC_POS_P	0.200000002980232239	9
-1	1	PSC_VEL_D	0.000000000000000000	9
-1	1	PSC_VEL_FF	0.000000000000000000	9
-1	1	PSC_VEL_FLTD	5.000000000000000000	9
-1	1	PSC_VEL_FLTE	5.000000000000000000	9
-1	1	PSC_VEL_I	0.000000000000000000	9
-1	1	PSC_VEL_IMAX	1.000000000000000000	9
-1	1	PSC_VEL_P	1.000000000000000000	9
+1	1	PRX_IGN_ANG1	0	4
+1	1	PRX_IGN_ANG2	0	4
+1	1	PRX_IGN_ANG3	0	4
+1	1	PRX_IGN_ANG4	0	4
+1	1	PRX_IGN_ANG5	0	4
+1	1	PRX_IGN_ANG6	0	4
+1	1	PRX_IGN_WID1	0	2
+1	1	PRX_IGN_WID2	0	2
+1	1	PRX_IGN_WID3	0	2
+1	1	PRX_IGN_WID4	0	2
+1	1	PRX_IGN_WID5	0	2
+1	1	PRX_IGN_WID6	0	2
+1	1	PRX_ORIENT	0	2
+1	1	PRX_TYPE	0	2
+1	1	PRX_YAW_CORR	0	4
 1	1	RALLY_INCL_HOME	1	2
 1	1	RALLY_LIMIT_KM	0.500000000000000000	9
 1	1	RALLY_TOTAL	0	2
@@ -608,8 +512,8 @@
 1	1	RC16_REVERSED	0	2
 1	1	RC16_TRIM	1500	4
 1	1	RC1_DZ	30	4
-1	1	RC1_MAX	2000	4
-1	1	RC1_MIN	1000	4
+1	1	RC1_MAX	1900	4
+1	1	RC1_MIN	1100	4
 1	1	RC1_OPTION	0	4
 1	1	RC1_REVERSED	0	2
 1	1	RC1_TRIM	1500	4
@@ -620,8 +524,8 @@
 1	1	RC2_REVERSED	0	2
 1	1	RC2_TRIM	1500	4
 1	1	RC3_DZ	30	4
-1	1	RC3_MAX	2000	4
-1	1	RC3_MIN	1000	4
+1	1	RC3_MAX	1900	4
+1	1	RC3_MIN	1100	4
 1	1	RC3_OPTION	0	4
 1	1	RC3_REVERSED	0	2
 1	1	RC3_TRIM	1500	4
@@ -665,64 +569,211 @@
 1	1	RCMAP_ROLL	1	2
 1	1	RCMAP_THROTTLE	3	2
 1	1	RCMAP_YAW	4	2
-1	1	RC_OPTIONS	32	6
+1	1	RC_OPTIONS	0	6
 1	1	RC_OVERRIDE_TIME	3.000000000000000000	9
-1	1	RC_PROTOCOLS	1	6
-1	1	RELAY1_DEFAULT	0	2
-1	1	RELAY1_FUNCTION	1	2
-1	1	RELAY1_INVERTED	0	2
-1	1	RELAY1_PIN	1	4
-1	1	RELAY2_DEFAULT	0	2
-1	1	RELAY2_FUNCTION	1	2
-1	1	RELAY2_INVERTED	0	2
-1	1	RELAY2_PIN	2	4
-1	1	RELAY3_FUNCTION	0	2
-1	1	RELAY4_FUNCTION	0	2
-1	1	RELAY5_FUNCTION	0	2
-1	1	RELAY6_FUNCTION	0	2
+1	1	RELAY_DEFAULT	0	2
+1	1	RELAY_PIN	54	2
+1	1	RELAY_PIN2	55	2
+1	1	RELAY_PIN3	-1	2
+1	1	RELAY_PIN4	-1	2
+1	1	RELAY_PIN5	-1	2
+1	1	RELAY_PIN6	-1	2
+1	1	RNGFND1_ADDR	0	2
+1	1	RNGFND1_FUNCTION	0	2
+1	1	RNGFND1_GNDCLEAR	10	2
+1	1	RNGFND1_MAX_CM	700	4
+1	1	RNGFND1_MIN_CM	20	4
+1	1	RNGFND1_OFFSET	0.000000000000000000	9
+1	1	RNGFND1_ORIENT	0	2
+1	1	RNGFND1_PIN	-1	2
+1	1	RNGFND1_POS_X	0.000000000000000000	9
+1	1	RNGFND1_POS_Y	0.000000000000000000	9
+1	1	RNGFND1_POS_Z	0.000000000000000000	9
+1	1	RNGFND1_PWRRNG	0	4
+1	1	RNGFND1_RMETRIC	1	2
+1	1	RNGFND1_SCALING	3.000000000000000000	9
+1	1	RNGFND1_STOP_PIN	-1	2
 1	1	RNGFND1_TYPE	0	2
+1	1	RNGFND2_ADDR	0	2
+1	1	RNGFND2_FUNCTION	0	2
+1	1	RNGFND2_GNDCLEAR	10	2
+1	1	RNGFND2_MAX_CM	700	4
+1	1	RNGFND2_MIN_CM	20	4
+1	1	RNGFND2_OFFSET	0.000000000000000000	9
+1	1	RNGFND2_ORIENT	0	2
+1	1	RNGFND2_PIN	-1	2
+1	1	RNGFND2_POS_X	0.000000000000000000	9
+1	1	RNGFND2_POS_Y	0.000000000000000000	9
+1	1	RNGFND2_POS_Z	0.000000000000000000	9
+1	1	RNGFND2_PWRRNG	0	4
+1	1	RNGFND2_RMETRIC	1	2
+1	1	RNGFND2_SCALING	3.000000000000000000	9
+1	1	RNGFND2_STOP_PIN	-1	2
 1	1	RNGFND2_TYPE	0	2
+1	1	RNGFND3_ADDR	0	2
+1	1	RNGFND3_FUNCTION	0	2
+1	1	RNGFND3_GNDCLEAR	10	2
+1	1	RNGFND3_MAX_CM	700	4
+1	1	RNGFND3_MIN_CM	20	4
+1	1	RNGFND3_OFFSET	0.000000000000000000	9
+1	1	RNGFND3_ORIENT	0	2
+1	1	RNGFND3_PIN	-1	2
+1	1	RNGFND3_POS_X	0.000000000000000000	9
+1	1	RNGFND3_POS_Y	0.000000000000000000	9
+1	1	RNGFND3_POS_Z	0.000000000000000000	9
+1	1	RNGFND3_PWRRNG	0	4
+1	1	RNGFND3_RMETRIC	1	2
+1	1	RNGFND3_SCALING	3.000000000000000000	9
+1	1	RNGFND3_STOP_PIN	-1	2
 1	1	RNGFND3_TYPE	0	2
+1	1	RNGFND4_ADDR	0	2
+1	1	RNGFND4_FUNCTION	0	2
+1	1	RNGFND4_GNDCLEAR	10	2
+1	1	RNGFND4_MAX_CM	700	4
+1	1	RNGFND4_MIN_CM	20	4
+1	1	RNGFND4_OFFSET	0.000000000000000000	9
+1	1	RNGFND4_ORIENT	0	2
+1	1	RNGFND4_PIN	-1	2
+1	1	RNGFND4_POS_X	0.000000000000000000	9
+1	1	RNGFND4_POS_Y	0.000000000000000000	9
+1	1	RNGFND4_POS_Z	0.000000000000000000	9
+1	1	RNGFND4_PWRRNG	0	4
+1	1	RNGFND4_RMETRIC	1	2
+1	1	RNGFND4_SCALING	3.000000000000000000	9
+1	1	RNGFND4_STOP_PIN	-1	2
 1	1	RNGFND4_TYPE	0	2
+1	1	RNGFND5_ADDR	0	2
+1	1	RNGFND5_FUNCTION	0	2
+1	1	RNGFND5_GNDCLEAR	10	2
+1	1	RNGFND5_MAX_CM	700	4
+1	1	RNGFND5_MIN_CM	20	4
+1	1	RNGFND5_OFFSET	0.000000000000000000	9
+1	1	RNGFND5_ORIENT	0	2
+1	1	RNGFND5_PIN	-1	2
+1	1	RNGFND5_POS_X	0.000000000000000000	9
+1	1	RNGFND5_POS_Y	0.000000000000000000	9
+1	1	RNGFND5_POS_Z	0.000000000000000000	9
+1	1	RNGFND5_PWRRNG	0	4
+1	1	RNGFND5_RMETRIC	1	2
+1	1	RNGFND5_SCALING	3.000000000000000000	9
+1	1	RNGFND5_STOP_PIN	-1	2
 1	1	RNGFND5_TYPE	0	2
+1	1	RNGFND6_ADDR	0	2
+1	1	RNGFND6_FUNCTION	0	2
+1	1	RNGFND6_GNDCLEAR	10	2
+1	1	RNGFND6_MAX_CM	700	4
+1	1	RNGFND6_MIN_CM	20	4
+1	1	RNGFND6_OFFSET	0.000000000000000000	9
+1	1	RNGFND6_ORIENT	0	2
+1	1	RNGFND6_PIN	-1	2
+1	1	RNGFND6_POS_X	0.000000000000000000	9
+1	1	RNGFND6_POS_Y	0.000000000000000000	9
+1	1	RNGFND6_POS_Z	0.000000000000000000	9
+1	1	RNGFND6_PWRRNG	0	4
+1	1	RNGFND6_RMETRIC	1	2
+1	1	RNGFND6_SCALING	3.000000000000000000	9
+1	1	RNGFND6_STOP_PIN	-1	2
 1	1	RNGFND6_TYPE	0	2
+1	1	RNGFND7_ADDR	0	2
+1	1	RNGFND7_FUNCTION	0	2
+1	1	RNGFND7_GNDCLEAR	10	2
+1	1	RNGFND7_MAX_CM	700	4
+1	1	RNGFND7_MIN_CM	20	4
+1	1	RNGFND7_OFFSET	0.000000000000000000	9
+1	1	RNGFND7_ORIENT	0	2
+1	1	RNGFND7_PIN	-1	2
+1	1	RNGFND7_POS_X	0.000000000000000000	9
+1	1	RNGFND7_POS_Y	0.000000000000000000	9
+1	1	RNGFND7_POS_Z	0.000000000000000000	9
+1	1	RNGFND7_PWRRNG	0	4
+1	1	RNGFND7_RMETRIC	1	2
+1	1	RNGFND7_SCALING	3.000000000000000000	9
+1	1	RNGFND7_STOP_PIN	-1	2
 1	1	RNGFND7_TYPE	0	2
+1	1	RNGFND8_ADDR	0	2
+1	1	RNGFND8_FUNCTION	0	2
+1	1	RNGFND8_GNDCLEAR	10	2
+1	1	RNGFND8_MAX_CM	700	4
+1	1	RNGFND8_MIN_CM	20	4
+1	1	RNGFND8_OFFSET	0.000000000000000000	9
+1	1	RNGFND8_ORIENT	0	2
+1	1	RNGFND8_PIN	-1	2
+1	1	RNGFND8_POS_X	0.000000000000000000	9
+1	1	RNGFND8_POS_Y	0.000000000000000000	9
+1	1	RNGFND8_POS_Z	0.000000000000000000	9
+1	1	RNGFND8_PWRRNG	0	4
+1	1	RNGFND8_RMETRIC	1	2
+1	1	RNGFND8_SCALING	3.000000000000000000	9
+1	1	RNGFND8_STOP_PIN	-1	2
 1	1	RNGFND8_TYPE	0	2
+1	1	RNGFND9_ADDR	0	2
+1	1	RNGFND9_FUNCTION	0	2
+1	1	RNGFND9_GNDCLEAR	10	2
+1	1	RNGFND9_MAX_CM	700	4
+1	1	RNGFND9_MIN_CM	20	4
+1	1	RNGFND9_OFFSET	0.000000000000000000	9
+1	1	RNGFND9_ORIENT	0	2
+1	1	RNGFND9_PIN	-1	2
+1	1	RNGFND9_POS_X	0.000000000000000000	9
+1	1	RNGFND9_POS_Y	0.000000000000000000	9
+1	1	RNGFND9_POS_Z	0.000000000000000000	9
+1	1	RNGFND9_PWRRNG	0	4
+1	1	RNGFND9_RMETRIC	1	2
+1	1	RNGFND9_SCALING	3.000000000000000000	9
+1	1	RNGFND9_STOP_PIN	-1	2
 1	1	RNGFND9_TYPE	0	2
+1	1	RNGFNDA_ADDR	0	2
+1	1	RNGFNDA_FUNCTION	0	2
+1	1	RNGFNDA_GNDCLEAR	10	2
+1	1	RNGFNDA_MAX_CM	700	4
+1	1	RNGFNDA_MIN_CM	20	4
+1	1	RNGFNDA_OFFSET	0.000000000000000000	9
+1	1	RNGFNDA_ORIENT	0	2
+1	1	RNGFNDA_PIN	-1	2
+1	1	RNGFNDA_POS_X	0.000000000000000000	9
+1	1	RNGFNDA_POS_Y	0.000000000000000000	9
+1	1	RNGFNDA_POS_Z	0.000000000000000000	9
+1	1	RNGFNDA_PWRRNG	0	4
+1	1	RNGFNDA_RMETRIC	1	2
+1	1	RNGFNDA_SCALING	3.000000000000000000	9
+1	1	RNGFNDA_STOP_PIN	-1	2
 1	1	RNGFNDA_TYPE	0	2
-1	1	RPM1_TYPE	0	2
+1	1	RPM2_PIN	-1	2
+1	1	RPM2_SCALING	1.000000000000000000	9
 1	1	RPM2_TYPE	0	2
+1	1	RPM_MAX	100000.000000000000000000	9
+1	1	RPM_MIN	10.000000000000000000	9
+1	1	RPM_MIN_QUAL	0.500000000000000000	9
+1	1	RPM_PIN	54	2
+1	1	RPM_SCALING	1.000000000000000000	9
+1	1	RPM_TYPE	0	2
 1	1	RSSI_TYPE	0	2
 1	1	RST_SWITCH_CH	0	2
 1	1	RTL_SPEED	0.000000000000000000	9
 1	1	SAIL_ENABLE	0	2
 1	1	SCHED_DEBUG	0	2
 1	1	SCHED_LOOP_RATE	50	4
-1	1	SCHED_OPTIONS	0	2
 1	1	SCR_ENABLE	0	2
 1	1	SERIAL0_BAUD	115	6
 1	1	SERIAL0_PROTOCOL	2	2
 1	1	SERIAL1_BAUD	57	6
 1	1	SERIAL1_OPTIONS	0	4
-1	1	SERIAL1_PROTOCOL	2	2
+1	1	SERIAL1_PROTOCOL	1	2
 1	1	SERIAL2_BAUD	57	6
 1	1	SERIAL2_OPTIONS	0	4
-1	1	SERIAL2_PROTOCOL	2	2
-1	1	SERIAL3_BAUD	230	6
+1	1	SERIAL2_PROTOCOL	1	2
+1	1	SERIAL3_BAUD	38	6
 1	1	SERIAL3_OPTIONS	0	4
 1	1	SERIAL3_PROTOCOL	5	2
-1	1	SERIAL4_BAUD	230	6
+1	1	SERIAL4_BAUD	38	6
 1	1	SERIAL4_OPTIONS	0	4
 1	1	SERIAL4_PROTOCOL	5	2
 1	1	SERIAL5_BAUD	57	6
 1	1	SERIAL5_OPTIONS	0	4
-1	1	SERIAL5_PROTOCOL	-1	2
-1	1	SERIAL6_BAUD	57	6
+1	1	SERIAL5_PROTOCOL	1	2
+1	1	SERIAL6_BAUD	115200	6
 1	1	SERIAL6_OPTIONS	0	4
-1	1	SERIAL6_PROTOCOL	-1	2
-1	1	SERIAL7_BAUD	57	6
-1	1	SERIAL7_OPTIONS	0	4
-1	1	SERIAL7_PROTOCOL	-1	2
+1	1	SERIAL6_PROTOCOL	22	2
 1	1	SERIAL_PASS1	0	2
 1	1	SERIAL_PASS2	-1	2
 1	1	SERIAL_PASSTIMO	15	2
@@ -762,8 +813,8 @@
 1	1	SERVO16_REVERSED	0	2
 1	1	SERVO16_TRIM	1500	4
 1	1	SERVO1_FUNCTION	26	4
-1	1	SERVO1_MAX	2000	4
-1	1	SERVO1_MIN	1000	4
+1	1	SERVO1_MAX	1900	4
+1	1	SERVO1_MIN	1100	4
 1	1	SERVO1_REVERSED	0	2
 1	1	SERVO1_TRIM	1500	4
 1	1	SERVO2_FUNCTION	0	4
@@ -772,8 +823,8 @@
 1	1	SERVO2_REVERSED	0	2
 1	1	SERVO2_TRIM	1500	4
 1	1	SERVO3_FUNCTION	70	4
-1	1	SERVO3_MAX	2000	4
-1	1	SERVO3_MIN	1000	4
+1	1	SERVO3_MAX	1900	4
+1	1	SERVO3_MIN	1100	4
 1	1	SERVO3_REVERSED	0	2
 1	1	SERVO3_TRIM	1500	4
 1	1	SERVO4_FUNCTION	0	4
@@ -806,398 +857,33 @@
 1	1	SERVO9_MIN	1100	4
 1	1	SERVO9_REVERSED	0	2
 1	1	SERVO9_TRIM	1500	4
-1	1	SERVO_32_ENABLE	0	2
-1	1	SERVO_DSHOT_ESC	0	2
-1	1	SERVO_DSHOT_RATE	0	2
-1	1	SERVO_FTW_MASK	0	6
-1	1	SERVO_FTW_POLES	14	2
-1	1	SERVO_FTW_RVMASK	0	6
-1	1	SERVO_GPIO_MASK	0	6
+1	1	SERVO_BLH_DEBUG	0	2
+1	1	SERVO_BLH_MASK	0	6
+1	1	SERVO_BLH_OTYPE	0	2
+1	1	SERVO_BLH_POLES	14	2
+1	1	SERVO_BLH_PORT	0	2
+1	1	SERVO_BLH_REMASK	0	6
+1	1	SERVO_BLH_TEST	0	2
+1	1	SERVO_BLH_TMOUT	0	4
+1	1	SERVO_BLH_TRATE	10	4
 1	1	SERVO_RATE	50	4
-1	1	SERVO_RC_FS_MSK	0	6
 1	1	SERVO_ROB_POSMAX	4095	6
 1	1	SERVO_ROB_POSMIN	0	6
 1	1	SERVO_SBUS_RATE	50	4
 1	1	SERVO_VOLZ_MASK	0	6
-1	1	SERVO_VOLZ_RANGE	200	4
 1	1	SIMPLE_TYPE	0	2
-1	1	SIM_ACC1_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC1_RND	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC2_RND	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC3_RND	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACCEL1_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL2_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL3_FAIL	0.000000000000000000	9
-1	1	SIM_ACC_FAIL_MSK	0	2
-1	1	SIM_ACC_FILE_RW	0	2
-1	1	SIM_ACC_TRIM_X	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Y	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Z	0.000000000000000000	9
-1	1	SIM_ADSB_ALT	1000.000000000000000000	9
-1	1	SIM_ADSB_COUNT	-1	4
-1	1	SIM_ADSB_RADIUS	10000.000000000000000000	9
-1	1	SIM_ADSB_TX	0	2
-1	1	SIM_ADSB_TYPES	1	2
-1	1	SIM_ARSPD2_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD2_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD2_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD2_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD2_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD2_RND	2.000000000000000000	9
-1	1	SIM_ARSPD2_SIGN	0	2
-1	1	SIM_ARSPD_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD_RND	2.000000000000000000	9
-1	1	SIM_ARSPD_SIGN	0	2
-1	1	SIM_BAR2_DELAY	0	4
-1	1	SIM_BAR2_DISABLE	0	2
-1	1	SIM_BAR2_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR2_FREEZE	0	2
-1	1	SIM_BAR2_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR2_RND	0.200000002980232239	9
-1	1	SIM_BAR2_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_UP	0.000000000000000000	9
-1	1	SIM_BAR3_DELAY	0	4
-1	1	SIM_BAR3_DISABLE	0	2
-1	1	SIM_BAR3_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR3_FREEZE	0	2
-1	1	SIM_BAR3_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR3_RND	0.200000002980232239	9
-1	1	SIM_BAR3_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_UP	0.000000000000000000	9
-1	1	SIM_BARO_COUNT	2	2
-1	1	SIM_BARO_DELAY	0	4
-1	1	SIM_BARO_DISABLE	0	2
-1	1	SIM_BARO_DRIFT	0.000000000000000000	9
-1	1	SIM_BARO_FREEZE	0	2
-1	1	SIM_BARO_GLITCH	0.000000000000000000	9
-1	1	SIM_BARO_RND	0.200000002980232239	9
-1	1	SIM_BARO_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BARO_WCF_DN	0.000000000000000000	9
-1	1	SIM_BARO_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BARO_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_UP	0.000000000000000000	9
-1	1	SIM_BATT_CAP_AH	0.000000000000000000	9
-1	1	SIM_BATT_VOLTAGE	12.600000381469726563	9
-1	1	SIM_BAUDLIMIT_EN	0	2
-1	1	SIM_CAN_SRV_MSK	0	6
-1	1	SIM_CAN_TYPE1	1	2
-1	1	SIM_CAN_TYPE2	1	2
-1	1	SIM_CLAMP_CH	0	2
-1	1	SIM_DRIFT_SPEED	0.050000000745058060	9
-1	1	SIM_DRIFT_TIME	5.000000000000000000	9
-1	1	SIM_EFI_TYPE	0	2
-1	1	SIM_ENGINE_FAIL	0	2
-1	1	SIM_ENGINE_MUL	1.000000000000000000	9
-1	1	SIM_ESC_ARM_RPM	0.000000000000000000	9
-1	1	SIM_ESC_TELEM	1	2
-1	1	SIM_FLOAT_EXCEPT	1	2
-1	1	SIM_FLOW_DELAY	0	2
-1	1	SIM_FLOW_ENABLE	0	2
-1	1	SIM_FLOW_POS_X	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Y	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Z	0.000000000000000000	9
-1	1	SIM_FLOW_RATE	10	4
-1	1	SIM_FLOW_RND	0.050000000745058060	9
-1	1	SIM_FTOWESC_ENA	0	2
-1	1	SIM_FTOWESC_POW	4095	6
-1	1	SIM_GND_BEHAV	-1	2
-1	1	SIM_GPS2_ACC	0.300000011920928955	9
-1	1	SIM_GPS2_ALT_OFS	0	4
-1	1	SIM_GPS2_BYTELOS	0.000000000000000000	9
-1	1	SIM_GPS2_DISABLE	1	2
-1	1	SIM_GPS2_DRFTALT	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_X	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Y	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Z	0.000000000000000000	9
-1	1	SIM_GPS2_HDG	0	2
-1	1	SIM_GPS2_HZ	5	2
-1	1	SIM_GPS2_JAM	0	2
-1	1	SIM_GPS2_LAG_MS	100	4
-1	1	SIM_GPS2_LCKTIME	0	4
-1	1	SIM_GPS2_NOISE	0.000000000000000000	9
-1	1	SIM_GPS2_NUMSATS	10	2
-1	1	SIM_GPS2_POS_X	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS2_TYPE	1	2
-1	1	SIM_GPS2_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Z	0.000000000000000000	9
-1	1	SIM_GPS_ACC	0.300000011920928955	9
-1	1	SIM_GPS_ALT_OFS	0	4
-1	1	SIM_GPS_BYTELOSS	0.000000000000000000	9
-1	1	SIM_GPS_DISABLE	0	2
-1	1	SIM_GPS_DRIFTALT	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_X	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Y	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Z	0.000000000000000000	9
-1	1	SIM_GPS_HDG	0	2
-1	1	SIM_GPS_HZ	5	2
-1	1	SIM_GPS_JAM	0	2
-1	1	SIM_GPS_LAG_MS	100	4
-1	1	SIM_GPS_LOCKTIME	0	4
-1	1	SIM_GPS_LOG_NUM	0	4
-1	1	SIM_GPS_NOISE	0.000000000000000000	9
-1	1	SIM_GPS_NUMSATS	10	2
-1	1	SIM_GPS_POS_X	0.000000000000000000	9
-1	1	SIM_GPS_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS_TYPE	1	2
-1	1	SIM_GPS_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Z	0.000000000000000000	9
-1	1	SIM_GRPE_ENABLE	0	2
-1	1	SIM_GRPE_PIN	-1	2
-1	1	SIM_GRPS_ENABLE	0	2
-1	1	SIM_GRPS_GRAB	2000	4
-1	1	SIM_GRPS_PIN	-1	2
-1	1	SIM_GRPS_RELEASE	1000	4
-1	1	SIM_GRPS_REVERSE	0	2
-1	1	SIM_GYR1_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR1_RND	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR2_RND	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR3_RND	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR_FAIL_MSK	0	2
-1	1	SIM_GYR_FILE_RW	0	2
-1	1	SIM_IE24_ENABLE	0	2
-1	1	SIM_IE24_ERROR	0	6
-1	1	SIM_IE24_STATE	-1	2
-1	1	SIM_IMUT1_ENABLE	0	2
-1	1	SIM_IMUT2_ENABLE	0	2
-1	1	SIM_IMUT3_ENABLE	0	2
-1	1	SIM_IMUT_END	45.000000000000000000	9
-1	1	SIM_IMUT_FIXED	0.000000000000000000	9
-1	1	SIM_IMUT_START	25.000000000000000000	9
-1	1	SIM_IMUT_TCONST	300.000000000000000000	9
-1	1	SIM_IMU_COUNT	2	2
-1	1	SIM_IMU_ORIENT	0	2
-1	1	SIM_IMU_POS_X	0.000000000000000000	9
-1	1	SIM_IMU_POS_Y	0.000000000000000000	9
-1	1	SIM_IMU_POS_Z	0.000000000000000000	9
-1	1	SIM_INIT_ALT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LAT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LON_OFS	0.000000000000000000	9
-1	1	SIM_INS_THR_MIN	0.100000001490116119	9
-1	1	SIM_JSON_MASTER	0	2
-1	1	SIM_LED_LAYOUT	0	2
-1	1	SIM_LOOP_DELAY	0	6
-1	1	SIM_MAG1_DEVID	97539	6
-1	1	SIM_MAG1_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG1_FAIL	0	2
-1	1	SIM_MAG1_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG1_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG1_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG1_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG1_ORIENT	0	2
-1	1	SIM_MAG1_SCALING	1.000000000000000000	9
-1	1	SIM_MAG2_DEVID	131874	6
-1	1	SIM_MAG2_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG2_FAIL	0	2
-1	1	SIM_MAG2_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG2_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG2_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG2_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG2_ORIENT	0	2
-1	1	SIM_MAG2_SCALING	1.000000000000000000	9
-1	1	SIM_MAG3_DEVID	263178	6
-1	1	SIM_MAG3_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG3_FAIL	0	2
-1	1	SIM_MAG3_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG3_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG3_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG3_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG3_ORIENT	0	2
-1	1	SIM_MAG3_SCALING	1.000000000000000000	9
-1	1	SIM_MAG4_DEVID	97283	6
-1	1	SIM_MAG5_DEVID	97795	6
-1	1	SIM_MAG6_DEVID	98051	6
-1	1	SIM_MAG7_DEVID	0	6
-1	1	SIM_MAG8_DEVID	0	6
-1	1	SIM_MAG_ALY_HGT	1.000000000000000000	9
-1	1	SIM_MAG_ALY_X	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Y	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Z	0.000000000000000000	9
-1	1	SIM_MAG_DELAY	0	4
-1	1	SIM_MAG_MOT_X	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Y	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Z	0.000000000000000000	9
-1	1	SIM_MAG_RND	0.000000000000000000	9
-1	1	SIM_MAG_SAVE_IDS	1	2
-1	1	SIM_ODOM_ENABLE	0	2
-1	1	SIM_OH_MASK	0	6
-1	1	SIM_OH_RELAY_MSK	-1	4
-1	1	SIM_OPOS_ALT	584.000000000000000000	9
-1	1	SIM_OPOS_HDG	353.000000000000000000	9
-1	1	SIM_OPOS_LAT	-35.363262176513671875	9
-1	1	SIM_OPOS_LNG	149.165237426757812500	9
-1	1	SIM_PARA_ENABLE	0	2
-1	1	SIM_PARA_PIN	-1	2
-1	1	SIM_PIN_MASK	121	4
-1	1	SIM_PLD_ALT_LMT	15.000000000000000000	9
-1	1	SIM_PLD_DIST_LMT	10.000000000000000000	9
-1	1	SIM_PLD_ENABLE	0	2
-1	1	SIM_PLD_HEIGHT	0.000000000000000000	9
-1	1	SIM_PLD_LAT	0.000000000000000000	9
-1	1	SIM_PLD_LON	0.000000000000000000	9
-1	1	SIM_PLD_OPTIONS	0	2
-1	1	SIM_PLD_ORIENT	24	2
-1	1	SIM_PLD_RATE	100	6
-1	1	SIM_PLD_SHIP	0	2
-1	1	SIM_PLD_TYPE	0	2
-1	1	SIM_PLD_YAW	0	4
-1	1	SIM_RATE_HZ	1200	4
-1	1	SIM_RC_CHANCOUNT	16	2
-1	1	SIM_RC_FAIL	0	2
-1	1	SIM_RICH_CTRL	-1	2
-1	1	SIM_RICH_ENABLE	0	2
-1	1	SIM_SAIL_TYPE	0	2
-1	1	SIM_SERVO_DELAY	0.000000000000000000	9
-1	1	SIM_SERVO_FILTER	0.000000000000000000	9
-1	1	SIM_SERVO_SPEED	0.140000000596046448	9
-1	1	SIM_SHIP_DSIZE	10.000000000000000000	9
-1	1	SIM_SHIP_ENABLE	0	2
-1	1	SIM_SHIP_OFS_X	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Y	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Z	0.000000000000000000	9
-1	1	SIM_SHIP_PSIZE	1000.000000000000000000	9
-1	1	SIM_SHIP_SPEED	3.000000000000000000	9
-1	1	SIM_SHIP_SYSID	17	2
-1	1	SIM_SHOVE_TIME	0	6
-1	1	SIM_SHOVE_X	0.000000000000000000	9
-1	1	SIM_SHOVE_Y	0.000000000000000000	9
-1	1	SIM_SHOVE_Z	0.000000000000000000	9
-1	1	SIM_SLUP_ENABLE	0	2
-1	1	SIM_SONAR_GLITCH	0.000000000000000000	9
-1	1	SIM_SONAR_POS_X	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Y	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Z	0.000000000000000000	9
-1	1	SIM_SONAR_RND	0.000000000000000000	9
-1	1	SIM_SONAR_ROT	25	2
-1	1	SIM_SONAR_SCALE	12.121199607849121094	9
-1	1	SIM_SPEEDUP	1.000000000000000000	9
-1	1	SIM_SPR_ENABLE	0	2
-1	1	SIM_SPR_PUMP	-1	2
-1	1	SIM_SPR_SPIN	-1	2
-1	1	SIM_TA_ENABLE	1	2
-1	1	SIM_TEMP_BFACTOR	0.000000000000000000	9
-1	1	SIM_TEMP_BRD_OFF	20.000000000000000000	9
-1	1	SIM_TEMP_START	25.000000000000000000	9
-1	1	SIM_TEMP_TCONST	30.000000000000000000	9
-1	1	SIM_TERRAIN	1	2
-1	1	SIM_THML_SCENARI	0	2
-1	1	SIM_TIDE_DIR	0.000000000000000000	9
-1	1	SIM_TIDE_SPEED	0.000000000000000000	9
-1	1	SIM_TIME_JITTER	0	4
-1	1	SIM_TWIST_TIME	0	6
-1	1	SIM_TWIST_X	0.000000000000000000	9
-1	1	SIM_TWIST_Y	0.000000000000000000	9
-1	1	SIM_TWIST_Z	0.000000000000000000	9
-1	1	SIM_UART_LOSS	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_X	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Y	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Z	0.000000000000000000	9
-1	1	SIM_VIB_MOT_HMNC	1	4
-1	1	SIM_VIB_MOT_MASK	0	6
-1	1	SIM_VIB_MOT_MAX	0.000000000000000000	9
-1	1	SIM_VIB_MOT_MULT	1.000000000000000000	9
-1	1	SIM_VICON_FAIL	0	2
-1	1	SIM_VICON_GLIT_X	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Y	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Z	0.000000000000000000	9
-1	1	SIM_VICON_POS_X	0.000000000000000000	9
-1	1	SIM_VICON_POS_Y	0.000000000000000000	9
-1	1	SIM_VICON_POS_Z	0.000000000000000000	9
-1	1	SIM_VICON_TMASK	3	2
-1	1	SIM_VICON_VGLI_X	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Y	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Z	0.000000000000000000	9
-1	1	SIM_VICON_YAW	0	4
-1	1	SIM_VICON_YAWERR	0	4
-1	1	SIM_WAVE_AMP	0.500000000000000000	9
-1	1	SIM_WAVE_DIR	0.000000000000000000	9
-1	1	SIM_WAVE_ENABLE	0	2
-1	1	SIM_WAVE_LENGTH	10.000000000000000000	9
-1	1	SIM_WAVE_SPEED	0.500000000000000000	9
-1	1	SIM_WIND_DIR	180.000000000000000000	9
-1	1	SIM_WIND_DIR_Z	0.000000000000000000	9
-1	1	SIM_WIND_SPD	0.000000000000000000	9
-1	1	SIM_WIND_T	0	2
-1	1	SIM_WIND_TC	5.000000000000000000	9
-1	1	SIM_WIND_TURB	0.000000000000000000	9
-1	1	SIM_WIND_T_ALT	60.000000000000000000	9
-1	1	SIM_WIND_T_COEF	0.009999999776482582	9
-1	1	SIM_WOW_PIN	-1	2
 1	1	SPEED_MAX	0.000000000000000000	9
 1	1	SPRAY_ENABLE	0	2
-1	1	SR0_ADSB	4	4
-1	1	SR0_EXTRA1	4	4
-1	1	SR0_EXTRA2	4	4
-1	1	SR0_EXTRA3	4	4
-1	1	SR0_EXT_STAT	4	4
+1	1	SR0_ADSB	0	4
+1	1	SR0_EXTRA1	1	4
+1	1	SR0_EXTRA2	1	4
+1	1	SR0_EXTRA3	1	4
+1	1	SR0_EXT_STAT	1	4
 1	1	SR0_PARAMS	10	4
-1	1	SR0_POSITION	4	4
-1	1	SR0_RAW_CTRL	4	4
-1	1	SR0_RAW_SENS	4	4
-1	1	SR0_RC_CHAN	4	4
+1	1	SR0_POSITION	1	4
+1	1	SR0_RAW_CTRL	1	4
+1	1	SR0_RAW_SENS	1	4
+1	1	SR0_RC_CHAN	1	4
 1	1	SR1_ADSB	0	4
 1	1	SR1_EXTRA1	1	4
 1	1	SR1_EXTRA2	1	4
@@ -1228,64 +914,30 @@
 1	1	SR3_RAW_CTRL	1	4
 1	1	SR3_RAW_SENS	1	4
 1	1	SR3_RC_CHAN	1	4
-1	1	SR4_ADSB	0	4
-1	1	SR4_EXTRA1	1	4
-1	1	SR4_EXTRA2	1	4
-1	1	SR4_EXTRA3	1	4
-1	1	SR4_EXT_STAT	1	4
-1	1	SR4_PARAMS	10	4
-1	1	SR4_POSITION	1	4
-1	1	SR4_RAW_CTRL	1	4
-1	1	SR4_RAW_SENS	1	4
-1	1	SR4_RC_CHAN	1	4
-1	1	SR5_ADSB	0	4
-1	1	SR5_EXTRA1	1	4
-1	1	SR5_EXTRA2	1	4
-1	1	SR5_EXTRA3	1	4
-1	1	SR5_EXT_STAT	1	4
-1	1	SR5_PARAMS	10	4
-1	1	SR5_POSITION	1	4
-1	1	SR5_RAW_CTRL	1	4
-1	1	SR5_RAW_SENS	1	4
-1	1	SR5_RC_CHAN	1	4
-1	1	SR6_ADSB	0	4
-1	1	SR6_EXTRA1	1	4
-1	1	SR6_EXTRA2	1	4
-1	1	SR6_EXTRA3	1	4
-1	1	SR6_EXT_STAT	1	4
-1	1	SR6_PARAMS	10	4
-1	1	SR6_POSITION	1	4
-1	1	SR6_RAW_CTRL	1	4
-1	1	SR6_RAW_SENS	1	4
-1	1	SR6_RC_CHAN	1	4
 1	1	SRTL_ACCURACY	2.000000000000000000	9
-1	1	SRTL_OPTIONS	0	6
 1	1	SRTL_POINTS	300	4
 1	1	STAT_BOOTCNT	1	4
 1	1	STAT_FLTTIME	0	6
-1	1	STAT_RESET	1	6
-1	1	STAT_RUNTIME	30	6
+1	1	STAT_RESET	0	6
+1	1	STAT_RUNTIME	0	6
 1	1	STICK_MIXING	0	2
 1	1	SYSID_ENFORCE	0	2
 1	1	SYSID_MYGCS	255	4
 1	1	SYSID_THISMAV	1	4
 1	1	TELEM_DELAY	0	2
-1	1	TEMP1_TYPE	0	2
-1	1	TEMP2_TYPE	0	2
-1	1	TEMP3_TYPE	0	2
-1	1	TEMP_LOG	0	2
-1	1	TRQ1_TYPE	0	2
-1	1	TRQ2_TYPE	0	2
+1	1	TURN_MAX_G	0.600000023841857910	9
 1	1	TURN_RADIUS	0.899999976158142090	9
+1	1	VISO_ORIENT	0	2
+1	1	VISO_POS_X	0.000000000000000000	9
+1	1	VISO_POS_Y	0.000000000000000000	9
+1	1	VISO_POS_Z	0.000000000000000000	9
 1	1	VISO_TYPE	0	2
-1	1	VTX_ENABLE	0	2
 1	1	WENC_TYPE	0	2
 1	1	WNDVN_TYPE	0	2
-1	1	WP_ACCEL	0.000000000000000000	9
-1	1	WP_JERK	0.000000000000000000	9
+1	1	WP_OVERSHOOT	2.000000000000000000	9
 1	1	WP_PIVOT_ANGLE	60	4
-1	1	WP_PIVOT_DELAY	0.000000000000000000	9
-1	1	WP_PIVOT_RATE	60	4
-1	1	WP_RADIUS	3.000000000000000000	9
-1	1	WP_SPEED	5.000000000000000000	9
+1	1	WP_PIVOT_RATE	90	4
+1	1	WP_RADIUS	2.000000000000000000	9
+1	1	WP_SPEED	2.000000000000000000	9
+1	1	WP_SPEED_MIN	0.000000000000000000	9
 1	1	WRC_ENABLE	0	2
diff --git a/src/FirmwarePlugin/APM/Sub.OfflineEditing.params b/src/FirmwarePlugin/APM/Sub.OfflineEditing.params
index ec18d0b5296b..c47093ed8f5c 100644
--- a/src/FirmwarePlugin/APM/Sub.OfflineEditing.params
+++ b/src/FirmwarePlugin/APM/Sub.OfflineEditing.params
@@ -1,9 +1,9 @@
 # Onboard parameters for Vehicle 1
 #
 # Stack: ArduPilot
-# Vehicle: Submarine
-# Version: 4.6.0 dev
-# Git Revision: 1ebd4d99
+# Vehicle: Sub
+# Version: 3.7.0 dev
+# Git Revision: b319b27
 #
 # Vehicle-Id Component-Id Name Value Type
 1	1	ACRO_BAL_PITCH	1.000000000000000000	9
@@ -13,11 +13,13 @@
 1	1	ACRO_TRAINER	2	2
 1	1	ACRO_YAW_P	3.375000000000000000	9
 1	1	AHRS_COMP_BETA	0.100000001490116119	9
-1	1	AHRS_EKF_TYPE	3	2
+1	1	AHRS_CUSTOM_PIT	0.000000000000000000	9
+1	1	AHRS_CUSTOM_ROLL	0.000000000000000000	9
+1	1	AHRS_CUSTOM_YAW	0.000000000000000000	9
+1	1	AHRS_EKF_TYPE	2	2
 1	1	AHRS_GPS_GAIN	1.000000000000000000	9
 1	1	AHRS_GPS_MINSATS	6	2
 1	1	AHRS_GPS_USE	1	2
-1	1	AHRS_OPTIONS	0	4
 1	1	AHRS_ORIENTATION	0	2
 1	1	AHRS_RP_P	0.200000002980232239	9
 1	1	AHRS_TRIM_X	0.000000000000000000	9
@@ -28,10 +30,7 @@
 1	1	ANGLE_MAX	4500	4
 1	1	ARMING_ACCTHRESH	0.750000000000000000	9
 1	1	ARMING_CHECK	448	6
-1	1	ARMING_MAGTHRESH	100	4
 1	1	ARMING_MIS_ITEMS	0	6
-1	1	ARMING_OPTIONS	0	6
-1	1	ARSPD_ENABLE	0	2
 1	1	ATC_ACCEL_P_MAX	110000.000000000000000000	9
 1	1	ATC_ACCEL_R_MAX	110000.000000000000000000	9
 1	1	ATC_ACCEL_Y_MAX	110000.000000000000000000	9
@@ -41,72 +40,38 @@
 1	1	ATC_ANG_RLL_P	6.000000000000000000	9
 1	1	ATC_ANG_YAW_P	6.000000000000000000	9
 1	1	ATC_INPUT_TC	0.150000005960464478	9
-1	1	ATC_LAND_P_MULT	1.000000000000000000	9
-1	1	ATC_LAND_R_MULT	1.000000000000000000	9
-1	1	ATC_LAND_Y_MULT	1.000000000000000000	9
 1	1	ATC_RATE_FF_ENAB	1	2
 1	1	ATC_RATE_P_MAX	0.000000000000000000	9
 1	1	ATC_RATE_R_MAX	0.000000000000000000	9
-1	1	ATC_RATE_Y_MAX	180.000000000000000000	9
+1	1	ATC_RATE_Y_MAX	0.000000000000000000	9
 1	1	ATC_RAT_PIT_D	0.003599999938160181	9
-1	1	ATC_RAT_PIT_D_FF	0.000000000000000000	9
 1	1	ATC_RAT_PIT_FF	0.000000000000000000	9
 1	1	ATC_RAT_PIT_FLTD	30.000000000000000000	9
 1	1	ATC_RAT_PIT_FLTE	0.000000000000000000	9
 1	1	ATC_RAT_PIT_FLTT	30.000000000000000000	9
 1	1	ATC_RAT_PIT_I	0.090000003576278687	9
 1	1	ATC_RAT_PIT_IMAX	0.444000005722045898	9
-1	1	ATC_RAT_PIT_NEF	0	2
-1	1	ATC_RAT_PIT_NTF	0	2
 1	1	ATC_RAT_PIT_P	0.135000005364418030	9
-1	1	ATC_RAT_PIT_PDMX	0.000000000000000000	9
-1	1	ATC_RAT_PIT_SMAX	0.000000000000000000	9
 1	1	ATC_RAT_RLL_D	0.003599999938160181	9
-1	1	ATC_RAT_RLL_D_FF	0.000000000000000000	9
 1	1	ATC_RAT_RLL_FF	0.000000000000000000	9
 1	1	ATC_RAT_RLL_FLTD	30.000000000000000000	9
 1	1	ATC_RAT_RLL_FLTE	0.000000000000000000	9
 1	1	ATC_RAT_RLL_FLTT	30.000000000000000000	9
 1	1	ATC_RAT_RLL_I	0.090000003576278687	9
 1	1	ATC_RAT_RLL_IMAX	0.444000005722045898	9
-1	1	ATC_RAT_RLL_NEF	0	2
-1	1	ATC_RAT_RLL_NTF	0	2
 1	1	ATC_RAT_RLL_P	0.135000005364418030	9
-1	1	ATC_RAT_RLL_PDMX	0.000000000000000000	9
-1	1	ATC_RAT_RLL_SMAX	0.000000000000000000	9
 1	1	ATC_RAT_YAW_D	0.000000000000000000	9
-1	1	ATC_RAT_YAW_D_FF	0.000000000000000000	9
 1	1	ATC_RAT_YAW_FF	0.000000000000000000	9
 1	1	ATC_RAT_YAW_FLTD	5.000000000000000000	9
 1	1	ATC_RAT_YAW_FLTE	0.000000000000000000	9
 1	1	ATC_RAT_YAW_FLTT	5.000000000000000000	9
 1	1	ATC_RAT_YAW_I	0.017999999225139618	9
 1	1	ATC_RAT_YAW_IMAX	0.222000002861022949	9
-1	1	ATC_RAT_YAW_NEF	0	2
-1	1	ATC_RAT_YAW_NTF	0	2
 1	1	ATC_RAT_YAW_P	0.180000007152557373	9
-1	1	ATC_RAT_YAW_PDMX	0.000000000000000000	9
-1	1	ATC_RAT_YAW_SMAX	0.000000000000000000	9
 1	1	ATC_SLEW_YAW	6000.000000000000000000	9
 1	1	ATC_THR_MIX_MAN	0.100000001490116119	9
 1	1	ATC_THR_MIX_MAX	0.500000000000000000	9
 1	1	ATC_THR_MIX_MIN	0.100000001490116119	9
-1	1	BARO1_DEVID	65540	6
-1	1	BARO1_GND_PRESS	-5761763.500000000000000000	9
-1	1	BARO1_WCF_ENABLE	0	2
-1	1	BARO2_DEVID	65796	6
-1	1	BARO2_GND_PRESS	-5762477.500000000000000000	9
-1	1	BARO2_WCF_ENABLE	0	2
-1	1	BARO3_DEVID	0	6
-1	1	BARO3_GND_PRESS	0.000000000000000000	9
-1	1	BARO3_WCF_ENABLE	0	2
-1	1	BARO_ALT_OFFSET	0.000000000000000000	9
-1	1	BARO_EXT_BUS	1	2
-1	1	BARO_FLTR_RNG	0	2
-1	1	BARO_GND_TEMP	0.000000000000000000	9
-1	1	BARO_PRIMARY	0	2
-1	1	BARO_PROBE_EXT	768	6
-1	1	BARO_SPEC_GRAV	1.000000000000000000	9
 1	1	BATT2_MONITOR	0	2
 1	1	BATT3_MONITOR	0	2
 1	1	BATT4_MONITOR	0	2
@@ -115,42 +80,34 @@
 1	1	BATT7_MONITOR	0	2
 1	1	BATT8_MONITOR	0	2
 1	1	BATT9_MONITOR	0	2
-1	1	BATT_AMP_OFFSET	0.000000000000000000	9
-1	1	BATT_AMP_PERVLT	17.000000000000000000	9
-1	1	BATT_ARM_MAH	0	6
-1	1	BATT_ARM_VOLT	0.000000000000000000	9
-1	1	BATT_CAPACITY	3300	6
-1	1	BATT_CRT_MAH	0.000000000000000000	9
-1	1	BATT_CRT_VOLT	0.000000000000000000	9
-1	1	BATT_CURR_PIN	12	2
-1	1	BATT_FS_CRT_ACT	0	2
-1	1	BATT_FS_LOW_ACT	0	2
-1	1	BATT_FS_VOLTSRC	0	2
-1	1	BATT_LOW_MAH	0.000000000000000000	9
-1	1	BATT_LOW_TIMER	10	2
-1	1	BATT_LOW_VOLT	0.000000000000000000	9
-1	1	BATT_MONITOR	4	2
-1	1	BATT_OPTIONS	0	6
-1	1	BATT_SERIAL_NUM	-1	6
-1	1	BATT_VLT_OFFSET	0.000000000000000000	9
-1	1	BATT_VOLT_MULT	10.100000381469726563	9
-1	1	BATT_VOLT_PIN	13	2
+1	1	BATT_MONITOR	0	2
+1	1	BRD_ALT_CONFIG	0	2
 1	1	BRD_BOOT_DELAY	0	4
-1	1	BRD_OPTIONS	0	6
+1	1	BRD_IMUHEAT_I	0.070000000298023224	9
+1	1	BRD_IMUHEAT_IMAX	70.000000000000000000	9
+1	1	BRD_IMUHEAT_P	50.000000000000000000	9
+1	1	BRD_IMU_TARGTEMP	45	2
+1	1	BRD_IO_ENABLE	1	2
+1	1	BRD_OPTIONS	1	6
+1	1	BRD_PWM_COUNT	4	2
+1	1	BRD_PWM_VOLT_SEL	0	2
 1	1	BRD_RTC_TYPES	1	2
 1	1	BRD_RTC_TZ_MIN	0	4
+1	1	BRD_SAFETYENABLE	0	2
 1	1	BRD_SAFETYOPTION	3	4
-1	1	BRD_SAFETY_DEFLT	0	2
 1	1	BRD_SAFETY_MASK	0	6
-1	1	BRD_SD_FENCE	0	4
-1	1	BRD_SD_MISSION	0	4
-1	1	BRD_SERIAL_NUM	0	6
+1	1	BRD_SBUS_OUT	0	2
+1	1	BRD_SD_SLOWDOWN	0	2
+1	1	BRD_SER1_RTSCTS	2	2
+1	1	BRD_SER2_RTSCTS	2	2
+1	1	BRD_SERIAL_NUM	0	4
+1	1	BRD_TYPE	3	2
 1	1	BRD_VBUS_MIN	4.300000190734863281	9
 1	1	BRD_VSERVO_MIN	0.000000000000000000	9
 1	1	BTN0_FUNCTION	0	2
 1	1	BTN0_SFUNCTION	0	2
 1	1	BTN10_FUNCTION	22	2
-1	1	BTN10_SFUNCTION	0	2
+1	1	BTN10_SFUNCTION	26	2
 1	1	BTN11_FUNCTION	42	2
 1	1	BTN11_SFUNCTION	47	2
 1	1	BTN12_FUNCTION	43	2
@@ -161,43 +118,11 @@
 1	1	BTN14_SFUNCTION	44	2
 1	1	BTN15_FUNCTION	0	2
 1	1	BTN15_SFUNCTION	0	2
-1	1	BTN16_FUNCTION	0	2
-1	1	BTN16_SFUNCTION	0	2
-1	1	BTN17_FUNCTION	0	2
-1	1	BTN17_SFUNCTION	0	2
-1	1	BTN18_FUNCTION	0	2
-1	1	BTN18_SFUNCTION	0	2
-1	1	BTN19_FUNCTION	0	2
-1	1	BTN19_SFUNCTION	0	2
-1	1	BTN1_FUNCTION	6	2
+1	1	BTN1_FUNCTION	5	2
 1	1	BTN1_SFUNCTION	0	2
-1	1	BTN20_FUNCTION	0	2
-1	1	BTN20_SFUNCTION	0	2
-1	1	BTN21_FUNCTION	0	2
-1	1	BTN21_SFUNCTION	0	2
-1	1	BTN22_FUNCTION	0	2
-1	1	BTN22_SFUNCTION	0	2
-1	1	BTN23_FUNCTION	0	2
-1	1	BTN23_SFUNCTION	0	2
-1	1	BTN24_FUNCTION	0	2
-1	1	BTN24_SFUNCTION	0	2
-1	1	BTN25_FUNCTION	0	2
-1	1	BTN25_SFUNCTION	0	2
-1	1	BTN26_FUNCTION	0	2
-1	1	BTN26_SFUNCTION	0	2
-1	1	BTN27_FUNCTION	0	2
-1	1	BTN27_SFUNCTION	0	2
-1	1	BTN28_FUNCTION	0	2
-1	1	BTN28_SFUNCTION	0	2
-1	1	BTN29_FUNCTION	0	2
-1	1	BTN29_SFUNCTION	0	2
-1	1	BTN2_FUNCTION	8	2
+1	1	BTN2_FUNCTION	7	2
 1	1	BTN2_SFUNCTION	0	2
-1	1	BTN30_FUNCTION	0	2
-1	1	BTN30_SFUNCTION	0	2
-1	1	BTN31_FUNCTION	0	2
-1	1	BTN31_SFUNCTION	0	2
-1	1	BTN3_FUNCTION	7	2
+1	1	BTN3_FUNCTION	6	2
 1	1	BTN3_SFUNCTION	0	2
 1	1	BTN4_FUNCTION	4	2
 1	1	BTN4_SFUNCTION	0	2
@@ -210,48 +135,45 @@
 1	1	BTN8_FUNCTION	48	2
 1	1	BTN8_SFUNCTION	0	2
 1	1	BTN9_FUNCTION	23	2
-1	1	BTN9_SFUNCTION	0	2
-1	1	CAM1_TYPE	0	2
-1	1	CAM2_TYPE	0	2
-1	1	CAM_AUTO_ONLY	0	2
-1	1	CAM_MAX_ROLL	0	4
-1	1	CAM_RC_TYPE	0	2
+1	1	BTN9_SFUNCTION	27	2
 1	1	CAN_D1_PROTOCOL	1	2
-1	1	CAN_D1_PROTOCOL2	0	2
 1	1	CAN_D2_PROTOCOL	1	2
-1	1	CAN_D2_PROTOCOL2	0	2
-1	1	CAN_LOGLEVEL	0	2
 1	1	CAN_P1_DRIVER	0	2
 1	1	CAN_P2_DRIVER	0	2
-1	1	CIRCLE_OPTIONS	1	4
+1	1	CAN_SLCAN_CPORT	0	2
+1	1	CAN_SLCAN_SERNUM	-1	2
+1	1	CAN_SLCAN_TIMOUT	0	4
+1	1	CIRCLE_CONTROL	1	4
 1	1	CIRCLE_RADIUS	1000.000000000000000000	9
 1	1	CIRCLE_RATE	2.000000000000000000	9
 1	1	COMPASS_AUTODEC	1	2
 1	1	COMPASS_AUTO_ROT	2	2
 1	1	COMPASS_CAL_FIT	16.000000000000000000	9
-1	1	COMPASS_DEC	0.223357215523719788	9
-1	1	COMPASS_DEV_ID	97539	6
-1	1	COMPASS_DEV_ID2	131874	6
-1	1	COMPASS_DEV_ID3	263178	6
-1	1	COMPASS_DEV_ID4	97283	6
-1	1	COMPASS_DEV_ID5	97795	6
-1	1	COMPASS_DEV_ID6	98051	6
+1	1	COMPASS_CUS_PIT	0.000000000000000000	9
+1	1	COMPASS_CUS_ROLL	0.000000000000000000	9
+1	1	COMPASS_CUS_YAW	0.000000000000000000	9
+1	1	COMPASS_DEC	0.000000000000000000	9
+1	1	COMPASS_DEV_ID	590114	6
+1	1	COMPASS_DEV_ID2	0	6
+1	1	COMPASS_DEV_ID3	0	6
+1	1	COMPASS_DEV_ID4	0	6
+1	1	COMPASS_DEV_ID5	0	6
+1	1	COMPASS_DEV_ID6	0	6
 1	1	COMPASS_DEV_ID7	0	6
 1	1	COMPASS_DEV_ID8	0	6
-1	1	COMPASS_DIA2_X	1.000000000000000000	9
-1	1	COMPASS_DIA2_Y	1.000000000000000000	9
-1	1	COMPASS_DIA2_Z	1.000000000000000000	9
-1	1	COMPASS_DIA3_X	1.000000000000000000	9
-1	1	COMPASS_DIA3_Y	1.000000000000000000	9
-1	1	COMPASS_DIA3_Z	1.000000000000000000	9
+1	1	COMPASS_DIA2_X	0.000000000000000000	9
+1	1	COMPASS_DIA2_Y	0.000000000000000000	9
+1	1	COMPASS_DIA2_Z	0.000000000000000000	9
+1	1	COMPASS_DIA3_X	0.000000000000000000	9
+1	1	COMPASS_DIA3_Y	0.000000000000000000	9
+1	1	COMPASS_DIA3_Z	0.000000000000000000	9
 1	1	COMPASS_DIA_X	1.000000000000000000	9
 1	1	COMPASS_DIA_Y	1.000000000000000000	9
 1	1	COMPASS_DIA_Z	1.000000000000000000	9
-1	1	COMPASS_DISBLMSK	0	6
 1	1	COMPASS_ENABLE	1	2
 1	1	COMPASS_EXTERN2	0	2
 1	1	COMPASS_EXTERN3	0	2
-1	1	COMPASS_EXTERNAL	1	2
+1	1	COMPASS_EXTERNAL	0	2
 1	1	COMPASS_FLTR_RNG	0	2
 1	1	COMPASS_LEARN	0	2
 1	1	COMPASS_MOT2_X	0.000000000000000000	9
@@ -274,118 +196,83 @@
 1	1	COMPASS_ODI_Y	0.000000000000000000	9
 1	1	COMPASS_ODI_Z	0.000000000000000000	9
 1	1	COMPASS_OFFS_MAX	1000	4
-1	1	COMPASS_OFS2_X	5.000000000000000000	9
-1	1	COMPASS_OFS2_Y	13.000000000000000000	9
-1	1	COMPASS_OFS2_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS3_X	5.000000000000000000	9
-1	1	COMPASS_OFS3_Y	13.000000000000000000	9
-1	1	COMPASS_OFS3_Z	-18.000000000000000000	9
-1	1	COMPASS_OFS_X	5.000000000000000000	9
-1	1	COMPASS_OFS_Y	13.000000000000000000	9
-1	1	COMPASS_OFS_Z	-18.000000000000000000	9
+1	1	COMPASS_OFS2_X	0.000000000000000000	9
+1	1	COMPASS_OFS2_Y	0.000000000000000000	9
+1	1	COMPASS_OFS2_Z	0.000000000000000000	9
+1	1	COMPASS_OFS3_X	0.000000000000000000	9
+1	1	COMPASS_OFS3_Y	0.000000000000000000	9
+1	1	COMPASS_OFS3_Z	0.000000000000000000	9
+1	1	COMPASS_OFS_X	0.000000000000000000	9
+1	1	COMPASS_OFS_Y	0.000000000000000000	9
+1	1	COMPASS_OFS_Z	0.000000000000000000	9
 1	1	COMPASS_OPTIONS	0	4
 1	1	COMPASS_ORIENT	0	2
 1	1	COMPASS_ORIENT2	0	2
 1	1	COMPASS_ORIENT3	0	2
 1	1	COMPASS_PMOT_EN	0	2
-1	1	COMPASS_PRIO1_ID	97539	6
-1	1	COMPASS_PRIO2_ID	131874	6
-1	1	COMPASS_PRIO3_ID	263178	6
-1	1	COMPASS_SCALE	1.000000000000000000	9
-1	1	COMPASS_SCALE2	1.000000000000000000	9
-1	1	COMPASS_SCALE3	1.000000000000000000	9
+1	1	COMPASS_PRIO1_ID	590114	6
+1	1	COMPASS_PRIO2_ID	0	6
+1	1	COMPASS_PRIO3_ID	0	6
+1	1	COMPASS_SCALE	0.000000000000000000	9
+1	1	COMPASS_SCALE2	0.000000000000000000	9
+1	1	COMPASS_SCALE3	0.000000000000000000	9
+1	1	COMPASS_TYPEMASK	32	6
 1	1	COMPASS_USE	1	2
 1	1	COMPASS_USE2	1	2
 1	1	COMPASS_USE3	1	2
-1	1	CUST_ROT_ENABLE	0	2
-1	1	DID_ENABLE	0	2
-1	1	EAHRS_TYPE	0	2
-1	1	EFI_TYPE	0	2
-1	1	EK2_ENABLE	0	2
-1	1	EK3_ABIAS_P_NSE	0.019999999552965164	9
-1	1	EK3_ACC_BIAS_LIM	1.000000000000000000	9
-1	1	EK3_ACC_P_NSE	0.349999994039535522	9
-1	1	EK3_AFFINITY	0	6
-1	1	EK3_ALT_M_NSE	0.100000001490116119	9
-1	1	EK3_BCN_DELAY	50	2
-1	1	EK3_BCN_I_GTE	500	4
-1	1	EK3_BCN_M_NSE	1.000000000000000000	9
-1	1	EK3_BETA_MASK	0	2
-1	1	EK3_CHECK_SCALE	100	4
-1	1	EK3_DRAG_BCOEF_X	0.000000000000000000	9
-1	1	EK3_DRAG_BCOEF_Y	0.000000000000000000	9
-1	1	EK3_DRAG_MCOEF	0.000000000000000000	9
-1	1	EK3_DRAG_M_NSE	0.500000000000000000	9
-1	1	EK3_EAS_I_GATE	400	4
-1	1	EK3_EAS_M_NSE	1.399999976158142090	9
-1	1	EK3_ENABLE	1	2
-1	1	EK3_ERR_THRESH	0.200000002980232239	9
-1	1	EK3_FLOW_DELAY	10	2
-1	1	EK3_FLOW_I_GATE	300	4
-1	1	EK3_FLOW_M_NSE	0.250000000000000000	9
-1	1	EK3_FLOW_USE	1	2
-1	1	EK3_GBIAS_P_NSE	0.001000000047497451	9
-1	1	EK3_GLITCH_RAD	25	2
-1	1	EK3_GND_EFF_DZ	4.000000000000000000	9
-1	1	EK3_GPS_CHECK	31	2
-1	1	EK3_GPS_VACC_MAX	0.000000000000000000	9
-1	1	EK3_GSF_RST_MAX	2	2
-1	1	EK3_GSF_RUN_MASK	3	2
-1	1	EK3_GSF_USE_MASK	3	2
-1	1	EK3_GYRO_P_NSE	0.014999999664723873	9
-1	1	EK3_HGT_DELAY	60	4
-1	1	EK3_HGT_I_GATE	500	4
-1	1	EK3_HRT_FILT	2.000000000000000000	9
-1	1	EK3_IMU_MASK	3	2
-1	1	EK3_LOG_LEVEL	0	2
-1	1	EK3_MAGB_P_NSE	0.000099999997473788	9
-1	1	EK3_MAGE_P_NSE	0.001000000047497451	9
-1	1	EK3_MAG_CAL	3	2
-1	1	EK3_MAG_EF_LIM	50	4
-1	1	EK3_MAG_I_GATE	300	4
-1	1	EK3_MAG_MASK	0	2
-1	1	EK3_MAG_M_NSE	0.050000000745058060	9
-1	1	EK3_MAX_FLOW	2.500000000000000000	9
-1	1	EK3_NOAID_M_NSE	10.000000000000000000	9
-1	1	EK3_OGNM_TEST_SF	2.000000000000000000	9
-1	1	EK3_OGN_HGT_MASK	0	2
-1	1	EK3_OPTIONS	0	6
-1	1	EK3_POSNE_M_NSE	0.500000000000000000	9
-1	1	EK3_POS_I_GATE	500	4
-1	1	EK3_PRIMARY	0	2
-1	1	EK3_RNG_I_GATE	500	4
-1	1	EK3_RNG_M_NSE	0.500000000000000000	9
-1	1	EK3_RNG_USE_HGT	-1	2
-1	1	EK3_RNG_USE_SPD	2.000000000000000000	9
-1	1	EK3_SRC1_POSXY	3	2
-1	1	EK3_SRC1_POSZ	1	2
-1	1	EK3_SRC1_VELXY	3	2
-1	1	EK3_SRC1_VELZ	0	2
-1	1	EK3_SRC1_YAW	1	2
-1	1	EK3_SRC2_POSXY	0	2
-1	1	EK3_SRC2_POSZ	1	2
-1	1	EK3_SRC2_VELXY	0	2
-1	1	EK3_SRC2_VELZ	0	2
-1	1	EK3_SRC2_YAW	0	2
-1	1	EK3_SRC3_POSXY	0	2
-1	1	EK3_SRC3_POSZ	1	2
-1	1	EK3_SRC3_VELXY	0	2
-1	1	EK3_SRC3_VELZ	0	2
-1	1	EK3_SRC3_YAW	0	2
-1	1	EK3_SRC_OPTIONS	1	4
-1	1	EK3_TAU_OUTPUT	25	2
-1	1	EK3_TERR_GRAD	0.100000001490116119	9
-1	1	EK3_VELD_M_NSE	0.699999988079071045	9
-1	1	EK3_VELNE_M_NSE	0.500000000000000000	9
-1	1	EK3_VEL_I_GATE	500	4
-1	1	EK3_VIS_VERR_MAX	0.899999976158142090	9
-1	1	EK3_VIS_VERR_MIN	0.100000001490116119	9
-1	1	EK3_WENC_VERR	0.100000001490116119	9
-1	1	EK3_WIND_PSCALE	1.000000000000000000	9
-1	1	EK3_WIND_P_NSE	0.100000001490116119	9
-1	1	EK3_YAW_I_GATE	300	4
-1	1	EK3_YAW_M_NSE	0.500000000000000000	9
-1	1	ESC_TLM_MAV_OFS	0	2
+1	1	EK2_ABIAS_P_NSE	0.004999999888241291	9
+1	1	EK2_ACC_P_NSE	0.600000023841857910	9
+1	1	EK2_ALT_M_NSE	10.000000000000000000	9
+1	1	EK2_ALT_SOURCE	0	2
+1	1	EK2_BCN_DELAY	50	2
+1	1	EK2_BCN_I_GTE	500	4
+1	1	EK2_BCN_M_NSE	1.000000000000000000	9
+1	1	EK2_CHECK_SCALE	100	4
+1	1	EK2_EAS_I_GATE	400	4
+1	1	EK2_EAS_M_NSE	1.399999976158142090	9
+1	1	EK2_ENABLE	1	2
+1	1	EK2_EXTNAV_DELAY	10	2
+1	1	EK2_FLOW_DELAY	10	2
+1	1	EK2_FLOW_I_GATE	300	4
+1	1	EK2_FLOW_M_NSE	0.250000000000000000	9
+1	1	EK2_FLOW_USE	1	2
+1	1	EK2_GBIAS_P_NSE	0.000099999997473788	9
+1	1	EK2_GLITCH_RAD	25	2
+1	1	EK2_GPS_CHECK	31	2
+1	1	EK2_GPS_TYPE	0	2
+1	1	EK2_GSCL_P_NSE	0.000500000023748726	9
+1	1	EK2_GYRO_P_NSE	0.029999999329447746	9
+1	1	EK2_HGT_DELAY	60	4
+1	1	EK2_HGT_I_GATE	500	4
+1	1	EK2_HRT_FILT	2.000000000000000000	9
+1	1	EK2_IMU_MASK	3	2
+1	1	EK2_LOG_MASK	1	2
+1	1	EK2_MAGB_P_NSE	0.000099999997473788	9
+1	1	EK2_MAGE_P_NSE	0.001000000047497451	9
+1	1	EK2_MAG_CAL	3	2
+1	1	EK2_MAG_EF_LIM	50	4
+1	1	EK2_MAG_I_GATE	300	4
+1	1	EK2_MAG_MASK	0	2
+1	1	EK2_MAG_M_NSE	0.050000000745058060	9
+1	1	EK2_MAX_FLOW	2.500000000000000000	9
+1	1	EK2_NOAID_M_NSE	10.000000000000000000	9
+1	1	EK2_OGN_HGT_MASK	0	2
+1	1	EK2_POSNE_M_NSE	1.000000000000000000	9
+1	1	EK2_POS_I_GATE	500	4
+1	1	EK2_RNG_I_GATE	500	4
+1	1	EK2_RNG_M_NSE	0.500000000000000000	9
+1	1	EK2_RNG_USE_HGT	-1	2
+1	1	EK2_RNG_USE_SPD	2.000000000000000000	9
+1	1	EK2_TAU_OUTPUT	25	2
+1	1	EK2_TERR_GRAD	0.100000001490116119	9
+1	1	EK2_VELD_M_NSE	0.699999988079071045	9
+1	1	EK2_VELNE_M_NSE	0.500000000000000000	9
+1	1	EK2_VEL_I_GATE	500	4
+1	1	EK2_WIND_PSCALE	0.500000000000000000	9
+1	1	EK2_WIND_P_NSE	0.100000001490116119	9
+1	1	EK2_YAW_I_GATE	300	4
+1	1	EK2_YAW_M_NSE	0.500000000000000000	9
+1	1	EK3_ENABLE	0	2
 1	1	FENCE_ACTION	1	2
 1	1	FENCE_ALT_MAX	100.000000000000000000	9
 1	1	FENCE_ALT_MIN	-10.000000000000000000	9
@@ -394,28 +281,11 @@
 1	1	FENCE_RADIUS	300.000000000000000000	9
 1	1	FENCE_TOTAL	0	2
 1	1	FENCE_TYPE	7	2
-1	1	FFT_ENABLE	0	2
-1	1	FILT1_TYPE	0	2
-1	1	FILT2_TYPE	0	2
-1	1	FILT3_TYPE	0	2
-1	1	FILT4_TYPE	0	2
-1	1	FILT5_TYPE	0	2
-1	1	FILT6_TYPE	0	2
-1	1	FILT7_TYPE	0	2
-1	1	FILT8_TYPE	0	2
-1	1	FLOW_TYPE	0	2
-1	1	FORMAT_VERSION	1	4
 1	1	FRAME_CONFIG	1	2
-1	1	FRSKY_DNLINK1_ID	20	2
-1	1	FRSKY_DNLINK2_ID	7	2
-1	1	FRSKY_DNLINK_ID	27	2
-1	1	FRSKY_OPTIONS	0	2
-1	1	FRSKY_UPLINK_ID	13	2
 1	1	FS_CRASH_CHECK	0	2
 1	1	FS_EKF_ACTION	0	2
 1	1	FS_EKF_THRESH	0.800000011920928955	9
 1	1	FS_GCS_ENABLE	2	2
-1	1	FS_GCS_TIMEOUT	5.000000000000000000	9
 1	1	FS_LEAK_ENABLE	1	2
 1	1	FS_PILOT_INPUT	2	2
 1	1	FS_PILOT_TIMEOUT	3.000000000000000000	9
@@ -425,85 +295,89 @@
 1	1	FS_TEMP_MAX	62	2
 1	1	FS_TERRAIN_ENAB	0	2
 1	1	GCS_PID_MASK	0	4
-1	1	GEN_TYPE	0	2
-1	1	GPS1_CAN_NODEID	0	6
-1	1	GPS1_CAN_OVRIDE	0	6
-1	1	GPS1_COM_PORT	1	2
-1	1	GPS1_DELAY_MS	0	4
-1	1	GPS1_GNSS_MODE	0	2
-1	1	GPS1_MB_TYPE	0	2
-1	1	GPS1_POS_X	0.000000000000000000	9
-1	1	GPS1_POS_Y	0.000000000000000000	9
-1	1	GPS1_POS_Z	0.000000000000000000	9
-1	1	GPS1_RATE_MS	200	4
-1	1	GPS1_TYPE	1	2
-1	1	GPS2_TYPE	0	2
+1	1	GND_ABS_PRESS	85512.687500000000000000	9
+1	1	GND_ABS_PRESS2	85533.437500000000000000	9
+1	1	GND_ABS_PRESS3	0.000000000000000000	9
+1	1	GND_ALT_OFFSET	0.000000000000000000	9
+1	1	GND_EXT_BUS	0	2
+1	1	GND_FLTR_RNG	0	2
+1	1	GND_PRIMARY	0	2
+1	1	GND_PROBE_EXT	0	6
+1	1	GND_SPEC_GRAV	1.000000000000000000	9
+1	1	GND_TEMP	0.000000000000000000	9
 1	1	GPS_AUTO_CONFIG	1	2
 1	1	GPS_AUTO_SWITCH	1	2
 1	1	GPS_BLEND_MASK	5	2
+1	1	GPS_BLEND_TC	10.000000000000000000	9
+1	1	GPS_DELAY_MS	0	4
+1	1	GPS_DELAY_MS2	0	4
 1	1	GPS_DRV_OPTIONS	0	4
+1	1	GPS_GNSS_MODE	0	2
+1	1	GPS_GNSS_MODE2	0	2
 1	1	GPS_INJECT_TO	127	2
+1	1	GPS_MIN_DGPS	100	2
 1	1	GPS_MIN_ELEV	-100	2
 1	1	GPS_NAVFILTER	8	2
-1	1	GPS_PRIMARY	0	2
+1	1	GPS_POS1_X	0.000000000000000000	9
+1	1	GPS_POS1_Y	0.000000000000000000	9
+1	1	GPS_POS1_Z	0.000000000000000000	9
+1	1	GPS_POS2_X	0.000000000000000000	9
+1	1	GPS_POS2_Y	0.000000000000000000	9
+1	1	GPS_POS2_Z	0.000000000000000000	9
+1	1	GPS_RATE_MS	200	4
+1	1	GPS_RATE_MS2	200	4
 1	1	GPS_RAW_DATA	0	2
 1	1	GPS_SAVE_CFG	2	2
 1	1	GPS_SBAS_MODE	2	2
 1	1	GPS_SBP_LOGMASK	-256	4
-1	1	GRIP_ENABLE	0	2
-1	1	INS_ACC1_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2OFFS_X	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Y	0.001000000047497451	9
-1	1	INS_ACC2OFFS_Z	0.001000000047497451	9
-1	1	INS_ACC2SCAL_X	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Y	1.001000046730041504	9
-1	1	INS_ACC2SCAL_Z	1.001000046730041504	9
-1	1	INS_ACC2_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC2_ID	2753036	6
+1	1	GPS_TYPE	1	2
+1	1	GPS_TYPE2	0	2
+1	1	INS_ACC2OFFS_X	0.000000000000000000	9
+1	1	INS_ACC2OFFS_Y	0.000000000000000000	9
+1	1	INS_ACC2OFFS_Z	0.000000000000000000	9
+1	1	INS_ACC2SCAL_X	1.000000000000000000	9
+1	1	INS_ACC2SCAL_Y	1.000000000000000000	9
+1	1	INS_ACC2SCAL_Z	1.000000000000000000	9
+1	1	INS_ACC2_ID	2883874	6
 1	1	INS_ACC3OFFS_X	0.000000000000000000	9
 1	1	INS_ACC3OFFS_Y	0.000000000000000000	9
 1	1	INS_ACC3OFFS_Z	0.000000000000000000	9
 1	1	INS_ACC3SCAL_X	1.000000000000000000	9
 1	1	INS_ACC3SCAL_Y	1.000000000000000000	9
 1	1	INS_ACC3SCAL_Z	1.000000000000000000	9
-1	1	INS_ACC3_CALTEMP	-300.000000000000000000	9
-1	1	INS_ACC3_ID	0	6
+1	1	INS_ACC3_ID	3015690	6
 1	1	INS_ACCEL_FILTER	20	4
-1	1	INS_ACCOFFS_X	0.001000000047497451	9
-1	1	INS_ACCOFFS_Y	0.001000000047497451	9
-1	1	INS_ACCOFFS_Z	0.001000000047497451	9
-1	1	INS_ACCSCAL_X	1.001000046730041504	9
-1	1	INS_ACCSCAL_Y	1.001000046730041504	9
-1	1	INS_ACCSCAL_Z	1.001000046730041504	9
+1	1	INS_ACCOFFS_X	0.000000000000000000	9
+1	1	INS_ACCOFFS_Y	0.000000000000000000	9
+1	1	INS_ACCOFFS_Z	0.000000000000000000	9
+1	1	INS_ACCSCAL_X	1.000000000000000000	9
+1	1	INS_ACCSCAL_Y	1.000000000000000000	9
+1	1	INS_ACCSCAL_Z	1.000000000000000000	9
 1	1	INS_ACC_BODYFIX	2	2
-1	1	INS_ACC_ID	2753028	6
+1	1	INS_ACC_ID	3081250	6
 1	1	INS_ENABLE_MASK	127	2
-1	1	INS_FAST_SAMPLE	1	2
-1	1	INS_GYR1_CALTEMP	-300.000000000000000000	9
+1	1	INS_FAST_SAMPLE	7	2
 1	1	INS_GYR2OFFS_X	0.000000000000000000	9
 1	1	INS_GYR2OFFS_Y	0.000000000000000000	9
 1	1	INS_GYR2OFFS_Z	0.000000000000000000	9
-1	1	INS_GYR2_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR2_ID	2752780	6
+1	1	INS_GYR2_ID	2883874	6
 1	1	INS_GYR3OFFS_X	0.000000000000000000	9
 1	1	INS_GYR3OFFS_Y	0.000000000000000000	9
 1	1	INS_GYR3OFFS_Z	0.000000000000000000	9
-1	1	INS_GYR3_CALTEMP	-300.000000000000000000	9
-1	1	INS_GYR3_ID	0	6
+1	1	INS_GYR3_ID	3015690	6
 1	1	INS_GYROFFS_X	0.000000000000000000	9
 1	1	INS_GYROFFS_Y	0.000000000000000000	9
 1	1	INS_GYROFFS_Z	0.000000000000000000	9
 1	1	INS_GYRO_FILTER	20	4
-1	1	INS_GYRO_RATE	0	2
 1	1	INS_GYR_CAL	0	2
-1	1	INS_GYR_ID	2752772	6
-1	1	INS_HNTC2_ENABLE	0	2
+1	1	INS_GYR_ID	3081250	6
 1	1	INS_HNTCH_ENABLE	0	2
 1	1	INS_LOG_BAT_CNT	1024	4
 1	1	INS_LOG_BAT_LGCT	32	4
 1	1	INS_LOG_BAT_LGIN	20	2
 1	1	INS_LOG_BAT_MASK	0	2
 1	1	INS_LOG_BAT_OPT	0	2
+1	1	INS_NOTCH_ENABLE	0	2
 1	1	INS_POS1_X	0.000000000000000000	9
 1	1	INS_POS1_Y	0.000000000000000000	9
 1	1	INS_POS1_Z	0.000000000000000000	9
@@ -513,12 +387,7 @@
 1	1	INS_POS3_X	0.000000000000000000	9
 1	1	INS_POS3_Y	0.000000000000000000	9
 1	1	INS_POS3_Z	0.000000000000000000	9
-1	1	INS_RAW_LOG_OPT	0	4
 1	1	INS_STILL_THRESH	0.100000001490116119	9
-1	1	INS_TCAL1_ENABLE	0	2
-1	1	INS_TCAL2_ENABLE	0	2
-1	1	INS_TCAL3_ENABLE	0	2
-1	1	INS_TCAL_OPTIONS	0	6
 1	1	INS_TRIM_OPTION	1	2
 1	1	INS_USE	1	2
 1	1	INS_USE2	1	2
@@ -529,29 +398,19 @@
 1	1	JS_GAIN_STEPS	4	2
 1	1	JS_LIGHTS_STEPS	8	4
 1	1	JS_THR_GAIN	1.000000000000000000	9
-1	1	KDE_NPOLE	14	2
 1	1	LEAK1_LOGIC	0	2
 1	1	LEAK1_PIN	-1	2
-1	1	LEAK1_TYPE	-1	2
 1	1	LEAK2_LOGIC	0	2
 1	1	LEAK2_PIN	-1	2
-1	1	LEAK2_TYPE	-1	2
 1	1	LEAK3_LOGIC	0	2
 1	1	LEAK3_PIN	-1	2
-1	1	LEAK3_TYPE	-1	2
 1	1	LOG_BACKEND_TYPE	1	2
-1	1	LOG_BITMASK	180222	6
-1	1	LOG_BLK_RATEMAX	0.000000000000000000	9
-1	1	LOG_DARM_RATEMAX	0.000000000000000000	9
+1	1	LOG_BITMASK	176126	6
 1	1	LOG_DISARMED	0	2
-1	1	LOG_FILE_BUFSIZE	200	4
+1	1	LOG_FILE_BUFSIZE	50	2
 1	1	LOG_FILE_DSRMROT	0	2
-1	1	LOG_FILE_MB_FREE	500	4
-1	1	LOG_FILE_RATEMAX	0.000000000000000000	9
 1	1	LOG_FILE_TIMEOUT	5	4
 1	1	LOG_MAV_BUFSIZE	8	2
-1	1	LOG_MAV_RATEMAX	0.000000000000000000	9
-1	1	LOG_MAX_FILES	500	4
 1	1	LOG_REPLAY	0	2
 1	1	LOIT_ACC_MAX	500.000000000000000000	9
 1	1	LOIT_ANG_MAX	0.000000000000000000	9
@@ -562,27 +421,29 @@
 1	1	MIS_OPTIONS	0	4
 1	1	MIS_RESTART	0	2
 1	1	MIS_TOTAL	0	4
-1	1	MNT1_DEFLT_MODE	3	2
-1	1	MNT1_DEVID	0	6
-1	1	MNT1_LEAD_PTCH	0.000000000000000000	9
-1	1	MNT1_LEAD_RLL	0.000000000000000000	9
-1	1	MNT1_NEUTRAL_X	0.000000000000000000	9
-1	1	MNT1_NEUTRAL_Y	0.000000000000000000	9
-1	1	MNT1_NEUTRAL_Z	0.000000000000000000	9
-1	1	MNT1_OPTIONS	0	2
-1	1	MNT1_PITCH_MAX	45	4
-1	1	MNT1_PITCH_MIN	-45	4
-1	1	MNT1_RC_RATE	30	4
-1	1	MNT1_RETRACT_X	0.000000000000000000	9
-1	1	MNT1_RETRACT_Y	0.000000000000000000	9
-1	1	MNT1_RETRACT_Z	0.000000000000000000	9
-1	1	MNT1_ROLL_MAX	30	4
-1	1	MNT1_ROLL_MIN	-30	4
-1	1	MNT1_SYSID_DFLT	0	2
-1	1	MNT1_TYPE	7	2
-1	1	MNT1_YAW_MAX	180	4
-1	1	MNT1_YAW_MIN	-180	4
-1	1	MNT2_TYPE	0	2
+1	1	MNT_ANGMAX_PAN	4500	4
+1	1	MNT_ANGMAX_ROL	4500	4
+1	1	MNT_ANGMAX_TIL	4500	4
+1	1	MNT_ANGMIN_PAN	-4500	4
+1	1	MNT_ANGMIN_ROL	-4500	4
+1	1	MNT_ANGMIN_TIL	-4500	4
+1	1	MNT_DEFLT_MODE	3	2
+1	1	MNT_JSTICK_SPD	100	2
+1	1	MNT_LEAD_PTCH	0.000000000000000000	9
+1	1	MNT_LEAD_RLL	0.000000000000000000	9
+1	1	MNT_NEUTRAL_X	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Y	0.000000000000000000	9
+1	1	MNT_NEUTRAL_Z	0.000000000000000000	9
+1	1	MNT_RC_IN_PAN	7	2
+1	1	MNT_RC_IN_ROLL	0	2
+1	1	MNT_RC_IN_TILT	8	2
+1	1	MNT_RETRACT_X	0.000000000000000000	9
+1	1	MNT_RETRACT_Y	0.000000000000000000	9
+1	1	MNT_RETRACT_Z	0.000000000000000000	9
+1	1	MNT_STAB_PAN	0	2
+1	1	MNT_STAB_ROLL	0	2
+1	1	MNT_STAB_TILT	0	2
+1	1	MNT_TYPE	0	2
 1	1	MOT_10_DIRECTION	1	2
 1	1	MOT_11_DIRECTION	1	2
 1	1	MOT_12_DIRECTION	1	2
@@ -603,9 +464,8 @@
 1	1	MOT_BOOST_SCALE	0.000000000000000000	9
 1	1	MOT_FV_CPLNG_K	1.000000000000000000	9
 1	1	MOT_HOVER_LEARN	2	2
-1	1	MOT_OPTIONS	0	4
-1	1	MOT_PWM_MAX	1900	4
-1	1	MOT_PWM_MIN	1100	4
+1	1	MOT_PWM_MAX	0	4
+1	1	MOT_PWM_MIN	0	4
 1	1	MOT_PWM_TYPE	0	2
 1	1	MOT_SAFE_DISARM	0	2
 1	1	MOT_SAFE_TIME	1.000000000000000000	9
@@ -615,77 +475,42 @@
 1	1	MOT_SPIN_MAX	0.949999988079071045	9
 1	1	MOT_SPIN_MIN	0.150000005960464478	9
 1	1	MOT_SPOOL_TIME	0.500000000000000000	9
-1	1	MOT_SPOOL_TIM_DN	0.000000000000000000	9
 1	1	MOT_THST_EXPO	0.649999976158142090	9
-1	1	MOT_THST_HOVER	0.500000000000000000	9
+1	1	MOT_THST_HOVER	0.349999994039535522	9
 1	1	MOT_YAW_HEADROOM	200	4
-1	1	MSP_OPTIONS	0	2
-1	1	MSP_OSD_NCELLS	0	2
-1	1	NET_ENABLE	0	2
-1	1	NET_P1_TYPE	0	2
-1	1	NET_P2_TYPE	0	2
-1	1	NET_P3_TYPE	0	2
-1	1	NET_P4_TYPE	0	2
-1	1	NMEA_MSG_EN	3	4
-1	1	NMEA_RATE_MS	100	4
+1	1	NTF_BUZZ_ENABLE	1	2
 1	1	NTF_BUZZ_ON_LVL	1	2
-1	1	NTF_BUZZ_PIN	-1	2
-1	1	NTF_BUZZ_TYPES	5	2
+1	1	NTF_BUZZ_PIN	0	2
 1	1	NTF_BUZZ_VOLUME	100	2
 1	1	NTF_DISPLAY_TYPE	0	2
 1	1	NTF_LED_BRIGHT	3	2
 1	1	NTF_LED_LEN	1	2
 1	1	NTF_LED_OVERRIDE	0	2
-1	1	NTF_LED_TYPES	123079	6
-1	1	ORIGIN_ALT	0.000000000000000000	9
-1	1	ORIGIN_LAT	0.000000000000000000	9
-1	1	ORIGIN_LON	0.000000000000000000	9
-1	1	PILOT_ACCEL_Z	200	4
+1	1	NTF_LED_TYPES	199	6
+1	1	NTF_OREO_THEME	0	2
+1	1	PILOT_ACCEL_Z	100	4
 1	1	PILOT_SPEED_DN	0	4
-1	1	PILOT_SPEED_UP	200	4
+1	1	PILOT_SPEED_UP	500	4
 1	1	PILOT_THR_FILT	0.000000000000000000	9
-1	1	PRX1_TYPE	0	2
-1	1	PRX2_TYPE	0	2
-1	1	PRX3_TYPE	0	2
-1	1	PRX4_TYPE	0	2
-1	1	PRX5_TYPE	0	2
-1	1	PRX_FILT	0.250000000000000000	9
-1	1	PRX_LOG_RAW	0	2
 1	1	PSC_ACCZ_D	0.000000000000000000	9
-1	1	PSC_ACCZ_D_FF	0.000000000000000000	9
-1	1	PSC_ACCZ_FF	0.750000000000000000	9
+1	1	PSC_ACCZ_FF	0.000000000000000000	9
 1	1	PSC_ACCZ_FLTD	0.000000000000000000	9
 1	1	PSC_ACCZ_FLTE	20.000000000000000000	9
 1	1	PSC_ACCZ_FLTT	0.000000000000000000	9
-1	1	PSC_ACCZ_I	4.000000000000000000	9
+1	1	PSC_ACCZ_I	0.100000001490116119	9
 1	1	PSC_ACCZ_IMAX	100.000000000000000000	9
-1	1	PSC_ACCZ_NEF	0	2
-1	1	PSC_ACCZ_NTF	0	2
-1	1	PSC_ACCZ_P	2.000000000000000000	9
-1	1	PSC_ACCZ_PDMX	0.000000000000000000	9
-1	1	PSC_ACCZ_SMAX	0.000000000000000000	9
+1	1	PSC_ACCZ_P	0.500000000000000000	9
+1	1	PSC_ACC_XY_FILT	2.000000000000000000	9
 1	1	PSC_ANGLE_MAX	0.000000000000000000	9
-1	1	PSC_JERK_XY	5.000000000000000000	9
-1	1	PSC_JERK_Z	8.000000000000000000	9
-1	1	PSC_POSXY_P	2.500000000000000000	9
+1	1	PSC_POSXY_P	1.000000000000000000	9
 1	1	PSC_POSZ_P	3.000000000000000000	9
-1	1	PSC_VELXY_D	0.800000011920928955	9
-1	1	PSC_VELXY_FF	0.000000000000000000	9
-1	1	PSC_VELXY_FLTD	5.000000000000000000	9
-1	1	PSC_VELXY_FLTE	5.000000000000000000	9
+1	1	PSC_VELXY_D	0.000000000000000000	9
+1	1	PSC_VELXY_D_FILT	5.000000000000000000	9
+1	1	PSC_VELXY_FILT	5.000000000000000000	9
 1	1	PSC_VELXY_I	0.500000000000000000	9
 1	1	PSC_VELXY_IMAX	1000.000000000000000000	9
-1	1	PSC_VELXY_P	5.000000000000000000	9
-1	1	PSC_VELZ_D	0.000000000000000000	9
-1	1	PSC_VELZ_FF	0.000000000000000000	9
-1	1	PSC_VELZ_FLTD	5.000000000000000000	9
-1	1	PSC_VELZ_FLTE	5.000000000000000000	9
-1	1	PSC_VELZ_I	0.000000000000000000	9
-1	1	PSC_VELZ_IMAX	1000.000000000000000000	9
+1	1	PSC_VELXY_P	1.000000000000000000	9
 1	1	PSC_VELZ_P	8.000000000000000000	9
-1	1	RALLY_INCL_HOME	0	2
-1	1	RALLY_LIMIT_KM	1.000000000000000000	9
-1	1	RALLY_TOTAL	0	2
 1	1	RC10_DZ	0	4
 1	1	RC10_MAX	1900	4
 1	1	RC10_MIN	1100	4
@@ -766,78 +591,204 @@
 1	1	RC9_MIN	1100	4
 1	1	RC9_REVERSED	0	2
 1	1	RC9_TRIM	1500	4
-1	1	RC_OPTIONS	32	6
+1	1	RC_OPTIONS	0	6
 1	1	RC_OVERRIDE_TIME	3.000000000000000000	9
-1	1	RC_PROTOCOLS	1	6
 1	1	RC_SPEED	200	4
-1	1	RELAY1_DEFAULT	0	2
-1	1	RELAY1_FUNCTION	1	2
-1	1	RELAY1_INVERTED	0	2
-1	1	RELAY1_PIN	13	4
-1	1	RELAY2_FUNCTION	0	2
-1	1	RELAY3_FUNCTION	0	2
-1	1	RELAY4_FUNCTION	0	2
-1	1	RELAY5_FUNCTION	0	2
-1	1	RELAY6_FUNCTION	0	2
+1	1	RELAY_DEFAULT	0	2
+1	1	RELAY_PIN	54	2
+1	1	RELAY_PIN2	55	2
+1	1	RELAY_PIN3	-1	2
+1	1	RELAY_PIN4	-1	2
+1	1	RELAY_PIN5	-1	2
+1	1	RELAY_PIN6	-1	2
 1	1	RNGFND1_ADDR	0	2
 1	1	RNGFND1_FUNCTION	0	2
 1	1	RNGFND1_GNDCLEAR	10	2
-1	1	RNGFND1_MAX_CM	3000	4
+1	1	RNGFND1_MAX_CM	700	4
 1	1	RNGFND1_MIN_CM	20	4
 1	1	RNGFND1_OFFSET	0.000000000000000000	9
 1	1	RNGFND1_ORIENT	25	2
-1	1	RNGFND1_PIN	0	2
+1	1	RNGFND1_PIN	-1	2
 1	1	RNGFND1_POS_X	0.000000000000000000	9
 1	1	RNGFND1_POS_Y	0.000000000000000000	9
 1	1	RNGFND1_POS_Z	0.000000000000000000	9
 1	1	RNGFND1_PWRRNG	0	4
 1	1	RNGFND1_RMETRIC	1	2
-1	1	RNGFND1_SCALING	12.119999885559082031	9
+1	1	RNGFND1_SCALING	3.000000000000000000	9
 1	1	RNGFND1_STOP_PIN	-1	2
-1	1	RNGFND1_TYPE	1	2
+1	1	RNGFND1_TYPE	10	2
+1	1	RNGFND2_ADDR	0	2
+1	1	RNGFND2_FUNCTION	0	2
+1	1	RNGFND2_GNDCLEAR	10	2
+1	1	RNGFND2_MAX_CM	700	4
+1	1	RNGFND2_MIN_CM	20	4
+1	1	RNGFND2_OFFSET	0.000000000000000000	9
+1	1	RNGFND2_ORIENT	25	2
+1	1	RNGFND2_PIN	-1	2
+1	1	RNGFND2_POS_X	0.000000000000000000	9
+1	1	RNGFND2_POS_Y	0.000000000000000000	9
+1	1	RNGFND2_POS_Z	0.000000000000000000	9
+1	1	RNGFND2_PWRRNG	0	4
+1	1	RNGFND2_RMETRIC	1	2
+1	1	RNGFND2_SCALING	3.000000000000000000	9
+1	1	RNGFND2_STOP_PIN	-1	2
 1	1	RNGFND2_TYPE	0	2
+1	1	RNGFND3_ADDR	0	2
+1	1	RNGFND3_FUNCTION	0	2
+1	1	RNGFND3_GNDCLEAR	10	2
+1	1	RNGFND3_MAX_CM	700	4
+1	1	RNGFND3_MIN_CM	20	4
+1	1	RNGFND3_OFFSET	0.000000000000000000	9
+1	1	RNGFND3_ORIENT	25	2
+1	1	RNGFND3_PIN	-1	2
+1	1	RNGFND3_POS_X	0.000000000000000000	9
+1	1	RNGFND3_POS_Y	0.000000000000000000	9
+1	1	RNGFND3_POS_Z	0.000000000000000000	9
+1	1	RNGFND3_PWRRNG	0	4
+1	1	RNGFND3_RMETRIC	1	2
+1	1	RNGFND3_SCALING	3.000000000000000000	9
+1	1	RNGFND3_STOP_PIN	-1	2
 1	1	RNGFND3_TYPE	0	2
+1	1	RNGFND4_ADDR	0	2
+1	1	RNGFND4_FUNCTION	0	2
+1	1	RNGFND4_GNDCLEAR	10	2
+1	1	RNGFND4_MAX_CM	700	4
+1	1	RNGFND4_MIN_CM	20	4
+1	1	RNGFND4_OFFSET	0.000000000000000000	9
+1	1	RNGFND4_ORIENT	25	2
+1	1	RNGFND4_PIN	-1	2
+1	1	RNGFND4_POS_X	0.000000000000000000	9
+1	1	RNGFND4_POS_Y	0.000000000000000000	9
+1	1	RNGFND4_POS_Z	0.000000000000000000	9
+1	1	RNGFND4_PWRRNG	0	4
+1	1	RNGFND4_RMETRIC	1	2
+1	1	RNGFND4_SCALING	3.000000000000000000	9
+1	1	RNGFND4_STOP_PIN	-1	2
 1	1	RNGFND4_TYPE	0	2
+1	1	RNGFND5_ADDR	0	2
+1	1	RNGFND5_FUNCTION	0	2
+1	1	RNGFND5_GNDCLEAR	10	2
+1	1	RNGFND5_MAX_CM	700	4
+1	1	RNGFND5_MIN_CM	20	4
+1	1	RNGFND5_OFFSET	0.000000000000000000	9
+1	1	RNGFND5_ORIENT	25	2
+1	1	RNGFND5_PIN	-1	2
+1	1	RNGFND5_POS_X	0.000000000000000000	9
+1	1	RNGFND5_POS_Y	0.000000000000000000	9
+1	1	RNGFND5_POS_Z	0.000000000000000000	9
+1	1	RNGFND5_PWRRNG	0	4
+1	1	RNGFND5_RMETRIC	1	2
+1	1	RNGFND5_SCALING	3.000000000000000000	9
+1	1	RNGFND5_STOP_PIN	-1	2
 1	1	RNGFND5_TYPE	0	2
+1	1	RNGFND6_ADDR	0	2
+1	1	RNGFND6_FUNCTION	0	2
+1	1	RNGFND6_GNDCLEAR	10	2
+1	1	RNGFND6_MAX_CM	700	4
+1	1	RNGFND6_MIN_CM	20	4
+1	1	RNGFND6_OFFSET	0.000000000000000000	9
+1	1	RNGFND6_ORIENT	25	2
+1	1	RNGFND6_PIN	-1	2
+1	1	RNGFND6_POS_X	0.000000000000000000	9
+1	1	RNGFND6_POS_Y	0.000000000000000000	9
+1	1	RNGFND6_POS_Z	0.000000000000000000	9
+1	1	RNGFND6_PWRRNG	0	4
+1	1	RNGFND6_RMETRIC	1	2
+1	1	RNGFND6_SCALING	3.000000000000000000	9
+1	1	RNGFND6_STOP_PIN	-1	2
 1	1	RNGFND6_TYPE	0	2
+1	1	RNGFND7_ADDR	0	2
+1	1	RNGFND7_FUNCTION	0	2
+1	1	RNGFND7_GNDCLEAR	10	2
+1	1	RNGFND7_MAX_CM	700	4
+1	1	RNGFND7_MIN_CM	20	4
+1	1	RNGFND7_OFFSET	0.000000000000000000	9
+1	1	RNGFND7_ORIENT	25	2
+1	1	RNGFND7_PIN	-1	2
+1	1	RNGFND7_POS_X	0.000000000000000000	9
+1	1	RNGFND7_POS_Y	0.000000000000000000	9
+1	1	RNGFND7_POS_Z	0.000000000000000000	9
+1	1	RNGFND7_PWRRNG	0	4
+1	1	RNGFND7_RMETRIC	1	2
+1	1	RNGFND7_SCALING	3.000000000000000000	9
+1	1	RNGFND7_STOP_PIN	-1	2
 1	1	RNGFND7_TYPE	0	2
+1	1	RNGFND8_ADDR	0	2
+1	1	RNGFND8_FUNCTION	0	2
+1	1	RNGFND8_GNDCLEAR	10	2
+1	1	RNGFND8_MAX_CM	700	4
+1	1	RNGFND8_MIN_CM	20	4
+1	1	RNGFND8_OFFSET	0.000000000000000000	9
+1	1	RNGFND8_ORIENT	25	2
+1	1	RNGFND8_PIN	-1	2
+1	1	RNGFND8_POS_X	0.000000000000000000	9
+1	1	RNGFND8_POS_Y	0.000000000000000000	9
+1	1	RNGFND8_POS_Z	0.000000000000000000	9
+1	1	RNGFND8_PWRRNG	0	4
+1	1	RNGFND8_RMETRIC	1	2
+1	1	RNGFND8_SCALING	3.000000000000000000	9
+1	1	RNGFND8_STOP_PIN	-1	2
 1	1	RNGFND8_TYPE	0	2
+1	1	RNGFND9_ADDR	0	2
+1	1	RNGFND9_FUNCTION	0	2
+1	1	RNGFND9_GNDCLEAR	10	2
+1	1	RNGFND9_MAX_CM	700	4
+1	1	RNGFND9_MIN_CM	20	4
+1	1	RNGFND9_OFFSET	0.000000000000000000	9
+1	1	RNGFND9_ORIENT	25	2
+1	1	RNGFND9_PIN	-1	2
+1	1	RNGFND9_POS_X	0.000000000000000000	9
+1	1	RNGFND9_POS_Y	0.000000000000000000	9
+1	1	RNGFND9_POS_Z	0.000000000000000000	9
+1	1	RNGFND9_PWRRNG	0	4
+1	1	RNGFND9_RMETRIC	1	2
+1	1	RNGFND9_SCALING	3.000000000000000000	9
+1	1	RNGFND9_STOP_PIN	-1	2
 1	1	RNGFND9_TYPE	0	2
+1	1	RNGFNDA_ADDR	0	2
+1	1	RNGFNDA_FUNCTION	0	2
+1	1	RNGFNDA_GNDCLEAR	10	2
+1	1	RNGFNDA_MAX_CM	700	4
+1	1	RNGFNDA_MIN_CM	20	4
+1	1	RNGFNDA_OFFSET	0.000000000000000000	9
+1	1	RNGFNDA_ORIENT	25	2
+1	1	RNGFNDA_PIN	-1	2
+1	1	RNGFNDA_POS_X	0.000000000000000000	9
+1	1	RNGFNDA_POS_Y	0.000000000000000000	9
+1	1	RNGFNDA_POS_Z	0.000000000000000000	9
+1	1	RNGFNDA_PWRRNG	0	4
+1	1	RNGFNDA_RMETRIC	1	2
+1	1	RNGFNDA_SCALING	3.000000000000000000	9
+1	1	RNGFNDA_STOP_PIN	-1	2
 1	1	RNGFNDA_TYPE	0	2
-1	1	RNGFND_SQ_MIN	90	2
-1	1	RPM1_TYPE	0	2
-1	1	RPM2_TYPE	0	2
+1	1	RNGFND_GAIN	0.800000011920928955	9
 1	1	SCHED_DEBUG	0	2
 1	1	SCHED_LOOP_RATE	400	4
-1	1	SCHED_OPTIONS	0	2
 1	1	SCR_ENABLE	0	2
 1	1	SERIAL0_BAUD	115	6
 1	1	SERIAL0_PROTOCOL	2	2
 1	1	SERIAL1_BAUD	57	6
 1	1	SERIAL1_OPTIONS	0	4
-1	1	SERIAL1_PROTOCOL	2	2
+1	1	SERIAL1_PROTOCOL	1	2
 1	1	SERIAL2_BAUD	57	6
 1	1	SERIAL2_OPTIONS	0	4
-1	1	SERIAL2_PROTOCOL	2	2
-1	1	SERIAL3_BAUD	230	6
+1	1	SERIAL2_PROTOCOL	1	2
+1	1	SERIAL3_BAUD	38	6
 1	1	SERIAL3_OPTIONS	0	4
 1	1	SERIAL3_PROTOCOL	5	2
-1	1	SERIAL4_BAUD	230	6
+1	1	SERIAL4_BAUD	38	6
 1	1	SERIAL4_OPTIONS	0	4
 1	1	SERIAL4_PROTOCOL	5	2
 1	1	SERIAL5_BAUD	57	6
 1	1	SERIAL5_OPTIONS	0	4
-1	1	SERIAL5_PROTOCOL	-1	2
-1	1	SERIAL6_BAUD	57	6
+1	1	SERIAL5_PROTOCOL	1	2
+1	1	SERIAL6_BAUD	115200	6
 1	1	SERIAL6_OPTIONS	0	4
-1	1	SERIAL6_PROTOCOL	-1	2
-1	1	SERIAL7_BAUD	57	6
-1	1	SERIAL7_OPTIONS	0	4
-1	1	SERIAL7_PROTOCOL	-1	2
+1	1	SERIAL6_PROTOCOL	22	2
 1	1	SERIAL_PASS1	0	2
 1	1	SERIAL_PASS2	-1	2
 1	1	SERIAL_PASSTIMO	15	2
-1	1	SERVO10_FUNCTION	7	4
+1	1	SERVO10_FUNCTION	0	4
 1	1	SERVO10_MAX	1900	4
 1	1	SERVO10_MIN	1100	4
 1	1	SERVO10_REVERSED	0	2
@@ -907,480 +858,73 @@
 1	1	SERVO7_MIN	1100	4
 1	1	SERVO7_REVERSED	0	2
 1	1	SERVO7_TRIM	1500	4
-1	1	SERVO8_FUNCTION	7	4
+1	1	SERVO8_FUNCTION	0	4
 1	1	SERVO8_MAX	1900	4
 1	1	SERVO8_MIN	1100	4
 1	1	SERVO8_REVERSED	0	2
 1	1	SERVO8_TRIM	1500	4
-1	1	SERVO9_FUNCTION	59	4
+1	1	SERVO9_FUNCTION	0	4
 1	1	SERVO9_MAX	1900	4
 1	1	SERVO9_MIN	1100	4
 1	1	SERVO9_REVERSED	0	2
 1	1	SERVO9_TRIM	1500	4
-1	1	SERVO_32_ENABLE	0	2
-1	1	SERVO_DSHOT_ESC	0	2
-1	1	SERVO_DSHOT_RATE	0	2
-1	1	SERVO_FTW_MASK	0	6
-1	1	SERVO_FTW_POLES	14	2
-1	1	SERVO_FTW_RVMASK	0	6
-1	1	SERVO_GPIO_MASK	0	6
+1	1	SERVO_BLH_DEBUG	0	2
+1	1	SERVO_BLH_MASK	0	6
+1	1	SERVO_BLH_OTYPE	0	2
+1	1	SERVO_BLH_POLES	14	2
+1	1	SERVO_BLH_PORT	0	2
+1	1	SERVO_BLH_REMASK	0	6
+1	1	SERVO_BLH_TEST	0	2
+1	1	SERVO_BLH_TMOUT	0	4
+1	1	SERVO_BLH_TRATE	10	4
 1	1	SERVO_RATE	50	4
-1	1	SERVO_RC_FS_MSK	0	6
 1	1	SERVO_ROB_POSMAX	4095	6
 1	1	SERVO_ROB_POSMIN	0	6
 1	1	SERVO_SBUS_RATE	50	4
 1	1	SERVO_VOLZ_MASK	0	6
-1	1	SERVO_VOLZ_RANGE	200	4
-1	1	SIM_ACC1_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC1_RND	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC1_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC2_RND	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC2_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_X	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_ACC3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_ACC3_RND	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_X	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Y	0.000000000000000000	9
-1	1	SIM_ACC3_SCAL_Z	0.000000000000000000	9
-1	1	SIM_ACCEL1_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL2_FAIL	0.000000000000000000	9
-1	1	SIM_ACCEL3_FAIL	0.000000000000000000	9
-1	1	SIM_ACC_FAIL_MSK	0	2
-1	1	SIM_ACC_FILE_RW	0	2
-1	1	SIM_ACC_TRIM_X	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Y	0.000000000000000000	9
-1	1	SIM_ACC_TRIM_Z	0.000000000000000000	9
-1	1	SIM_ADSB_ALT	1000.000000000000000000	9
-1	1	SIM_ADSB_COUNT	-1	4
-1	1	SIM_ADSB_RADIUS	10000.000000000000000000	9
-1	1	SIM_ADSB_TX	0	2
-1	1	SIM_ADSB_TYPES	1	2
-1	1	SIM_ARSPD2_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD2_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD2_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD2_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD2_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD2_RND	2.000000000000000000	9
-1	1	SIM_ARSPD2_SIGN	0	2
-1	1	SIM_ARSPD_FAIL	0.000000000000000000	9
-1	1	SIM_ARSPD_FAILP	0.000000000000000000	9
-1	1	SIM_ARSPD_OFS	2013.000000000000000000	9
-1	1	SIM_ARSPD_PITOT	0.000000000000000000	9
-1	1	SIM_ARSPD_RATIO	1.990000009536743164	9
-1	1	SIM_ARSPD_RND	2.000000000000000000	9
-1	1	SIM_ARSPD_SIGN	0	2
-1	1	SIM_BAR2_DELAY	0	4
-1	1	SIM_BAR2_DISABLE	0	2
-1	1	SIM_BAR2_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR2_FREEZE	0	2
-1	1	SIM_BAR2_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR2_RND	0.200000002980232239	9
-1	1	SIM_BAR2_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR2_WCF_UP	0.000000000000000000	9
-1	1	SIM_BAR3_DELAY	0	4
-1	1	SIM_BAR3_DISABLE	0	2
-1	1	SIM_BAR3_DRIFT	0.000000000000000000	9
-1	1	SIM_BAR3_FREEZE	0	2
-1	1	SIM_BAR3_GLITCH	0.000000000000000000	9
-1	1	SIM_BAR3_RND	0.200000002980232239	9
-1	1	SIM_BAR3_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_DN	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BAR3_WCF_UP	0.000000000000000000	9
-1	1	SIM_BARO_COUNT	2	2
-1	1	SIM_BARO_DELAY	0	4
-1	1	SIM_BARO_DISABLE	0	2
-1	1	SIM_BARO_DRIFT	0.000000000000000000	9
-1	1	SIM_BARO_FREEZE	0	2
-1	1	SIM_BARO_GLITCH	0.000000000000000000	9
-1	1	SIM_BARO_RND	0.019999999552965164	9
-1	1	SIM_BARO_WCF_BAK	0.000000000000000000	9
-1	1	SIM_BARO_WCF_DN	0.000000000000000000	9
-1	1	SIM_BARO_WCF_FWD	0.000000000000000000	9
-1	1	SIM_BARO_WCF_LFT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_RGT	0.000000000000000000	9
-1	1	SIM_BARO_WCF_UP	0.000000000000000000	9
-1	1	SIM_BATT_CAP_AH	0.000000000000000000	9
-1	1	SIM_BATT_VOLTAGE	12.600000381469726563	9
-1	1	SIM_BAUDLIMIT_EN	0	2
-1	1	SIM_BUOYANCY	1.000000000000000000	9
-1	1	SIM_CAN_SRV_MSK	0	6
-1	1	SIM_CAN_TYPE1	1	2
-1	1	SIM_CAN_TYPE2	1	2
-1	1	SIM_CLAMP_CH	0	2
-1	1	SIM_DRIFT_SPEED	0.050000000745058060	9
-1	1	SIM_DRIFT_TIME	5.000000000000000000	9
-1	1	SIM_EFI_TYPE	0	2
-1	1	SIM_ENGINE_FAIL	0	2
-1	1	SIM_ENGINE_MUL	1.000000000000000000	9
-1	1	SIM_ESC_ARM_RPM	0.000000000000000000	9
-1	1	SIM_ESC_TELEM	1	2
-1	1	SIM_FLOAT_EXCEPT	1	2
-1	1	SIM_FLOW_DELAY	0	2
-1	1	SIM_FLOW_ENABLE	0	2
-1	1	SIM_FLOW_POS_X	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Y	0.000000000000000000	9
-1	1	SIM_FLOW_POS_Z	0.000000000000000000	9
-1	1	SIM_FLOW_RATE	10	4
-1	1	SIM_FLOW_RND	0.050000000745058060	9
-1	1	SIM_FTOWESC_ENA	0	2
-1	1	SIM_FTOWESC_POW	4095	6
-1	1	SIM_GND_BEHAV	-1	2
-1	1	SIM_GPS2_ACC	0.300000011920928955	9
-1	1	SIM_GPS2_ALT_OFS	0	4
-1	1	SIM_GPS2_BYTELOS	0.000000000000000000	9
-1	1	SIM_GPS2_DISABLE	1	2
-1	1	SIM_GPS2_DRFTALT	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_X	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Y	0.000000000000000000	9
-1	1	SIM_GPS2_GLTCH_Z	0.000000000000000000	9
-1	1	SIM_GPS2_HDG	0	2
-1	1	SIM_GPS2_HZ	5	2
-1	1	SIM_GPS2_JAM	0	2
-1	1	SIM_GPS2_LAG_MS	100	4
-1	1	SIM_GPS2_LCKTIME	0	4
-1	1	SIM_GPS2_NOISE	0.000000000000000000	9
-1	1	SIM_GPS2_NUMSATS	10	2
-1	1	SIM_GPS2_POS_X	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS2_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS2_TYPE	1	2
-1	1	SIM_GPS2_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS2_VERR_Z	0.000000000000000000	9
-1	1	SIM_GPS_ACC	0.300000011920928955	9
-1	1	SIM_GPS_ALT_OFS	0	4
-1	1	SIM_GPS_BYTELOSS	0.000000000000000000	9
-1	1	SIM_GPS_DISABLE	0	2
-1	1	SIM_GPS_DRIFTALT	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_X	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Y	0.000000000000000000	9
-1	1	SIM_GPS_GLITCH_Z	0.000000000000000000	9
-1	1	SIM_GPS_HDG	0	2
-1	1	SIM_GPS_HZ	5	2
-1	1	SIM_GPS_JAM	0	2
-1	1	SIM_GPS_LAG_MS	100	4
-1	1	SIM_GPS_LOCKTIME	0	4
-1	1	SIM_GPS_LOG_NUM	0	4
-1	1	SIM_GPS_NOISE	0.000000000000000000	9
-1	1	SIM_GPS_NUMSATS	10	2
-1	1	SIM_GPS_POS_X	0.000000000000000000	9
-1	1	SIM_GPS_POS_Y	0.000000000000000000	9
-1	1	SIM_GPS_POS_Z	0.000000000000000000	9
-1	1	SIM_GPS_TYPE	1	2
-1	1	SIM_GPS_VERR_X	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Y	0.000000000000000000	9
-1	1	SIM_GPS_VERR_Z	0.000000000000000000	9
-1	1	SIM_GRPE_ENABLE	0	2
-1	1	SIM_GRPE_PIN	-1	2
-1	1	SIM_GRPS_ENABLE	0	2
-1	1	SIM_GRPS_GRAB	2000	4
-1	1	SIM_GRPS_PIN	-1	2
-1	1	SIM_GRPS_RELEASE	1000	4
-1	1	SIM_GRPS_REVERSE	0	2
-1	1	SIM_GYR1_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR1_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR1_RND	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR1_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR2_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR2_RND	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR2_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_X	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Y	0.000000000000000000	9
-1	1	SIM_GYR3_BIAS_Z	0.000000000000000000	9
-1	1	SIM_GYR3_RND	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_X	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Y	0.000000000000000000	9
-1	1	SIM_GYR3_SCALE_Z	0.000000000000000000	9
-1	1	SIM_GYR_FAIL_MSK	0	2
-1	1	SIM_GYR_FILE_RW	0	2
-1	1	SIM_IE24_ENABLE	0	2
-1	1	SIM_IE24_ERROR	0	6
-1	1	SIM_IE24_STATE	-1	2
-1	1	SIM_IMUT1_ENABLE	0	2
-1	1	SIM_IMUT2_ENABLE	0	2
-1	1	SIM_IMUT3_ENABLE	0	2
-1	1	SIM_IMUT_END	45.000000000000000000	9
-1	1	SIM_IMUT_FIXED	0.000000000000000000	9
-1	1	SIM_IMUT_START	25.000000000000000000	9
-1	1	SIM_IMUT_TCONST	300.000000000000000000	9
-1	1	SIM_IMU_COUNT	2	2
-1	1	SIM_IMU_ORIENT	0	2
-1	1	SIM_IMU_POS_X	0.000000000000000000	9
-1	1	SIM_IMU_POS_Y	0.000000000000000000	9
-1	1	SIM_IMU_POS_Z	0.000000000000000000	9
-1	1	SIM_INIT_ALT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LAT_OFS	0.000000000000000000	9
-1	1	SIM_INIT_LON_OFS	0.000000000000000000	9
-1	1	SIM_INS_THR_MIN	0.100000001490116119	9
-1	1	SIM_JSON_MASTER	0	2
-1	1	SIM_LED_LAYOUT	0	2
-1	1	SIM_LOOP_DELAY	0	6
-1	1	SIM_MAG1_DEVID	97539	6
-1	1	SIM_MAG1_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG1_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG1_FAIL	0	2
-1	1	SIM_MAG1_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG1_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG1_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG1_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG1_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG1_ORIENT	0	2
-1	1	SIM_MAG1_SCALING	1.000000000000000000	9
-1	1	SIM_MAG2_DEVID	131874	6
-1	1	SIM_MAG2_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG2_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG2_FAIL	0	2
-1	1	SIM_MAG2_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG2_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG2_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG2_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG2_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG2_ORIENT	0	2
-1	1	SIM_MAG2_SCALING	1.000000000000000000	9
-1	1	SIM_MAG3_DEVID	263178	6
-1	1	SIM_MAG3_DIA_X	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Y	0.000000000000000000	9
-1	1	SIM_MAG3_DIA_Z	0.000000000000000000	9
-1	1	SIM_MAG3_FAIL	0	2
-1	1	SIM_MAG3_ODI_X	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Y	0.000000000000000000	9
-1	1	SIM_MAG3_ODI_Z	0.000000000000000000	9
-1	1	SIM_MAG3_OFS_X	5.000000000000000000	9
-1	1	SIM_MAG3_OFS_Y	13.000000000000000000	9
-1	1	SIM_MAG3_OFS_Z	-18.000000000000000000	9
-1	1	SIM_MAG3_ORIENT	0	2
-1	1	SIM_MAG3_SCALING	1.000000000000000000	9
-1	1	SIM_MAG4_DEVID	97283	6
-1	1	SIM_MAG5_DEVID	97795	6
-1	1	SIM_MAG6_DEVID	98051	6
-1	1	SIM_MAG7_DEVID	0	6
-1	1	SIM_MAG8_DEVID	0	6
-1	1	SIM_MAG_ALY_HGT	1.000000000000000000	9
-1	1	SIM_MAG_ALY_X	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Y	0.000000000000000000	9
-1	1	SIM_MAG_ALY_Z	0.000000000000000000	9
-1	1	SIM_MAG_DELAY	0	4
-1	1	SIM_MAG_MOT_X	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Y	0.000000000000000000	9
-1	1	SIM_MAG_MOT_Z	0.000000000000000000	9
-1	1	SIM_MAG_RND	0.000000000000000000	9
-1	1	SIM_MAG_SAVE_IDS	1	2
-1	1	SIM_ODOM_ENABLE	0	2
-1	1	SIM_OH_MASK	0	6
-1	1	SIM_OH_RELAY_MSK	-1	4
-1	1	SIM_OPOS_ALT	584.000000000000000000	9
-1	1	SIM_OPOS_HDG	353.000000000000000000	9
-1	1	SIM_OPOS_LAT	-35.363262176513671875	9
-1	1	SIM_OPOS_LNG	149.165237426757812500	9
-1	1	SIM_PARA_ENABLE	0	2
-1	1	SIM_PARA_PIN	-1	2
-1	1	SIM_PIN_MASK	0	4
-1	1	SIM_PLD_ALT_LMT	15.000000000000000000	9
-1	1	SIM_PLD_DIST_LMT	10.000000000000000000	9
-1	1	SIM_PLD_ENABLE	0	2
-1	1	SIM_PLD_HEIGHT	0.000000000000000000	9
-1	1	SIM_PLD_LAT	0.000000000000000000	9
-1	1	SIM_PLD_LON	0.000000000000000000	9
-1	1	SIM_PLD_OPTIONS	0	2
-1	1	SIM_PLD_ORIENT	24	2
-1	1	SIM_PLD_RATE	100	6
-1	1	SIM_PLD_SHIP	0	2
-1	1	SIM_PLD_TYPE	0	2
-1	1	SIM_PLD_YAW	0	4
-1	1	SIM_RATE_HZ	1200	4
-1	1	SIM_RC_CHANCOUNT	16	2
-1	1	SIM_RC_FAIL	0	2
-1	1	SIM_RICH_CTRL	-1	2
-1	1	SIM_RICH_ENABLE	0	2
-1	1	SIM_SERVO_DELAY	0.000000000000000000	9
-1	1	SIM_SERVO_FILTER	0.000000000000000000	9
-1	1	SIM_SERVO_SPEED	0.140000000596046448	9
-1	1	SIM_SHIP_DSIZE	10.000000000000000000	9
-1	1	SIM_SHIP_ENABLE	0	2
-1	1	SIM_SHIP_OFS_X	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Y	0.000000000000000000	9
-1	1	SIM_SHIP_OFS_Z	0.000000000000000000	9
-1	1	SIM_SHIP_PSIZE	1000.000000000000000000	9
-1	1	SIM_SHIP_SPEED	3.000000000000000000	9
-1	1	SIM_SHIP_SYSID	17	2
-1	1	SIM_SHOVE_TIME	0	6
-1	1	SIM_SHOVE_X	0.000000000000000000	9
-1	1	SIM_SHOVE_Y	0.000000000000000000	9
-1	1	SIM_SHOVE_Z	0.000000000000000000	9
-1	1	SIM_SLUP_ENABLE	0	2
-1	1	SIM_SONAR_GLITCH	0.000000000000000000	9
-1	1	SIM_SONAR_POS_X	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Y	0.000000000000000000	9
-1	1	SIM_SONAR_POS_Z	0.000000000000000000	9
-1	1	SIM_SONAR_RND	0.000000000000000000	9
-1	1	SIM_SONAR_ROT	25	2
-1	1	SIM_SONAR_SCALE	12.121199607849121094	9
-1	1	SIM_SPEEDUP	1.000000000000000000	9
-1	1	SIM_SPR_ENABLE	0	2
-1	1	SIM_SPR_PUMP	-1	2
-1	1	SIM_SPR_SPIN	-1	2
-1	1	SIM_TA_ENABLE	1	2
-1	1	SIM_TEMP_BFACTOR	0.000000000000000000	9
-1	1	SIM_TEMP_BRD_OFF	20.000000000000000000	9
-1	1	SIM_TEMP_START	25.000000000000000000	9
-1	1	SIM_TEMP_TCONST	30.000000000000000000	9
-1	1	SIM_TERRAIN	1	2
-1	1	SIM_THML_SCENARI	0	2
-1	1	SIM_TIDE_DIR	0.000000000000000000	9
-1	1	SIM_TIDE_SPEED	0.000000000000000000	9
-1	1	SIM_TIME_JITTER	0	4
-1	1	SIM_TWIST_TIME	0	6
-1	1	SIM_TWIST_X	0.000000000000000000	9
-1	1	SIM_TWIST_Y	0.000000000000000000	9
-1	1	SIM_TWIST_Z	0.000000000000000000	9
-1	1	SIM_UART_LOSS	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_X	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Y	0.000000000000000000	9
-1	1	SIM_VIB_FREQ_Z	0.000000000000000000	9
-1	1	SIM_VIB_MOT_HMNC	1	4
-1	1	SIM_VIB_MOT_MASK	0	6
-1	1	SIM_VIB_MOT_MAX	0.000000000000000000	9
-1	1	SIM_VIB_MOT_MULT	1.000000000000000000	9
-1	1	SIM_VICON_FAIL	0	2
-1	1	SIM_VICON_GLIT_X	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Y	0.000000000000000000	9
-1	1	SIM_VICON_GLIT_Z	0.000000000000000000	9
-1	1	SIM_VICON_POS_X	0.000000000000000000	9
-1	1	SIM_VICON_POS_Y	0.000000000000000000	9
-1	1	SIM_VICON_POS_Z	0.000000000000000000	9
-1	1	SIM_VICON_TMASK	3	2
-1	1	SIM_VICON_VGLI_X	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Y	0.000000000000000000	9
-1	1	SIM_VICON_VGLI_Z	0.000000000000000000	9
-1	1	SIM_VICON_YAW	0	4
-1	1	SIM_VICON_YAWERR	0	4
-1	1	SIM_WAVE_AMP	0.500000000000000000	9
-1	1	SIM_WAVE_DIR	0.000000000000000000	9
-1	1	SIM_WAVE_ENABLE	0	2
-1	1	SIM_WAVE_LENGTH	10.000000000000000000	9
-1	1	SIM_WAVE_SPEED	0.500000000000000000	9
-1	1	SIM_WIND_DIR	180.000000000000000000	9
-1	1	SIM_WIND_DIR_Z	0.000000000000000000	9
-1	1	SIM_WIND_SPD	0.000000000000000000	9
-1	1	SIM_WIND_T	0	2
-1	1	SIM_WIND_TC	5.000000000000000000	9
-1	1	SIM_WIND_TURB	0.000000000000000000	9
-1	1	SIM_WIND_T_ALT	60.000000000000000000	9
-1	1	SIM_WIND_T_COEF	0.009999999776482582	9
-1	1	SIM_WOW_PIN	-1	2
-1	1	SR0_EXTRA1	4	4
-1	1	SR0_EXTRA2	4	4
-1	1	SR0_EXTRA3	4	4
-1	1	SR0_EXT_STAT	4	4
+1	1	SR0_EXTRA1	0	4
+1	1	SR0_EXTRA2	0	4
+1	1	SR0_EXTRA3	0	4
+1	1	SR0_EXT_STAT	0	4
 1	1	SR0_PARAMS	0	4
-1	1	SR0_POSITION	4	4
-1	1	SR0_RAW_SENS	4	4
-1	1	SR0_RC_CHAN	4	4
-1	1	SR1_EXTRA1	10	4
-1	1	SR1_EXTRA2	10	4
-1	1	SR1_EXTRA3	3	4
-1	1	SR1_EXT_STAT	2	4
+1	1	SR0_POSITION	0	4
+1	1	SR0_RAW_SENS	2	4
+1	1	SR0_RC_CHAN	0	4
+1	1	SR1_EXTRA1	0	4
+1	1	SR1_EXTRA2	0	4
+1	1	SR1_EXTRA3	0	4
+1	1	SR1_EXT_STAT	0	4
 1	1	SR1_PARAMS	0	4
-1	1	SR1_POSITION	3	4
-1	1	SR1_RAW_SENS	2	4
-1	1	SR1_RC_CHAN	2	4
-1	1	SR2_EXTRA1	10	4
-1	1	SR2_EXTRA2	10	4
-1	1	SR2_EXTRA3	3	4
-1	1	SR2_EXT_STAT	2	4
+1	1	SR1_POSITION	0	4
+1	1	SR1_RAW_SENS	0	4
+1	1	SR1_RC_CHAN	0	4
+1	1	SR2_EXTRA1	0	4
+1	1	SR2_EXTRA2	0	4
+1	1	SR2_EXTRA3	0	4
+1	1	SR2_EXT_STAT	0	4
 1	1	SR2_PARAMS	0	4
-1	1	SR2_POSITION	3	4
-1	1	SR2_RAW_SENS	2	4
-1	1	SR2_RC_CHAN	2	4
-1	1	SR3_EXTRA1	10	4
-1	1	SR3_EXTRA2	10	4
-1	1	SR3_EXTRA3	3	4
-1	1	SR3_EXT_STAT	2	4
+1	1	SR2_POSITION	0	4
+1	1	SR2_RAW_SENS	0	4
+1	1	SR2_RC_CHAN	0	4
+1	1	SR3_EXTRA1	0	4
+1	1	SR3_EXTRA2	0	4
+1	1	SR3_EXTRA3	0	4
+1	1	SR3_EXT_STAT	0	4
 1	1	SR3_PARAMS	0	4
-1	1	SR3_POSITION	3	4
-1	1	SR3_RAW_SENS	2	4
-1	1	SR3_RC_CHAN	2	4
-1	1	SR4_EXTRA1	10	4
-1	1	SR4_EXTRA2	10	4
-1	1	SR4_EXTRA3	3	4
-1	1	SR4_EXT_STAT	2	4
-1	1	SR4_PARAMS	0	4
-1	1	SR4_POSITION	3	4
-1	1	SR4_RAW_SENS	2	4
-1	1	SR4_RC_CHAN	2	4
-1	1	SR5_EXTRA1	10	4
-1	1	SR5_EXTRA2	10	4
-1	1	SR5_EXTRA3	3	4
-1	1	SR5_EXT_STAT	2	4
-1	1	SR5_PARAMS	0	4
-1	1	SR5_POSITION	3	4
-1	1	SR5_RAW_SENS	2	4
-1	1	SR5_RC_CHAN	2	4
-1	1	SR6_EXTRA1	10	4
-1	1	SR6_EXTRA2	10	4
-1	1	SR6_EXTRA3	3	4
-1	1	SR6_EXT_STAT	2	4
-1	1	SR6_PARAMS	0	4
-1	1	SR6_POSITION	3	4
-1	1	SR6_RAW_SENS	2	4
-1	1	SR6_RC_CHAN	2	4
-1	1	STAT_BOOTCNT	1	4
-1	1	STAT_FLTTIME	0	6
-1	1	STAT_RESET	1	6
-1	1	STAT_RUNTIME	60	6
+1	1	SR3_POSITION	0	4
+1	1	SR3_RAW_SENS	0	4
+1	1	SR3_RC_CHAN	0	4
 1	1	SURFACE_DEPTH	-10.000000000000000000	9
-1	1	SURFTRAK_DEPTH	-50.000000000000000000	9
 1	1	SYSID_MYGCS	255	4
+1	1	SYSID_SW_MREV	1	4
 1	1	SYSID_THISMAV	1	4
-1	1	TEMP1_ADDR	119	2
-1	1	TEMP1_BUS	1	2
-1	1	TEMP1_SRC	0	2
-1	1	TEMP1_SRC_ID	-1	6
-1	1	TEMP1_TYPE	1	2
-1	1	TEMP2_TYPE	0	2
-1	1	TEMP3_TYPE	0	2
-1	1	TEMP_LOG	0	2
-1	1	TERRAIN_ENABLE	0	2
 1	1	THR_DZ	100	4
-1	1	VISO_TYPE	0	2
-1	1	VTX_ENABLE	0	2
-1	1	WPNAV_ACCEL	250.000000000000000000	9
-1	1	WPNAV_ACCEL_C	0.000000000000000000	9
+1	1	WPNAV_ACCEL	0.000000000000000000	9
 1	1	WPNAV_ACCEL_Z	100.000000000000000000	9
-1	1	WPNAV_JERK	1.000000000000000000	9
 1	1	WPNAV_RADIUS	200.000000000000000000	9
 1	1	WPNAV_RFND_USE	1	2
-1	1	WPNAV_SPEED	100.000000000000000000	9
+1	1	WPNAV_SPEED	500.000000000000000000	9
 1	1	WPNAV_SPEED_DN	150.000000000000000000	9
 1	1	WPNAV_SPEED_UP	250.000000000000000000	9
-1	1	WPNAV_TER_MARGIN	10.000000000000000000	9
 1	1	WP_YAW_BEHAVIOR	4	2
 1	1	XTRACK_ANG_LIM	45	2
diff --git a/src/FirmwarePlugin/CMakeLists.txt b/src/FirmwarePlugin/CMakeLists.txt
index dff0c2525c85..00b68277facb 100644
--- a/src/FirmwarePlugin/CMakeLists.txt
+++ b/src/FirmwarePlugin/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Firmware Plugin Module
+# Provides autopilot-specific firmware handling and communication
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         FirmwarePlugin.cc
@@ -10,5 +15,8 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Firmware-Specific Plugins
+# ----------------------------------------------------------------------------
 add_subdirectory(APM)
 add_subdirectory(PX4)
diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
index efb61c43f70f..73aef0074126 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -22,7 +22,7 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QThread>
 
-QGC_LOGGING_CATEGORY(FirmwarePluginLog, "qgc.firmwareplugin.firmwareplugin")
+QGC_LOGGING_CATEGORY(FirmwarePluginLog, "FirmwarePlugin.FirmwarePlugin")
 
 static const QString guided_mode_not_supported_by_vehicle = QObject::tr("Guided mode not supported by Vehicle.");
 
@@ -203,7 +203,6 @@ const QVariantList &FirmwarePlugin::toolIndicators(const Vehicle*)
     //-- Default list of indicators for all vehicles.
     if (_toolIndicatorList.isEmpty()) {
         _toolIndicatorList = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Controls/FlightModeIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/VehicleGPSIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/TelemetryRSSIIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/RCRSSIIndicator.qml")),
@@ -211,6 +210,8 @@ const QVariantList &FirmwarePlugin::toolIndicators(const Vehicle*)
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/RemoteIDIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/GimbalIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/EscIndicator.qml")),
+            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/JoystickIndicator.qml")),
+            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MultiVehicleSelector.qml")),
 #ifdef QT_DEBUG
             // ControlIndicator is only available in debug builds for the moment
             QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/GCSControlIndicator.qml")),
@@ -221,19 +222,6 @@ const QVariantList &FirmwarePlugin::toolIndicators(const Vehicle*)
     return _toolIndicatorList;
 }
 
-const QVariantList &FirmwarePlugin::modeIndicators(const Vehicle*)
-{
-    //-- Default list of indicators for all vehicles.
-    if (_modeIndicatorList.isEmpty()) {
-        _modeIndicatorList = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/MultiVehicleSelector.qml")),
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/LinkIndicator.qml")),
-        });
-    }
-
-    return _modeIndicatorList;
-}
-
 bool FirmwarePlugin::_armVehicleAndValidate(Vehicle *vehicle) const
 {
     if (vehicle->armed()) {
diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h
index 25d224fd0b3c..a170d517423b 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.h
+++ b/src/FirmwarePlugin/FirmwarePlugin.h
@@ -340,19 +340,13 @@ class FirmwarePlugin : public QObject
     /// Return the resource file which contains the vehicle icon used in the flight view when the view is light (Map for instance)
     virtual QString vehicleImageOutline(const Vehicle* /*vehicle*/) const { return QStringLiteral("/qmlimages/vehicleArrowOutline.svg"); }
 
-    // This is the content item for the expanded portion of the main status indicator
-    virtual QVariant mainStatusIndicatorContentItem(const Vehicle* /*vehicle*/) const { return QVariant(); }
+    virtual QVariant expandedToolbarIndicatorSource(const Vehicle* /*vehicle*/, const QString& /*indicatorName*/) const { return QVariant(); }
 
     /// Returns the list of toolbar tool indicators associated with a vehicle
     ///     signals toolIndicatorsChanged
     /// @return A list of QUrl with the indicators
     virtual const QVariantList &toolIndicators(const Vehicle *vehicle);
 
-    /// Returns the list of toolbar mode indicators associated with a vehicle
-    ///     signals modeIndicatorsChanged
-    /// @return A list of QUrl with the indicators
-    virtual const QVariantList &modeIndicators(const Vehicle *vehicle);
-
     /// Creates vehicle camera manager.
     virtual QGCCameraManager *createCameraManager(Vehicle *vehicle) const;
 
@@ -408,7 +402,6 @@ class FirmwarePlugin : public QObject
 
 signals:
     void toolIndicatorsChanged();
-    void modeIndicatorsChanged();
 
 protected:
     /// Arms the vehicle with validation and retries
diff --git a/src/FirmwarePlugin/FirmwarePluginFactory.cc b/src/FirmwarePlugin/FirmwarePluginFactory.cc
index 235a45d8e999..dea8f53916a2 100644
--- a/src/FirmwarePlugin/FirmwarePluginFactory.cc
+++ b/src/FirmwarePlugin/FirmwarePluginFactory.cc
@@ -13,7 +13,7 @@
 
 #include <QtCore/QGlobalStatic>
 
-QGC_LOGGING_CATEGORY(FirmwarePluginFactoryLog, "qgc.firmwareplugin.firmwarepluginfactory");
+QGC_LOGGING_CATEGORY(FirmwarePluginFactoryLog, "FirmwarePlugin.FirmwarePluginFactory");
 
 /*===========================================================================*/
 
diff --git a/src/FirmwarePlugin/FirmwarePluginManager.cc b/src/FirmwarePlugin/FirmwarePluginManager.cc
index 419c0c9709bd..db7d6913c2c4 100644
--- a/src/FirmwarePlugin/FirmwarePluginManager.cc
+++ b/src/FirmwarePlugin/FirmwarePluginManager.cc
@@ -14,7 +14,7 @@
 
 #include <QtCore/QGlobalStatic>
 
-QGC_LOGGING_CATEGORY(FirmwarePluginManagerLog, "qgc.firmwareplugin.firmwarepluginmanager");
+QGC_LOGGING_CATEGORY(FirmwarePluginManagerLog, "FirmwarePlugin.FirmwarePluginManager");
 
 Q_GLOBAL_STATIC(FirmwarePluginManager, _firmwarePluginManagerInstance);
 
diff --git a/src/FirmwarePlugin/PX4/CMakeLists.txt b/src/FirmwarePlugin/PX4/CMakeLists.txt
index daa603dbbcd4..72563fabbeb8 100644
--- a/src/FirmwarePlugin/PX4/CMakeLists.txt
+++ b/src/FirmwarePlugin/PX4/CMakeLists.txt
@@ -47,7 +47,7 @@ qt_add_qml_module(PX4FirmwareModule
     QML_FILES
         PX4BatteryIndicator.qml
         PX4FlightModeIndicator.qml
-        PX4MainStatusIndicatorContentItem.qml
+        PX4MainStatusIndicator.qml
     NO_PLUGIN
 )
 
diff --git a/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml b/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml
index b04f6bda5858..587f4fa6f421 100644
--- a/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml
+++ b/src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml
@@ -12,48 +12,38 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
+import QGroundControl.FactControls
 
+SettingsGroupLayout {
+    Layout.fillWidth:   true
+    heading:            qsTr("Low Battery Failsafe")
 
+    FactPanelController { id: controller }
 
+    LabelledFactComboBox {
+        label:              qsTr("Vehicle Action")
+        fact:               controller.getParameterFact(-1, "COM_LOW_BAT_ACT")
+        indexModel:         false
+    }
 
-import QGroundControl.FactControls
+    FactSlider {
+        Layout.fillWidth:       true
+        label:                  qsTr("Warning Level")
+        fact:                   controller.getParameterFact(-1, "BAT_LOW_THR")
+        majorTickStepSize:      5
+    }
+
+    FactSlider {
+        Layout.fillWidth:   true
+        label:              qsTr("Critical Level")
+        fact:               controller.getParameterFact(-1, "BAT_CRIT_THR")
+        majorTickStepSize:  5
+    }
 
-BatteryIndicator {
-    waitForParameters: true
-
-    expandedPageComponent: Component {
-        SettingsGroupLayout {
-            Layout.fillWidth:   true
-            heading:            qsTr("Low Battery Failsafe")
-
-            FactPanelController { id: controller }
-
-            LabelledFactComboBox {
-                label:              qsTr("Vehicle Action")
-                fact:               controller.getParameterFact(-1, "COM_LOW_BAT_ACT")
-                indexModel:         false
-            }
-
-            FactSlider {
-                Layout.fillWidth:       true
-                label:                  qsTr("Warning Level")
-                fact:                   controller.getParameterFact(-1, "BAT_LOW_THR")
-                majorTickStepSize:      5
-            }   
-
-            FactSlider {
-                Layout.fillWidth:   true
-                label:              qsTr("Critical Level")
-                fact:               controller.getParameterFact(-1, "BAT_CRIT_THR")
-                majorTickStepSize:  5
-            }
-
-            FactSlider {
-                Layout.fillWidth:   true
-                label:              qsTr("Emergency Level")
-                fact:               controller.getParameterFact(-1, "BAT_EMERGEN_THR")
-                majorTickStepSize:  5
-            }
-        }
+    FactSlider {
+        Layout.fillWidth:   true
+        label:              qsTr("Emergency Level")
+        fact:               controller.getParameterFact(-1, "BAT_EMERGEN_THR")
+        majorTickStepSize:  5
     }
 }
diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
index e14850b1b3f4..5c9736f4d0c5 100644
--- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
@@ -17,6 +17,7 @@
 #include "Vehicle.h"
 
 #include <QDebug>
+#include <QString>
 
 #include "px4_custom_mode.h"
 
@@ -28,65 +29,67 @@ PX4FirmwarePluginInstanceData::PX4FirmwarePluginInstanceData(QObject* parent)
 }
 
 PX4FirmwarePlugin::PX4FirmwarePlugin()
-    : _manualFlightMode     (tr("Manual"))
-    , _acroFlightMode       (tr("Acro"))
-    , _stabilizedFlightMode (tr("Stabilized"))
-    , _rattitudeFlightMode  (tr("Rattitude"))
-    , _altCtlFlightMode     (tr("Altitude"))
-    , _posCtlFlightMode     (tr("Position"))
-    , _offboardFlightMode   (tr("Offboard"))
-    , _readyFlightMode      (tr("Ready"))
-    , _takeoffFlightMode    (tr("Takeoff"))
-    , _holdFlightMode       (tr("Hold"))
-    , _missionFlightMode    (tr("Mission"))
-    , _rtlFlightMode        (tr("Return"))
-    , _landingFlightMode    (tr("Land"))
-    , _preclandFlightMode   (tr("Precision Land"))
-    , _rtgsFlightMode       (tr("Return to Groundstation"))
-    , _followMeFlightMode   (tr("Follow Me"))
-    , _simpleFlightMode     (tr("Simple"))
-    , _orbitFlightMode      (tr("Orbit"))
 {
+    const QString manualFlightModeName = tr("Manual");
+    const QString acroFlightModeName = tr("Acro");
+    const QString stabilizedFlightModeName = tr("Stabilized");
+    const QString rattitudeFlightModeName = tr("Rattitude");
+    const QString altCtlFlightModeName = tr("Altitude");
+    const QString posCtlFlightModeName = tr("Position");
+    const QString offboardFlightModeName = tr("Offboard");
+    const QString readyFlightModeName = tr("Ready");
+    const QString takeoffFlightModeName = tr("Takeoff");
+    const QString holdFlightModeName = tr("Hold");
+    const QString missionFlightModeName = tr("Mission");
+    const QString rtlFlightModeName = tr("Return");
+    const QString landingFlightModeName = tr("Land");
+    const QString preclandFlightModeName = tr("Precision Land");
+    const QString rtgsFlightModeName = tr("Return to Groundstation");
+    const QString followMeFlightModeName = tr("Follow Me");
+    const QString simpleFlightModeName = tr("Simple");
+    const QString orbitFlightModeName = tr("Orbit");
+
     _setModeEnumToModeStringMapping({
-        { PX4CustomMode::MANUAL             ,    _manualFlightMode      },
-        { PX4CustomMode::STABILIZED         ,    _stabilizedFlightMode  },
-        { PX4CustomMode::ACRO               ,    _acroFlightMode        },
-        { PX4CustomMode::RATTITUDE          ,    _rattitudeFlightMode   },
-        { PX4CustomMode::ALTCTL             ,    _altCtlFlightMode      },
-        { PX4CustomMode::OFFBOARD           ,    _offboardFlightMode    },
-        { PX4CustomMode::SIMPLE             ,    _simpleFlightMode      },
-        { PX4CustomMode::POSCTL_POSCTL      ,    _posCtlFlightMode      },
-        { PX4CustomMode::POSCTL_ORBIT       ,    _orbitFlightMode       },
-        { PX4CustomMode::AUTO_LOITER        ,    _holdFlightMode        },
-        { PX4CustomMode::AUTO_MISSION       ,    _missionFlightMode     },
-        { PX4CustomMode::AUTO_RTL           ,    _rtlFlightMode         },
-        { PX4CustomMode::AUTO_LAND          ,    _landingFlightMode     },
-        { PX4CustomMode::AUTO_PRECLAND      ,    _preclandFlightMode    },
-        { PX4CustomMode::AUTO_READY         ,    _readyFlightMode       },
-        { PX4CustomMode::AUTO_RTGS          ,    _rtgsFlightMode        },
-        { PX4CustomMode::AUTO_TAKEOFF       ,    _takeoffFlightMode     },
+        { PX4CustomMode::MANUAL,        manualFlightModeName      },
+        { PX4CustomMode::STABILIZED,    stabilizedFlightModeName  },
+        { PX4CustomMode::ACRO,          acroFlightModeName        },
+        { PX4CustomMode::RATTITUDE,     rattitudeFlightModeName   },
+        { PX4CustomMode::ALTCTL,        altCtlFlightModeName      },
+        { PX4CustomMode::OFFBOARD,      offboardFlightModeName    },
+        { PX4CustomMode::SIMPLE,        simpleFlightModeName      },
+        { PX4CustomMode::POSCTL_POSCTL, posCtlFlightModeName      },
+        { PX4CustomMode::POSCTL_ORBIT,  orbitFlightModeName       },
+        { PX4CustomMode::AUTO_LOITER,   holdFlightModeName        },
+        { PX4CustomMode::AUTO_MISSION,  missionFlightModeName     },
+        { PX4CustomMode::AUTO_RTL,      rtlFlightModeName         },
+        { PX4CustomMode::AUTO_LAND,     landingFlightModeName     },
+        { PX4CustomMode::AUTO_PRECLAND, preclandFlightModeName    },
+        { PX4CustomMode::AUTO_READY,    readyFlightModeName       },
+        { PX4CustomMode::AUTO_RTGS,     rtgsFlightModeName        },
+        { PX4CustomMode::AUTO_TAKEOFF,  takeoffFlightModeName     },
     });
 
     static FlightModeList availableFlightModes = {
-        // Mode Name            , Custom Mode                      CanBeSet  adv
-        { _manualFlightMode     , PX4CustomMode::MANUAL            , true ,  true },
-        { _stabilizedFlightMode , PX4CustomMode::STABILIZED        , true ,  true },
-        { _acroFlightMode       , PX4CustomMode::ACRO              , true ,  true },
-        { _rattitudeFlightMode  , PX4CustomMode::RATTITUDE         , true ,  false},
-        { _altCtlFlightMode     , PX4CustomMode::ALTCTL            , true ,  false},
-        { _offboardFlightMode   , PX4CustomMode::OFFBOARD          , true ,  true },
-        { _simpleFlightMode     , PX4CustomMode::SIMPLE            , false,  false},
-        { _posCtlFlightMode     , PX4CustomMode::POSCTL_POSCTL     , true ,  false},
-        { _orbitFlightMode      , PX4CustomMode::POSCTL_ORBIT      , false,  true },
-        { _holdFlightMode       , PX4CustomMode::AUTO_LOITER       , true ,  true },
-        { _missionFlightMode    , PX4CustomMode::AUTO_MISSION      , true ,  true },
-        { _rtlFlightMode        , PX4CustomMode::AUTO_RTL          , true ,  true },
-        { _landingFlightMode    , PX4CustomMode::AUTO_LAND         , false,  true },
-        { _preclandFlightMode   , PX4CustomMode::AUTO_PRECLAND     , true ,  true },
-        { _readyFlightMode      , PX4CustomMode::AUTO_READY        , false,  false},
-        { _rtgsFlightMode       , PX4CustomMode::AUTO_RTGS         , false,  false},
-        { _takeoffFlightMode    , PX4CustomMode::AUTO_TAKEOFF      , false,  false},
+        // Mode Name                Custom Mode                     CanBeSet  adv
+        { manualFlightModeName,     PX4CustomMode::MANUAL,          true,   true },
+        { stabilizedFlightModeName, PX4CustomMode::STABILIZED,      true,   true },
+        { acroFlightModeName,       PX4CustomMode::ACRO,            true,   true },
+        { rattitudeFlightModeName,  PX4CustomMode::RATTITUDE,       true,   false},
+        { altCtlFlightModeName,     PX4CustomMode::ALTCTL,          true,   false},
+        { offboardFlightModeName,   PX4CustomMode::OFFBOARD,        true,   true },
+        { simpleFlightModeName,     PX4CustomMode::SIMPLE,          false,  false},
+        { posCtlFlightModeName,     PX4CustomMode::POSCTL_POSCTL,   true,   false},
+        { orbitFlightModeName,      PX4CustomMode::POSCTL_ORBIT,    false,  true },
+        { holdFlightModeName,       PX4CustomMode::AUTO_LOITER,     true,   true },
+        { missionFlightModeName,    PX4CustomMode::AUTO_MISSION,    true,   true },
+        { rtlFlightModeName,        PX4CustomMode::AUTO_RTL,        true,   true },
+        { landingFlightModeName,    PX4CustomMode::AUTO_LAND,       false,  true },
+        { preclandFlightModeName,   PX4CustomMode::AUTO_PRECLAND,   true,   true },
+        { readyFlightModeName,      PX4CustomMode::AUTO_READY,      false,  false},
+        { rtgsFlightModeName,       PX4CustomMode::AUTO_RTGS,       false,  false},
+        { takeoffFlightModeName,    PX4CustomMode::AUTO_TAKEOFF,    false,  false},
     };
+
     updateAvailableFlightModes(availableFlightModes);
 }
 
@@ -297,12 +300,12 @@ void PX4FirmwarePlugin::pauseVehicle(Vehicle* vehicle) const
 void PX4FirmwarePlugin::guidedModeRTL(Vehicle* vehicle, bool smartRTL) const
 {
     Q_UNUSED(smartRTL);
-    _setFlightModeAndValidate(vehicle, _rtlFlightMode);
+    _setFlightModeAndValidate(vehicle, rtlFlightMode());
 }
 
 void PX4FirmwarePlugin::guidedModeLand(Vehicle* vehicle) const
 {
-    _setFlightModeAndValidate(vehicle, _landingFlightMode);
+    _setFlightModeAndValidate(vehicle, landFlightMode());
 }
 
 void PX4FirmwarePlugin::_mavCommandResult(int vehicleId, int component, int command, int result, int failureCode)
@@ -596,54 +599,53 @@ void PX4FirmwarePlugin::setGuidedMode(Vehicle* vehicle, bool guidedMode) const
 
 QString PX4FirmwarePlugin::pauseFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_LOITER, _holdFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_LOITER);
 }
 
 QString PX4FirmwarePlugin::missionFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_MISSION, _missionFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_MISSION);
 }
 
 QString PX4FirmwarePlugin::rtlFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_RTL, _rtlFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_RTL);
 }
 
 QString PX4FirmwarePlugin::landFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_LAND, _landingFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_LAND);
 }
 
 QString PX4FirmwarePlugin::takeControlFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::MANUAL, _manualFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::MANUAL);
 }
 
 QString PX4FirmwarePlugin::gotoFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_LOITER, _holdFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_LOITER);
 }
 
 QString PX4FirmwarePlugin::followFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_FOLLOW_TARGET, _followMeFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_FOLLOW_TARGET);
 }
 
 QString PX4FirmwarePlugin::takeOffFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::AUTO_TAKEOFF, _takeoffFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::AUTO_TAKEOFF);
 }
 
 QString PX4FirmwarePlugin::stabilizedFlightMode() const
 {
-    return _modeEnumToString.value(PX4CustomMode::STABILIZED, _stabilizedFlightMode);
+    return _modeEnumToString.value(PX4CustomMode::STABILIZED);
 }
 
 bool PX4FirmwarePlugin::isGuidedMode(const Vehicle* vehicle) const
 {
     // Not supported by generic vehicle
-    return (vehicle->flightMode() == _holdFlightMode || vehicle->flightMode() == _takeoffFlightMode
-            || vehicle->flightMode() == _landingFlightMode);
+    return (vehicle->flightMode() == pauseFlightMode() || vehicle->flightMode() == takeOffFlightMode() || vehicle->flightMode() == landFlightMode());
 }
 
 bool PX4FirmwarePlugin::adjustIncomingMavlinkMessage(Vehicle* vehicle, mavlink_message_t* message)
@@ -759,37 +761,6 @@ bool PX4FirmwarePlugin::hasGripper(const Vehicle* vehicle) const
     return false;
 }
 
-QVariant PX4FirmwarePlugin::mainStatusIndicatorContentItem(const Vehicle*) const
-{
-    return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml"));
-}
-
-const QVariantList& PX4FirmwarePlugin::toolIndicators(const Vehicle* vehicle)
-{
-    if (_toolIndicatorList.size() == 0) {
-        // First call the base class to get the standard QGC list
-        _toolIndicatorList = FirmwarePlugin::toolIndicators(vehicle);
-
-        // Find the generic flight mode indicator and replace with the custom one
-        for (int i=0; i<_toolIndicatorList.size(); i++) {
-            if (_toolIndicatorList.at(i).toUrl().toString().contains("FlightModeIndicator.qml")) {
-                _toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml"));
-                break;
-            }
-        }
-
-        // Find the generic battery indicator and replace with the custom one
-        for (int i=0; i<_toolIndicatorList.size(); i++) {
-            if (_toolIndicatorList.at(i).toUrl().toString().contains("BatteryIndicator.qml")) {
-                _toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/PX4/PX4BatteryIndicator.qml"));
-                break;
-            }
-        }
-    }
-
-    return _toolIndicatorList;
-}
-
 void PX4FirmwarePlugin::updateAvailableFlightModes(FlightModeList &modeList)
 {
     for(auto &mode: modeList){
@@ -849,3 +820,16 @@ void PX4FirmwarePlugin::updateAvailableFlightModes(FlightModeList &modeList)
     }
     _updateFlightModeList(modeList);
 }
+
+QVariant PX4FirmwarePlugin::expandedToolbarIndicatorSource(const Vehicle* vehicle, const QString& indicatorName) const
+{
+    if (indicatorName == "Battery") {
+        return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/PX4/PX4BatteryIndicator.qml"));
+    } else if (indicatorName == "FlightMode") {
+        return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml"));
+    } else if (indicatorName == "MainStatus") {
+        return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/FirmwarePlugin/PX4/PX4MainStatusIndicator.qml"));
+    }
+
+    return QVariant();
+}
diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
index 05dd01a768ba..9ed4aca996a1 100644
--- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
+++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
@@ -75,33 +75,10 @@ class PX4FirmwarePlugin : public FirmwarePlugin
     bool                supportsNegativeThrust          (Vehicle* vehicle) const override;
     QString             getHobbsMeter                   (Vehicle* vehicle) const override;
     bool                hasGripper                      (const Vehicle* vehicle) const override;
-    QVariant            mainStatusIndicatorContentItem  (const Vehicle* vehicle) const override;
-    const QVariantList& toolIndicators                  (const Vehicle* vehicle) override;
+    QVariant            expandedToolbarIndicatorSource  (const Vehicle* vehicle, const QString& indicatorName) const override;
 
     void                updateAvailableFlightModes      (FlightModeList &modeList) override;
 
-protected:
-
-    // If plugin superclass wants to change a mode name, then set a new name for the flight mode in the superclass constructor
-    QString _manualFlightMode;
-    QString _acroFlightMode;
-    QString _stabilizedFlightMode;
-    QString _rattitudeFlightMode;
-    QString _altCtlFlightMode;
-    QString _posCtlFlightMode;
-    QString _offboardFlightMode;
-    QString _readyFlightMode;
-    QString _takeoffFlightMode;
-    QString _holdFlightMode;
-    QString _missionFlightMode;
-    QString _rtlFlightMode;
-    QString _landingFlightMode;
-    QString _preclandFlightMode;
-    QString _rtgsFlightMode;
-    QString _followMeFlightMode;
-    QString _simpleFlightMode;
-    QString _orbitFlightMode;
-
 private slots:
     void _mavCommandResult(int vehicleId, int component, int command, int result, int failureCode);
 
diff --git a/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml b/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml
index 45bff5e4f2a3..7a067fe102fb 100644
--- a/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml
+++ b/src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml
@@ -13,110 +13,100 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
+import QGroundControl.FactControls
 
+ColumnLayout {
+    Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 60
+    spacing:                margins / 2
+
+    property Fact mpcLandSpeedFact:         controller.getParameterFact(-1, "MPC_LAND_SPEED", false)
+    property Fact precisionLandingFact:     controller.getParameterFact(-1, "RTL_PLD_MD", false)
+    property Fact sys_vehicle_resp:         controller.getParameterFact(-1, "SYS_VEHICLE_RESP", false)
+    property Fact mpc_xy_vel_all:           controller.getParameterFact(-1, "MPC_XY_VEL_ALL", false)
+    property Fact mpc_z_vel_all:            controller.getParameterFact(-1, "MPC_Z_VEL_ALL", false)
+    property var  qgcPal:                   QGroundControl.globalPalette
+    property real margins:                  ScreenTools.defaultFontPixelHeight
+    property real sliderWidth:              ScreenTools.defaultFontPixelWidth * 40
+    property var  flyViewSettings:          QGroundControl.settingsManager.flyViewSettings
+
+    FactPanelController { id: controller }
+
+    SettingsGroupLayout {
+        Layout.fillWidth: true
+
+        FactSlider {
+            Layout.fillWidth:       true
+            Layout.preferredWidth:  sliderWidth
+            label:                  qsTr("RTL Altitude")
+            fact:                   controller.getParameterFact(-1, "RTL_RETURN_ALT")
+            to:                     fact.maxIsDefaultForType ? QGroundControl.unitsConversion.metersToAppSettingsVerticalDistanceUnits(121.92) : fact.max
+            majorTickStepSize:      10
+        }
+    }
 
+    SettingsGroupLayout {
+        Layout.fillWidth:   true
+        heading:            qsTr("GeoFence")
 
+        LabelledFactComboBox {
+            Layout.fillWidth:       true
+            label:                  qsTr("Breach Action")
+            fact:                   controller.getParameterFact(-1, "GF_ACTION")
+        }
 
-import QGroundControl.FactControls
-
-FlightModeIndicator {
-    waitForParameters: true
-
-    expandedPageComponent: Component {
         ColumnLayout {
-            Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 60
-            spacing:                margins / 2
-
-            property Fact mpcLandSpeedFact:         controller.getParameterFact(-1, "MPC_LAND_SPEED", false)
-            property Fact precisionLandingFact:     controller.getParameterFact(-1, "RTL_PLD_MD", false)
-            property Fact sys_vehicle_resp:         controller.getParameterFact(-1, "SYS_VEHICLE_RESP", false)
-            property Fact mpc_xy_vel_all:           controller.getParameterFact(-1, "MPC_XY_VEL_ALL", false)
-            property Fact mpc_z_vel_all:            controller.getParameterFact(-1, "MPC_Z_VEL_ALL", false)
-            property var  qgcPal:                   QGroundControl.globalPalette
-            property real margins:                  ScreenTools.defaultFontPixelHeight
-            property real sliderWidth:              ScreenTools.defaultFontPixelWidth * 40
-            property var  flyViewSettings:          QGroundControl.settingsManager.flyViewSettings
-
-            FactPanelController { id: controller }
-
-            SettingsGroupLayout {
-                Layout.fillWidth: true
-
-                FactSlider {
-                    Layout.fillWidth:       true
-                    Layout.preferredWidth:  sliderWidth
-                    label:                  qsTr("RTL Altitude")
-                    fact:                   controller.getParameterFact(-1, "RTL_RETURN_ALT")
-                    to:                     fact.maxIsDefaultForType ? QGroundControl.unitsConversion.metersToAppSettingsVerticalDistanceUnits(121.92) : fact.max
-                    majorTickStepSize:      10
+            QGCCheckBoxSlider {
+                Layout.fillWidth:   true
+                text:               qsTr("Max Distance")
+                checked:            maxDistanceSlider.value > 0
+
+                onClicked: {
+                    if (checked) {
+                        maxDistanceSlider.setValue(prevValue != 0 ? prevValue : maxDistanceSlider.to)
+                    } else {
+                        prevValue = maxDistanceSlider.value
+                        maxDistanceSlider.setValue(0)
+                    }
                 }
+
+                property real prevValue: 0
             }
 
-            SettingsGroupLayout {
+            FactSlider {
+                id:                 maxDistanceSlider
                 Layout.fillWidth:   true
-                heading:            qsTr("GeoFence")
-
-                LabelledFactComboBox {
-                    Layout.fillWidth:       true
-                    label:                  qsTr("Breach Action")
-                    fact:                   controller.getParameterFact(-1, "GF_ACTION")
-                }
-
-                ColumnLayout {
-                    QGCCheckBoxSlider {
-                        Layout.fillWidth:   true
-                        text:               qsTr("Max Distance")
-                        checked:            maxDistanceSlider.value > 0
-
-                        onClicked: {
-                            if (checked) {
-                                maxDistanceSlider.setValue(prevValue != 0 ? prevValue : maxDistanceSlider.to)
-                            } else {
-                                prevValue = maxDistanceSlider.value
-                                maxDistanceSlider.setValue(0)
-                            }
-                        }
-
-                        property real prevValue: 0
-                    }
+                fact:               controller.getParameterFact(-1, "GF_MAX_HOR_DIST")
+                to:                 flyViewSettings.maxGoToLocationDistance.value
+                majorTickStepSize:  500
+                enabled:            fact.value > 0
+            }
+        }
 
-                    FactSlider {
-                        id:                 maxDistanceSlider
-                        Layout.fillWidth:   true
-                        fact:               controller.getParameterFact(-1, "GF_MAX_HOR_DIST")
-                        to:                 flyViewSettings.maxGoToLocationDistance.value
-                        majorTickStepSize:  500
-                        enabled:            fact.value > 0
+        ColumnLayout {
+            QGCCheckBoxSlider {
+                Layout.fillWidth:   true
+                text:               qsTr("Max Altitude")
+                checked:            maxAltitudeSlider.value > 0
+
+                onClicked: {
+                    if (checked) {
+                        maxAltitudeSlider.setValue(prevValue != 0 ? prevValue : maxAltitudeSlider.to)
+                    } else {
+                        prevValue = maxAltitudeSlider.value
+                        maxAltitudeSlider.setValue(0)
                     }
                 }
 
-                ColumnLayout {
-                    QGCCheckBoxSlider {
-                        Layout.fillWidth:   true
-                        text:               qsTr("Max Altitude")
-                        checked:            maxAltitudeSlider.value > 0
-
-                        onClicked: {
-                            if (checked) {
-                                maxAltitudeSlider.setValue(prevValue != 0 ? prevValue : maxAltitudeSlider.to)
-                            } else {
-                                prevValue = maxAltitudeSlider.value
-                                maxAltitudeSlider.setValue(0)
-                            }
-                        }
-
-                        property real prevValue: 0
-                    }
+                property real prevValue: 0
+            }
 
-                    FactSlider {
-                        id:                 maxAltitudeSlider
-                        Layout.fillWidth:   true
-                        fact:               controller.getParameterFact(-1, "GF_MAX_VER_DIST")
-                        to:                 flyViewSettings.guidedMaximumAltitude.value
-                        majorTickStepSize:  10
-                        enabled:            fact.value > 0
-                    }
-                }
+            FactSlider {
+                id:                 maxAltitudeSlider
+                Layout.fillWidth:   true
+                fact:               controller.getParameterFact(-1, "GF_MAX_VER_DIST")
+                to:                 flyViewSettings.guidedMaximumAltitude.value
+                majorTickStepSize:  10
+                enabled:            fact.value > 0
             }
         }
     }
diff --git a/src/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml b/src/FirmwarePlugin/PX4/PX4MainStatusIndicator.qml
similarity index 99%
rename from src/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml
rename to src/FirmwarePlugin/PX4/PX4MainStatusIndicator.qml
index 2f38944d8f14..5476cb970d85 100644
--- a/src/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml
+++ b/src/FirmwarePlugin/PX4/PX4MainStatusIndicator.qml
@@ -13,10 +13,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-
-
-
-
 import QGroundControl.FactControls
 
 ColumnLayout {
diff --git a/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc b/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
index e560a6cf2c05..8a4953869cbb 100644
--- a/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
+++ b/src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc
@@ -19,7 +19,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QXmlStreamReader>
 
-QGC_LOGGING_CATEGORY(PX4ParameterMetaDataLog, "PX4ParameterMetaDataLog")
+QGC_LOGGING_CATEGORY(PX4ParameterMetaDataLog, "FirmwarePlugin.PX4ParameterMetaData")
 
 PX4ParameterMetaData::PX4ParameterMetaData(QObject* parent)
     : QObject(parent)
@@ -70,9 +70,9 @@ QVariant PX4ParameterMetaData::_stringToTypedVariant(const QString& string, Fact
         convertTo = QMetaType::QByteArray;
         break;
     }
-    
+
     *convertOk = var.convert(QMetaType(convertTo));
-    
+
     return var;
 }
 
@@ -94,43 +94,43 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
         qWarning() << "Internal error: metaDataFile mission" << metaDataFile;
         return;
     }
-    
+
     if (!xmlFile.open(QIODevice::ReadOnly)) {
         qWarning() << "Internal error: Unable to open parameter file:" << metaDataFile << xmlFile.errorString();
         return;
     }
-    
+
     QXmlStreamReader xml(xmlFile.readAll());
     xmlFile.close();
     if (xml.hasError()) {
         qWarning() << "Badly formed XML" << xml.errorString();
         return;
     }
-    
+
     QString         factGroup;
     QString         errorString;
     FactMetaData*   metaData = nullptr;
     int             xmlState = XmlStateNone;
     bool            badMetaData = true;
-    
+
     while (!xml.atEnd()) {
         if (xml.isStartElement()) {
             QString elementName = xml.name().toString();
-            
+
             if (elementName == "parameters") {
                 if (xmlState != XmlStateNone) {
                     qWarning() << "Badly formed XML";
                     return;
                 }
                 xmlState = XmlStateFoundParameters;
-                
+
             } else if (elementName == "version") {
                 if (xmlState != XmlStateFoundParameters) {
                     qWarning() << "Badly formed XML";
                     return;
                 }
                 xmlState = XmlStateFoundVersion;
-                
+
                 bool convertOk;
                 QString strVersion = xml.readElementText();
                 int intVersion = strVersion.toInt(&convertOk);
@@ -143,7 +143,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                     qDebug() << "Parameter version stamp too old, skipping load. Found:" << intVersion << "Want: 3 File:" << metaDataFile;
                     return;
                 }
-                
+
             } else if (elementName == "parameter_version_major") {
                 // Just skip over for now
             } else if (elementName == "parameter_version_minor") {
@@ -156,30 +156,30 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                     return;
                 }
                 xmlState = XmlStateFoundGroup;
-                
+
                 if (!xml.attributes().hasAttribute("name")) {
                     qWarning() << "Badly formed XML";
                     return;
                 }
                 factGroup = xml.attributes().value("name").toString();
                 qCDebug(PX4ParameterMetaDataLog) << "Found group: " << factGroup;
-                
+
             } else if (elementName == "parameter") {
                 if (xmlState != XmlStateFoundGroup) {
                     qWarning() << "Badly formed XML";
                     return;
                 }
                 xmlState = XmlStateFoundParameter;
-                
+
                 if (!xml.attributes().hasAttribute("name") || !xml.attributes().hasAttribute("type")) {
                     qWarning() << "Badly formed XML";
                     return;
                 }
-                
+
                 QString name = xml.attributes().value("name").toString();
                 QString type = xml.attributes().value("type").toString();
                 QString strDefault =    xml.attributes().value("default").toString();
-                
+
                 QString category = xml.attributes().value("category").toString();
                 if (category.isEmpty()) {
                     category = QStringLiteral("Standard");
@@ -208,7 +208,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                     qWarning() << "Parameter meta data with bad type:" << type << " name:" << name;
                     return;
                 }
-                
+
                 // Now that we know type we can create meta data object and add it to the system
                 metaData = new FactMetaData(foundType, this);
                 if (_mapParameterName2FactMetaData.contains(name)) {
@@ -224,10 +224,10 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                     metaData->setGroup(factGroup);
                     metaData->setReadOnly(readOnly);
                     metaData->setVolatileValue(volatileValue);
-                    
+
                     if (xml.attributes().hasAttribute("default") && !strDefault.isEmpty()) {
                         QVariant varDefault;
-                        
+
                         if (metaData->convertAndValidateRaw(strDefault, false, varDefault, errorString)) {
                             metaData->setRawDefaultValue(varDefault);
                         } else {
@@ -235,7 +235,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                         }
                     }
                 }
-                
+
             } else {
                 // We should be getting meta data now
                 if (xmlState != XmlStateFoundParameter) {
@@ -276,7 +276,10 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                             if (metaData->convertAndValidateRaw(text, false /* convertOnly */, varMax, errorString)) {
                                 metaData->setRawMax(varMax);
                             } else {
-                                qCWarning(PX4ParameterMetaDataLog) << "Invalid max value, name:" << metaData->name() << " type:" << metaData->type() << " max:" << text << " error:" << errorString;
+                                // PX4 firmware has a metadata generation bug for VTQ_TELEM_IDS_* parameters
+                                if (!metaData->name().startsWith("VTQ_TELEM_IDS_")) {
+                                    qCWarning(PX4ParameterMetaDataLog) << "Invalid max value, name:" << metaData->name() << " type:" << metaData->type() << " max:" << text << " error:" << errorString;
+                                }
                             }
 
                         } else if (elementName == "unit") {
@@ -350,7 +353,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                                 qCDebug(PX4ParameterMetaDataLog) << "parameter value:"
                                                                  << "index:" << bit << "description:" << bitDescription;
 
-                                if (bit < 31) {
+                                if (bit < 32) {
                                     QVariant bitmaskRawValue = 1 << bit;
                                     QVariant bitmaskValue;
                                     QString errorString;
@@ -362,7 +365,7 @@ void PX4ParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                                                                          << " error:" << errorString;
                                     }
                                 } else {
-                                    qCWarning(PX4ParameterMetaDataLog) << "Invalid value for bitmask, bit:" << bit;
+                                    qCWarning(PX4ParameterMetaDataLog) << "Invalid value for bitmask bit, name:" << metaData->name() << " bit:" << bit;
                                 }
                             }
                         } else {
diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt
index e273aac9369c..e21520bccc07 100644
--- a/src/FlightDisplay/CMakeLists.txt
+++ b/src/FlightDisplay/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Flight Display Module
+# In-flight view, telemetry displays, and vehicle control UI
+# ============================================================================
+
 qt_add_library(FlightDisplayModule STATIC)
 
 qt_add_qml_module(FlightDisplayModule
@@ -22,6 +27,8 @@ qt_add_qml_module(FlightDisplayModule
         FlyViewCustomLayer.qml
         FlyViewInsetViewer.qml
         FlyViewInstrumentPanel.qml
+        FlyViewGripperButton.qml
+        FlyViewGripperDropPanel.qml
         FlyViewMap.qml
         FlyViewMissionCompleteDialog.qml
         FlyViewPreFlightChecklistPopup.qml
@@ -31,9 +38,7 @@ qt_add_qml_module(FlightDisplayModule
         FlyViewTopRightPanel.qml
         FlyViewVideo.qml
         FlyViewWidgetLayer.qml
-        GripperMenu.qml
         GuidedActionConfirm.qml
-        GuidedActionGripper.qml
         GuidedActionLand.qml
         GuidedActionPause.qml
         GuidedActionRTL.qml
diff --git a/src/FlightDisplay/CustomGuidedActionsController.qml b/src/FlightDisplay/CustomGuidedActionsController.qml
index 8cd37bf376ad..8958ace816f2 100644
--- a/src/FlightDisplay/CustomGuidedActionsController.qml
+++ b/src/FlightDisplay/CustomGuidedActionsController.qml
@@ -19,4 +19,4 @@ QtObject {
     function customExecuteAction(actionCode, actionData, sliderOutputValue, optionCheckedode) {
         return false // false = action not handled here
     }
-}
\ No newline at end of file
+}
diff --git a/src/FlightDisplay/DefaultChecklist.qml b/src/FlightDisplay/DefaultChecklist.qml
index 06494676ff64..ddfc05838b85 100644
--- a/src/FlightDisplay/DefaultChecklist.qml
+++ b/src/FlightDisplay/DefaultChecklist.qml
@@ -89,4 +89,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightDisplay/FixedWingChecklist.qml b/src/FlightDisplay/FixedWingChecklist.qml
index 093f8d034707..69dc8e247299 100644
--- a/src/FlightDisplay/FixedWingChecklist.qml
+++ b/src/FlightDisplay/FixedWingChecklist.qml
@@ -89,4 +89,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightDisplay/FlightDisplayViewVideo.qml b/src/FlightDisplay/FlightDisplayViewVideo.qml
index 3afe8f0ff9c3..3723c527d842 100644
--- a/src/FlightDisplay/FlightDisplayViewVideo.qml
+++ b/src/FlightDisplay/FlightDisplayViewVideo.qml
@@ -85,7 +85,7 @@ Item {
         visible:        QGroundControl.videoManager.decoding
         function getWidth() {
             if(_ar != 0.0){
-                if(_isMode_FIT_HEIGHT 
+                if(_isMode_FIT_HEIGHT
                         || (_isMode_FILL && (root.width/root.height < _ar))
                         || (_isMode_NO_CROP && (root.width/root.height > _ar))){
                     // This return value has different implications depending on the mode
@@ -100,8 +100,8 @@ Item {
         }
         function getHeight() {
             if(_ar != 0.0){
-                if(_isMode_FIT_WIDTH 
-                        || (_isMode_FILL && (root.width/root.height > _ar)) 
+                if(_isMode_FIT_WIDTH
+                        || (_isMode_FILL && (root.width/root.height > _ar))
                         || (_isMode_NO_CROP && (root.width/root.height < _ar))){
                     // This return value has different implications depending on the mode
                     // For FIT_WIDTH and FILL
diff --git a/src/FlightDisplay/FlyView.qml b/src/FlightDisplay/FlyView.qml
index 55ab7ce48159..748ff76db939 100644
--- a/src/FlightDisplay/FlyView.qml
+++ b/src/FlightDisplay/FlyView.qml
@@ -59,6 +59,7 @@ Item {
     property rect   _centerViewport:        Qt.rect(0, 0, width, height)
     property real   _rightPanelWidth:       ScreenTools.defaultFontPixelWidth * 30
     property var    _mapControl:            mapControl
+    property real   _widgetMargin:          ScreenTools.defaultFontPixelWidth * 0.75
 
     property real   _fullItemZorder:    0
     property real   _pipItemZorder:     QGroundControl.zOrderWidgets
@@ -74,21 +75,16 @@ Item {
 
     QGCToolInsets {
         id:                     _toolInsets
+        topEdgeLeftInset:       toolbar.height
+        topEdgeCenterInset:     topEdgeLeftInset
+        topEdgeRightInset:      topEdgeLeftInset
         leftEdgeBottomInset:    _pipView.leftEdgeBottomInset
         bottomEdgeLeftInset:    _pipView.bottomEdgeLeftInset
     }
 
-    FlyViewToolBar {
-        id:         toolbar
-        visible:    !QGroundControl.videoManager.fullScreen
-    }
-
     Item {
         id:                 mapHolder
-        anchors.top:        toolbar.bottom
-        anchors.bottom:     parent.bottom
-        anchors.left:       parent.left
-        anchors.right:      parent.right
+        anchors.fill:       parent
 
         FlyViewMap {
             id:                     mapControl
@@ -128,6 +124,8 @@ Item {
             anchors.bottom:         parent.bottom
             anchors.left:           parent.left
             anchors.right:          guidedValueSlider.visible ? guidedValueSlider.left : parent.right
+            anchors.margins:        _widgetMargin
+            anchors.topMargin:      toolbar.height + _widgetMargin
             z:                      _fullItemZorder + 2 // we need to add one extra layer for map 3d viewer (normally was 1)
             parentToolInsets:       _toolInsets
             mapControl:             _mapControl
@@ -189,4 +187,9 @@ Item {
             _root.utmspSendActTrigger = value
         }
     }
+
+    FlyViewToolBar {
+        id:         toolbar
+        visible:    !QGroundControl.videoManager.fullScreen
+    }
 }
diff --git a/src/FlightDisplay/FlyViewAdditionalActionsButton.qml b/src/FlightDisplay/FlyViewAdditionalActionsButton.qml
index 58b717fc328a..ea283c2fb74f 100644
--- a/src/FlightDisplay/FlyViewAdditionalActionsButton.qml
+++ b/src/FlightDisplay/FlyViewAdditionalActionsButton.qml
@@ -25,7 +25,7 @@ ToolStripAction {
 
     property var _guidedController: globals.guidedControllerFlyView
 
-    property var _additionalActions: FlyViewAdditionalActionsList { 
+    property var _additionalActions: FlyViewAdditionalActionsList {
         guidedController: _guidedController
     }
 
@@ -40,7 +40,7 @@ ToolStripAction {
     }
 
     dropPanelComponent: Component {
-        FlyViewAdditionalActionsPanel { 
+        FlyViewAdditionalActionsPanel {
             additionalActions:  _additionalActions
             mavlinkActions:     _mavlinkActions.actions
             customActions:      _customActions
diff --git a/src/FlightDisplay/FlyViewAdditionalActionsList.qml b/src/FlightDisplay/FlyViewAdditionalActionsList.qml
index 7c3c232d63e6..e833f5f4f730 100644
--- a/src/FlightDisplay/FlyViewAdditionalActionsList.qml
+++ b/src/FlightDisplay/FlyViewAdditionalActionsList.qml
@@ -12,9 +12,8 @@ import QtQml
 QtObject {
     property var guidedController
 
-    property bool anyActionAvailable: guidedController.showStartMission || guidedController.showContinueMission || guidedController.showChangeAlt || 
-                                      guidedController.showChangeLoiterRadius ||  guidedController.showLandAbort || guidedController.showChangeSpeed ||
-                                      guidedController.showGripper
+    property bool anyActionAvailable: guidedController.showStartMission || guidedController.showContinueMission || guidedController.showChangeAlt ||
+                                      guidedController.showChangeLoiterRadius ||  guidedController.showLandAbort || guidedController.showChangeSpeed
     property var model: [
         {
             title:      guidedController.startMissionTitle,
@@ -51,12 +50,6 @@ QtObject {
             text:       guidedController.changeSpeedMessage,
             action:     guidedController.actionChangeSpeed,
             visible:    guidedController.showChangeSpeed
-        },
-        {
-            title:      guidedController.gripperTitle,
-            text:       guidedController.gripperMessage,
-            action:     guidedController.actionGripper,
-            visible:    guidedController.showGripper
         }
     ]
 }
diff --git a/src/FlightDisplay/FlyViewGripperButton.qml b/src/FlightDisplay/FlyViewGripperButton.qml
new file mode 100644
index 000000000000..9a85776e55b4
--- /dev/null
+++ b/src/FlightDisplay/FlyViewGripperButton.qml
@@ -0,0 +1,26 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QGroundControl
+import QGroundControl.FlightDisplay
+
+ToolStripAction {
+    id:         action
+    text:       qsTr("Gripper")
+    iconSource: "/res/Gripper.svg"
+    visible:    _gripperAvailable
+
+    property var   _activeVehicle:      QGroundControl.multiVehicleManager.activeVehicle
+    property bool  _gripperAvailable:   _activeVehicle ? _activeVehicle.hasGripper : false
+
+    dropPanelComponent: Component {
+        FlyViewGripperDropPanel {
+        }
+    }
+}
diff --git a/src/FlightDisplay/FlyViewGripperDropPanel.qml b/src/FlightDisplay/FlyViewGripperDropPanel.qml
new file mode 100644
index 000000000000..e15f28f5b81b
--- /dev/null
+++ b/src/FlightDisplay/FlyViewGripperDropPanel.qml
@@ -0,0 +1,36 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+ColumnLayout {
+    spacing: ScreenTools.defaultFontHeight / 2
+
+    property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+    property var _buttonTitles: [qsTr("Open"), qsTr("Close"), qsTr("Stop")]
+    property var _buttonActions: [QGCMAVLink.GripperActionOpen, QGCMAVLink.GripperActionClose, QGCMAVLink.GripperActionStop]
+
+    Repeater {
+        model: _buttonTitles
+
+        QGCDelayButton {
+            Layout.fillWidth:   true
+            text:               _buttonTitles[index]
+
+            onActivated: {
+                _activeVehicle.sendGripperAction(_buttonActions[index])
+                dropPanel.hide()
+            }
+        }
+    }
+}
diff --git a/src/FlightDisplay/FlyViewMap.qml b/src/FlightDisplay/FlyViewMap.qml
index 12bd0cab8cf8..b55f5e858e79 100644
--- a/src/FlightDisplay/FlyViewMap.qml
+++ b/src/FlightDisplay/FlyViewMap.qml
@@ -656,7 +656,7 @@ FlightMap {
                     QGCButton {
                         Layout.fillWidth:   true
                         text:               qsTr("Edit Position")
-                        onClicked: {         
+                        onClicked: {
                             roiEditPositionDialogComponent.createObject(mainWindow, { showSetPositionFromVehicle: false }).open()
                             roiEditDropPanel.close()
                         }
@@ -757,7 +757,7 @@ FlightMap {
     }
 
     onMapClicked: (position) => {
-        if (!globals.guidedControllerFlyView.guidedUIVisible && 
+        if (!globals.guidedControllerFlyView.guidedUIVisible &&
             (globals.guidedControllerFlyView.showGotoLocation || globals.guidedControllerFlyView.showOrbit ||
              globals.guidedControllerFlyView.showROI || globals.guidedControllerFlyView.showSetHome ||
              globals.guidedControllerFlyView.showSetEstimatorOrigin)) {
diff --git a/src/FlightDisplay/FlyViewToolStripActionList.qml b/src/FlightDisplay/FlyViewToolStripActionList.qml
index f4ae49ece84b..860dca4f54db 100644
--- a/src/FlightDisplay/FlyViewToolStripActionList.qml
+++ b/src/FlightDisplay/FlyViewToolStripActionList.qml
@@ -50,6 +50,6 @@ ToolStripActionList {
         GuidedActionRTL { },
         GuidedActionPause { },
         FlyViewAdditionalActionsButton { },
-        GuidedActionGripper { }
+        FlyViewGripperButton { }
     ]
 }
diff --git a/src/FlightDisplay/FlyViewTopRightColumnLayout.qml b/src/FlightDisplay/FlyViewTopRightColumnLayout.qml
index 3e1b2086e2bc..151bc5e02aaa 100644
--- a/src/FlightDisplay/FlyViewTopRightColumnLayout.qml
+++ b/src/FlightDisplay/FlyViewTopRightColumnLayout.qml
@@ -25,13 +25,13 @@ ColumnLayout {
         Layout.preferredWidth:  _rightPanelWidth
     }
 
-    // We use a Loader to load the photoVideoControlComponent only when the active vehicle is not null
+    // We use a Loader to load the photoVideoControlComponent only when we have an active vehicle and a camera manager.
     // This make it easier to implement PhotoVideoControl without having to check for the mavlink camera
     // to be null all over the place
     Loader {
         id:                 photoVideoControlLoader
         Layout.alignment:   Qt.AlignTop | Qt.AlignRight
-        sourceComponent:    globals.activeVehicle ? photoVideoControlComponent : undefined
+        sourceComponent:    globals.activeVehicle && globals.activeVehicle.cameraManager ? photoVideoControlComponent : undefined
 
         property real rightEdgeCenterInset: visible ? parent.width - x : 0
 
diff --git a/src/FlightDisplay/FlyViewTopRightPanel.qml b/src/FlightDisplay/FlyViewTopRightPanel.qml
index afdbd63f2f47..b6acb28d6ba5 100644
--- a/src/FlightDisplay/FlyViewTopRightPanel.qml
+++ b/src/FlightDisplay/FlyViewTopRightPanel.qml
@@ -252,4 +252,3 @@ Rectangle {
         }
     }
 }
-
diff --git a/src/FlightDisplay/FlyViewVideo.qml b/src/FlightDisplay/FlyViewVideo.qml
index 0dc656622e5a..ed512ff0e96e 100644
--- a/src/FlightDisplay/FlyViewVideo.qml
+++ b/src/FlightDisplay/FlyViewVideo.qml
@@ -151,7 +151,7 @@ Item {
         }
         onReleased: (mouse) => {
             onScreenGimbalController.releaseControl()
-            
+
             //if there is already a selection, delete it
             if (trackingROI !== null) {
                 trackingROI.destroy();
diff --git a/src/FlightDisplay/FlyViewWidgetLayer.qml b/src/FlightDisplay/FlyViewWidgetLayer.qml
index 6a54052300d3..138686751007 100644
--- a/src/FlightDisplay/FlyViewWidgetLayer.qml
+++ b/src/FlightDisplay/FlyViewWidgetLayer.qml
@@ -23,9 +23,6 @@ import QGroundControl.Controls
 import QGroundControl.FlightDisplay
 import QGroundControl.FlightMap
 
-
-
-
 // This is the ui overlay layer for the widgets/tools for Fly View
 Item {
     id: _root
@@ -45,7 +42,6 @@ Item {
     property real   _toolsMargin:           ScreenTools.defaultFontPixelWidth * 0.75
     property rect   _centerViewport:        Qt.rect(0, 0, width, height)
     property real   _rightPanelWidth:       ScreenTools.defaultFontPixelWidth * 30
-    property alias  _gripperMenu:           gripperOptions
     property real   _layoutMargin:          ScreenTools.defaultFontPixelWidth * 0.75
     property bool   _layoutSpacing:         ScreenTools.defaultFontPixelWidth
     property bool   _showSingleVehicleUI:   true
@@ -72,9 +68,7 @@ Item {
         id:                     topRightPanel
         anchors.top:            parent.top
         anchors.right:          parent.right
-        anchors.topMargin:      _layoutMargin
-        anchors.rightMargin:    _layoutMargin
-        maximumHeight:          parent.height - (bottomRightRowLayout.height + _margins * 5)
+        maximumHeight:          parent.height - (bottomRightRowLayout.height + _margins * 4)
 
         property real topEdgeRightInset:    height + _layoutMargin
         property real rightEdgeTopInset:    width + _layoutMargin
@@ -83,7 +77,6 @@ Item {
 
     FlyViewTopRightColumnLayout {
         id:                 topRightColumnLayout
-        anchors.margins:    _layoutMargin
         anchors.top:        parent.top
         anchors.bottom:     bottomRightRowLayout.top
         anchors.right:      parent.right
@@ -97,7 +90,6 @@ Item {
 
     FlyViewBottomRightRowLayout {
         id:                 bottomRightRowLayout
-        anchors.margins:    _layoutMargin
         anchors.bottom:     parent.bottom
         anchors.right:      parent.right
         spacing:            _layoutSpacing
@@ -114,7 +106,6 @@ Item {
     }
 
     GuidedActionConfirm {
-        anchors.margins:            _toolsMargin
         anchors.top:                parent.top
         anchors.horizontalCenter:   parent.horizontalCenter
         z:                          QGroundControl.zOrderTopMost
@@ -133,8 +124,8 @@ Item {
         visible:                    _virtualJoystickEnabled && !QGroundControl.videoManager.fullScreen && !(_activeVehicle ? _activeVehicle.usingHighLatencyLink : false)
         anchors.bottom:             parent.bottom
         anchors.bottomMargin:       bottomLoaderMargin
-        anchors.left:               parent.left   
-        anchors.leftMargin:         ( y > toolStrip.y + toolStrip.height ? toolStrip.width / 2 : toolStrip.width * 1.05 + toolStrip.x) 
+        anchors.left:               parent.left
+        anchors.leftMargin:         ( y > toolStrip.y + toolStrip.height ? toolStrip.width / 2 : toolStrip.width * 1.05 + toolStrip.x)
         source:                     "qrc:/qml/QGroundControl/FlightDisplay/VirtualJoystick.qml"
         active:                     _virtualJoystickEnabled && !(_activeVehicle ? _activeVehicle.usingHighLatencyLink : false)
 
@@ -143,7 +134,7 @@ Item {
         property bool leftHandedMode:          QGroundControl.settingsManager.appSettings.virtualJoystickLeftHandedMode.rawValue
         property bool _virtualJoystickEnabled: QGroundControl.settingsManager.appSettings.virtualJoystick.rawValue
         property real bottomEdgeRightInset:    parent.height-y
-        property var  _pipViewMargin:          _pipView.visible ? parentToolInsets.bottomEdgeLeftInset + ScreenTools.defaultFontPixelHeight * 2 : 
+        property var  _pipViewMargin:          _pipView.visible ? parentToolInsets.bottomEdgeLeftInset + ScreenTools.defaultFontPixelHeight * 2 :
                                                bottomRightRowLayout.height + ScreenTools.defaultFontPixelHeight * 1.5
 
         property var  bottomLoaderMargin:      _pipViewMargin >= parent.height / 2 ? parent.height / 2 : _pipViewMargin
@@ -160,7 +151,7 @@ Item {
         //Loader status logic
         onLoaded: {
             if (virtualJoystickMultiTouch.visible) {
-                virtualJoystickMultiTouch.item.calibration = true 
+                virtualJoystickMultiTouch.item.calibration = true
                 virtualJoystickMultiTouch.item.uiTotalWidth = rootWidth
                 virtualJoystickMultiTouch.item.uiRealX = itemX
             } else {
@@ -171,8 +162,6 @@ Item {
 
     FlyViewToolStrip {
         id:                     toolStrip
-        anchors.leftMargin:     _toolsMargin + parentToolInsets.leftEdgeCenterInset
-        anchors.topMargin:      _toolsMargin + parentToolInsets.topEdgeLeftInset
         anchors.left:           parent.left
         anchors.top:            parent.top
         z:                      QGroundControl.zOrderWidgets
@@ -191,10 +180,6 @@ Item {
         property real leftEdgeCenterInset:  leftEdgeTopInset
     }
 
-    GripperMenu {
-        id: gripperOptions
-    }
-
     VehicleWarnings {
         anchors.centerIn:   parent
         z:                  QGroundControl.zOrderTopMost
@@ -202,11 +187,12 @@ Item {
 
     MapScale {
         id:                 mapScale
-        anchors.margins:    _toolsMargin
         anchors.left:       toolStrip.right
         anchors.top:        parent.top
         mapControl:         _mapControl
         buttonsOnLeft:      true
+        zoomButtonsVisible: false
+        autoHide:           true
         visible:            !ScreenTools.isTinyScreen && QGroundControl.corePlugin.options.flyView.showMapScale && !isViewer3DOpen && mapControl.pipState.state === mapControl.pipState.fullState
 
         property real topEdgeCenterInset: visible ? y + height : 0
diff --git a/src/FlightDisplay/GripperMenu.qml b/src/FlightDisplay/GripperMenu.qml
deleted file mode 100644
index 67083a52e14c..000000000000
--- a/src/FlightDisplay/GripperMenu.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Dialogs
-import QtLocation
-import QtPositioning
-import QtQuick.Layouts
-
-import QGroundControl
-
-import QGroundControl.Controls
-
-
-import QGroundControl.FlightMap
-
-QGCPopupDialog {
-    title: "Select one action"
-    property var  acceptFunction:     null
-    buttons:  Dialog.Cancel
-
-    onRejected:{
-        _guidedController._gripperFunction = Vehicle.Invalid_option
-        _guidedController.closeAll()
-        close()
-    }
-
-    onAccepted: {
-        if (acceptFunction) {
-            _guidedController._gripperFunction = Vehicle.Invalid_option
-            close()
-        }
-    }
-
-    RowLayout {
-        QGCColumnButton {
-            id: grabButton
-            text:                   "Grab"
-            iconSource:             "/res/GripperGrab.svg"
-            font.pointSize:         ScreenTools.defaultFontPointSize * 3.5
-            backRadius:             width / 40
-            heightFactor:           0.75
-            Layout.preferredHeight: releaseButton.height
-            Layout.preferredWidth:  releaseButton.width
-
-            onClicked: {
-                _guidedController._gripperFunction = Vehicle.Gripper_grab
-                close()
-            }
-        }
-
-        QGCColumnButton {
-            id: releaseButton
-            text:                   "Release"
-            iconSource:             "/res/GripperRelease.svg"
-            font.pointSize:         ScreenTools.defaultFontPointSize * 3.5
-            backRadius:             width / 40
-            heightFactor:           0.75
-            Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 27
-            Layout.preferredHeight: Layout.preferredWidth / 1.20
-
-            onClicked: {
-                _guidedController._gripperFunction = Vehicle.Gripper_release
-                close()
-            }
-        }
-    }
-}
diff --git a/src/FlightDisplay/GuidedActionConfirm.qml b/src/FlightDisplay/GuidedActionConfirm.qml
index 7ca10ce811fc..60f500e35d13 100644
--- a/src/FlightDisplay/GuidedActionConfirm.qml
+++ b/src/FlightDisplay/GuidedActionConfirm.qml
@@ -18,8 +18,8 @@ import QGroundControl.Controls
 import QGroundControl.UTMSP
 
 Rectangle {
-    id:         _root
-    width:      ScreenTools.defaultFontPixelWidth * 35
+    id:         control
+    width:      mainLayout.width + (_margins * 2)
     height:     mainLayout.height + (_margins * 2)
     radius:     ScreenTools.defaultFontPixelWidth / 2
     color:      qgcPal.window
@@ -27,8 +27,8 @@ Rectangle {
 
     property var    guidedController
     property var    guidedValueSlider
-    property string title                                       // Currently unused
-    property alias  message:            messageText.text
+    property string title
+    property string message
     property int    action
     property var    actionData
     property bool   hideTrigger:        false
@@ -36,7 +36,7 @@ Rectangle {
     property alias  optionText:         optionCheckBox.text
     property alias  optionChecked:      optionCheckBox.checked
 
-    property real _margins:         ScreenTools.defaultFontPixelWidth / 2
+    property real _margins:         ScreenTools.defaultFontPixelHeight / 2
     property bool _emergencyAction: action === guidedController.actionEmergencyStop
 
     // Properties of UTM adapter
@@ -45,12 +45,6 @@ Rectangle {
 
     Component.onCompleted: guidedController.confirmDialog = this
 
-    onVisibleChanged: {
-        if (visible) {
-            slider.focus = true
-        }
-    }
-
     onHideTriggerChanged: {
         if (hideTrigger) {
             confirmCancelled()
@@ -88,18 +82,17 @@ Rectangle {
     QGCPalette { id: qgcPal }
 
     ColumnLayout {
-        id:                 mainLayout
-        anchors.centerIn:   parent
-        width:              parent.width - (_margins * 2)
-        spacing:            _margins
+        id:         mainLayout
+        x:          control._margins
+        y:          control._margins
+        spacing:    control._margins
 
         QGCLabel {
-            id:                     messageText
             Layout.fillWidth:       true
+            Layout.leftMargin:      closeButton.width + closeButton.anchors.rightMargin
+            Layout.rightMargin:     Layout.leftMargin
+            text:                   control.message
             horizontalAlignment:    Text.AlignHCenter
-            wrapMode:               Text.WordWrap
-            font.pointSize:         ScreenTools.defaultFontPointSize
-            font.bold:              true
         }
 
         QGCCheckBox {
@@ -109,57 +102,48 @@ Rectangle {
             visible:            text !== ""
         }
 
-        RowLayout {
+        QGCDelayButton {
             Layout.fillWidth:   true
-            spacing:            ScreenTools.defaultFontPixelWidth
-
-            SliderSwitch {
-                id:                 slider
-                confirmText:        ScreenTools.isMobile ? qsTr("Slide to confirm") : qsTr("Slide or hold spacebar")
-                Layout.fillWidth:   true
-                enabled: _utmspEnabled === true? utmspSliderTrigger : true
-                opacity: if(_utmspEnabled){utmspSliderTrigger === true ? 1 : 0.5} else{1}
-
-                onAccept: {
-                    _root.visible = false
-                    var sliderOutputValue = 0
-                    if (guidedValueSlider.visible) {
-                        sliderOutputValue = guidedValueSlider.getOutputValue()
-                        guidedValueSlider.visible = false
-                    }
-                    hideTrigger = false
-                    guidedController.executeAction(_root.action, _root.actionData, sliderOutputValue, _root.optionChecked)
-                    if (mapIndicator) {
-                        mapIndicator.actionConfirmed()
-                        mapIndicator = undefined
-                    }
-
-                    UTMSPStateStorage.indicatorOnMissionStatus = true
-                    UTMSPStateStorage.currentNotificationIndex = 7
-                    UTMSPStateStorage.currentStateIndex = 3
+            text:               control.title
+            enabled:            _utmspEnabled === true? utmspSliderTrigger : true
+            opacity:            if(_utmspEnabled){utmspSliderTrigger === true ? 1 : 0.5} else{1}
+
+            onActivated: {
+                control.visible = false
+                var sliderOutputValue = 0
+                if (guidedValueSlider.visible) {
+                    sliderOutputValue = guidedValueSlider.getOutputValue()
+                    guidedValueSlider.visible = false
                 }
-            }
-
-            Rectangle {
-                height: slider.height * 0.75
-                width:  height
-                radius: height / 2
-                color:  qgcPal.primaryButton
-
-                QGCColoredImage {
-                    anchors.margins:    parent.height / 4
-                    anchors.fill:       parent
-                    source:             "/res/XDelete.svg"
-                    fillMode:           Image.PreserveAspectFit
-                    color:              qgcPal.text
+                hideTrigger = false
+                guidedController.executeAction(control.action, control.actionData, sliderOutputValue, control.optionChecked)
+                if (mapIndicator) {
+                    mapIndicator.actionConfirmed()
+                    mapIndicator = undefined
                 }
 
-                QGCMouseArea {
-                    fillItem:   parent
-                    onClicked:  confirmCancelled()
-                }
+                UTMSPStateStorage.indicatorOnMissionStatus = true
+                UTMSPStateStorage.currentNotificationIndex = 7
+                UTMSPStateStorage.currentStateIndex = 3
             }
         }
     }
-}
 
+    QGCColoredImage {
+        id:                     closeButton
+        anchors.topMargin:      _margins / 2
+        anchors.rightMargin:    _margins / 2
+        anchors.top:            parent.top
+        anchors.right:          parent.right
+        height:                 ScreenTools.defaultFontPixelHeight * 0.5
+        width:                  height
+        source:                 "/res/XDelete.svg"
+        fillMode:               Image.PreserveAspectFit
+        color:                  qgcPal.text
+
+        QGCMouseArea {
+            fillItem:   parent
+            onClicked:  confirmCancelled()
+        }
+    }
+}
diff --git a/src/FlightDisplay/GuidedActionGripper.qml b/src/FlightDisplay/GuidedActionGripper.qml
deleted file mode 100644
index 71960d4fe88f..000000000000
--- a/src/FlightDisplay/GuidedActionGripper.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-import QGroundControl.FlightDisplay
-import QGroundControl
-
-GuidedToolStripAction {
-    property var   activeVehicle:           QGroundControl.multiVehicleManager.activeVehicle 
-    property bool  _initialConnectComplete: activeVehicle ? activeVehicle.initialConnectComplete : false
-    property bool  _grip_enable:            _initialConnectComplete ? activeVehicle.hasGripper : false
-    property bool  _isVehicleArmed:         _initialConnectComplete ? activeVehicle.armed : false
-
-    text:       "Gripper"
-    iconSource: "/res/Gripper.svg"          
-    visible:    !_isVehicleArmed && _grip_enable   // in this way if the pilot it's on the ground can release the cargo without actions tool
-    enabled:    _grip_enable
-    actionID:   _guidedController.actionGripper
-}
diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
index cffc8fb7b4a4..e3232cbba266 100644
--- a/src/FlightDisplay/GuidedActionsController.qml
+++ b/src/FlightDisplay/GuidedActionsController.qml
@@ -40,7 +40,6 @@ Item {
     readonly property string mvDisarmTitle:                 qsTr("Disarm (MV)")
     readonly property string rtlTitle:                      qsTr("Return")
     readonly property string takeoffTitle:                  qsTr("Takeoff")
-    readonly property string gripperTitle:                  qsTr("Gripper Function")
     readonly property string landTitle:                     qsTr("Land")
     readonly property string startMissionTitle:             qsTr("Start Mission")
     readonly property string mvStartMissionTitle:           qsTr("Start Mission (MV)")
@@ -56,7 +55,6 @@ Item {
     readonly property string landAbortTitle:                qsTr("Land Abort")
     readonly property string setWaypointTitle:              qsTr("Set Waypoint")
     readonly property string gotoTitle:                     qsTr("Go To Location")
-    readonly property string vtolTransitionTitle:           qsTr("VTOL Transition")
     readonly property string roiTitle:                      qsTr("ROI")
     readonly property string setHomeTitle:                  qsTr("Set Home")
     readonly property string setEstimatorOriginTitle:       qsTr("Set Estimator origin")
@@ -70,7 +68,6 @@ Item {
     readonly property string mvDisarmMessage:                   qsTr("Disarm selected vehicles.")
     readonly property string emergencyStopMessage:              qsTr("WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.")
     readonly property string takeoffMessage:                    qsTr("Takeoff from ground and hold position.")
-    readonly property string gripperMessage:                    qsTr("Grab or Release the cargo")
     readonly property string startMissionMessage:               qsTr("Takeoff from ground and start the current mission.")
     readonly property string mvStartMissionMessage:             qsTr("Takeoff from ground and start the current mission for selected vehicles.")
     readonly property string continueMissionMessage:            qsTr("Continue the mission from the current waypoint.")
@@ -87,8 +84,6 @@ Item {
     readonly property string landAbortMessage:                  qsTr("Abort the landing sequence.")
     readonly property string pauseMessage:                      qsTr("Pause the vehicle at it's current position, adjusting altitude up or down as needed.")
     readonly property string mvPauseMessage:                    qsTr("Pause selected vehicles at their current position.")
-    readonly property string vtolTransitionFwdMessage:          qsTr("Transition VTOL to fixed wing flight.")
-    readonly property string vtolTransitionMRMessage:           qsTr("Transition VTOL to multi-rotor flight.")
     readonly property string roiMessage:                        qsTr("Make the specified location a Region Of Interest.")
     readonly property string setHomeMessage:                    qsTr("Set vehicle home as the specified location. This will affect Return to Home position")
     readonly property string setEstimatorOriginMessage:         qsTr("Make the specified location the estimator origin.")
@@ -114,21 +109,16 @@ Item {
     readonly property int actionPause:                      17
     readonly property int actionMVPause:                    18
     readonly property int actionMVStartMission:             19
-    readonly property int actionVtolTransitionToFwdFlight:  20
-    readonly property int actionVtolTransitionToMRFlight:   21
-    readonly property int actionROI:                        22
-    readonly property int actionForceArm:                   24
-    readonly property int actionChangeSpeed:                25
-    readonly property int actionGripper:                    26
-    readonly property int actionSetHome:                    27
-    readonly property int actionSetEstimatorOrigin:         28
-    readonly property int actionSetFlightMode:              29
-    readonly property int actionChangeHeading:              30
-    readonly property int actionMVArm:                      31
-    readonly property int actionMVDisarm:                   32
-    readonly property int actionChangeLoiterRadius:         33
-
-
+    readonly property int actionROI:                        20
+    readonly property int actionForceArm:                   21
+    readonly property int actionChangeSpeed:                22
+    readonly property int actionSetHome:                    24
+    readonly property int actionSetEstimatorOrigin:         25
+    readonly property int actionSetFlightMode:              26
+    readonly property int actionChangeHeading:              27
+    readonly property int actionMVArm:                      28
+    readonly property int actionMVDisarm:                   29
+    readonly property int actionChangeLoiterRadius:         30
 
     readonly property int customActionStart:                10000 // Custom actions ids should start here so that they don't collide with the built in actions
 
@@ -161,7 +151,6 @@ Item {
     property bool showLandAbort:            _guidedActionsEnabled && _vehicleFlying && _fixedWingOnApproach
     property bool showGotoLocation:         _guidedActionsEnabled && _vehicleFlying
     property bool showSetHome:              _guidedActionsEnabled
-    property bool showGripper:              _initialConnectComplete ? _activeVehicle.hasGripper : false
     property bool showSetEstimatorOrigin:   _activeVehicle && !(_activeVehicle.sensorsPresentBits & Vehicle.SysStatusSensorGPS)
     property bool showChangeHeading:        _guidedActionsEnabled && _vehicleFlying
 
@@ -197,7 +186,6 @@ Item {
     property bool   _fixedWingOnApproach:   _activeVehicle ? _activeVehicle.fixedWing && _vehicleLanding : false
     property bool   _vehicleInFwdFlight:    _activeVehicle ? _activeVehicle.inFwdFlight : false
     property bool  _speedLimitsAvailable:   _activeVehicle && ((_vehicleInFwdFlight && _activeVehicle.haveFWSpeedLimits) || (!_vehicleInFwdFlight && _activeVehicle.haveMRSpeedLimits))
-    property var   _gripperFunction:        undefined
 
     // You can turn on log output for GuidedActionsController by turning on GuidedActionsControllerLog category
     property bool __guidedModeSupported:    _activeVehicle ? _activeVehicle.guidedModeSupported : false
@@ -370,8 +358,6 @@ Item {
         function onArmVehicleRequest() { armVehicleRequest() }
         function onForceArmVehicleRequest() { forceArmVehicleRequest() }
         function onDisarmVehicleRequest() { disarmVehicleRequest() }
-        function onVtolTransitionToFwdFlightRequest() { vtolTransitionToFwdFlightRequest() }
-        function onVtolTransitionToMRFlightRequest() { vtolTransitionToMRFlightRequest() }
     }
 
     function armVehicleRequest() {
@@ -391,14 +377,6 @@ Item {
 
     }
 
-    function vtolTransitionToFwdFlightRequest() {
-        confirmAction(actionVtolTransitionToFwdFlight)
-    }
-
-    function vtolTransitionToMRFlightRequest() {
-        confirmAction(actionVtolTransitionToMRFlight)
-    }
-
     function closeAll() {
         confirmDialog.visible = false
         guidedValueSlider.visible = false
@@ -543,16 +521,6 @@ Item {
             confirmDialog.message = mvPauseMessage
             confirmDialog.hideTrigger = true
             break;
-        case actionVtolTransitionToFwdFlight:
-            confirmDialog.title = vtolTransitionTitle
-            confirmDialog.message = vtolTransitionFwdMessage
-            confirmDialog.hideTrigger = true
-            break
-        case actionVtolTransitionToMRFlight:
-            confirmDialog.title = vtolTransitionTitle
-            confirmDialog.message = vtolTransitionMRMessage
-            confirmDialog.hideTrigger = true
-            break
         case actionROI:
             confirmDialog.title = roiTitle
             confirmDialog.message = roiMessage
@@ -564,12 +532,6 @@ Item {
             confirmDialog.message = changeSpeedMessage
             guidedValueSlider.visible = true
             break
-        case actionGripper:
-            confirmDialog.hideTrigger = true
-            confirmDialog.title = gripperTitle
-            confirmDialog.message = gripperMessage
-            _widgetLayer._gripperMenu.createObject(mainWindow).open()
-            break
         case actionSetHome:
             confirmDialog.title = setHomeTitle
             confirmDialog.message = setHomeMessage
@@ -697,12 +659,6 @@ Item {
                 selectedVehicles.get(i).pauseVehicle()
             }
             break
-        case actionVtolTransitionToFwdFlight:
-            _activeVehicle.vtolInFwdFlight = true
-            break
-        case actionVtolTransitionToMRFlight:
-            _activeVehicle.vtolInFwdFlight = false
-            break
         case actionROI:
             _activeVehicle.guidedModeROI(actionData)
             break
@@ -717,9 +673,6 @@ Item {
                 }
             }
             break
-        case actionGripper:           
-            _gripperFunction === undefined ? _activeVehicle.sendGripperAction(Vehicle.Invalid_option) : _activeVehicle.sendGripperAction(_gripperFunction)
-            break
         case actionSetHome:
             _activeVehicle.doSetHome(actionData)
             break
diff --git a/src/FlightDisplay/GuidedValueSlider.qml b/src/FlightDisplay/GuidedValueSlider.qml
index 366e3c8faebd..464f4b30083b 100644
--- a/src/FlightDisplay/GuidedValueSlider.qml
+++ b/src/FlightDisplay/GuidedValueSlider.qml
@@ -63,7 +63,7 @@ Item {
     property int    _majorTickAdjustment:               _majorTicksVisibleAboveIndicator * _majorTickValueStep
 
     // Calculate the next major tick above/below min/max
-    property int    _majorTickMaxValue:     Math.ceil((_sliderMaxVal + _majorTickAdjustment)/ _majorTickValueStep) * _majorTickValueStep 
+    property int    _majorTickMaxValue:     Math.ceil((_sliderMaxVal + _majorTickAdjustment)/ _majorTickValueStep) * _majorTickValueStep
     property int    _majorTickMinValue:     Math.floor((_sliderMinVal - _majorTickAdjustment)/ _majorTickValueStep) * _majorTickValueStep
 
     // Now calculate the position we draw the first tick mark such that we are not allowed to flick above the max value
@@ -131,7 +131,7 @@ Item {
             font.pointSize:     ScreenTools.smallFontPointSize
             text:               _displayText
         }
-      
+
         QGCFlickable {
             id:                 sliderFlickable
             Layout.fillWidth:   true
@@ -250,6 +250,14 @@ Item {
             ctx.stroke()
         }
 
+        // Repaint when palette changes
+        Connections {
+            target: _qgcPal
+            function onPaletteChanged() {
+                indicatorCanvas.requestPaint()
+            }
+        }
+
         QGCLabel {
             id:                     valueLabel
             anchors.margins:        indicatorCanvas.indicatorValueMargins
@@ -260,8 +268,8 @@ Item {
             text:                   _clampedSliderValueString(_sliderValue) + " " + unitsString
             font.pointSize:         ScreenTools.largeFontPointSize
 
-            property var unitsString: _sliderType === GuidedValueSlider.Speed ? 
-                                        QGroundControl.unitsConversion.appSettingsSpeedUnitsString : 
+            property var unitsString: _sliderType === GuidedValueSlider.Speed ?
+                                        QGroundControl.unitsConversion.appSettingsSpeedUnitsString :
                                             QGroundControl.unitsConversion.appSettingsVerticalDistanceUnitsString
         }
 
diff --git a/src/FlightDisplay/MultiRotorChecklist.qml b/src/FlightDisplay/MultiRotorChecklist.qml
index f0a2779339e0..b5e87a8cd385 100644
--- a/src/FlightDisplay/MultiRotorChecklist.qml
+++ b/src/FlightDisplay/MultiRotorChecklist.qml
@@ -84,4 +84,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightDisplay/ObstacleDistanceOverlayMap.qml b/src/FlightDisplay/ObstacleDistanceOverlayMap.qml
index 8a28f91f8efb..6c3a5b7ff977 100644
--- a/src/FlightDisplay/ObstacleDistanceOverlayMap.qml
+++ b/src/FlightDisplay/ObstacleDistanceOverlayMap.qml
@@ -111,4 +111,3 @@ Item {
         id: obstacleDistance
     }
 }
-
diff --git a/src/FlightDisplay/ProximityRadarValues.qml b/src/FlightDisplay/ProximityRadarValues.qml
index 20e912b87eba..bb92183f1a1e 100644
--- a/src/FlightDisplay/ProximityRadarValues.qml
+++ b/src/FlightDisplay/ProximityRadarValues.qml
@@ -51,4 +51,3 @@ QtObject {
     onRotationYaw270ValueChanged:   rotationValueChanged()
     onRotationYaw315ValueChanged:   rotationValueChanged()
 }
-
diff --git a/src/FlightDisplay/ProximityRadarVideoView.qml b/src/FlightDisplay/ProximityRadarVideoView.qml
index 8f1024a14244..da3d8c4dcfb0 100644
--- a/src/FlightDisplay/ProximityRadarVideoView.qml
+++ b/src/FlightDisplay/ProximityRadarVideoView.qml
@@ -87,4 +87,3 @@ Item {
     }
 
 }
-
diff --git a/src/FlightDisplay/VTOLChecklist.qml b/src/FlightDisplay/VTOLChecklist.qml
index 8893c7cbd47d..b50b6f526385 100644
--- a/src/FlightDisplay/VTOLChecklist.qml
+++ b/src/FlightDisplay/VTOLChecklist.qml
@@ -89,4 +89,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightDisplay/VirtualJoystick.qml b/src/FlightDisplay/VirtualJoystick.qml
index 8522f36dcdc0..5ff900b110cd 100644
--- a/src/FlightDisplay/VirtualJoystick.qml
+++ b/src/FlightDisplay/VirtualJoystick.qml
@@ -29,7 +29,7 @@ Item {
     property var   calibration:               false
     property var   uiTotalWidth
     property var   uiRealX
-        
+
     Timer {
         interval:   40  // 25Hz, same as real joystick rate
         running:    QGroundControl.settingsManager.appSettings.virtualJoystick.value
diff --git a/src/FlightMap/CMakeLists.txt b/src/FlightMap/CMakeLists.txt
index c942298a0fa0..58adacc03a5e 100644
--- a/src/FlightMap/CMakeLists.txt
+++ b/src/FlightMap/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Flight Map Module
+# Map widgets, vehicle indicators, and mission visualization
+# ============================================================================
+
 qt_add_library(FlightMapModule STATIC)
 
 qt_add_qml_module(FlightMapModule
diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml
index 484852a1de24..4f0619cba469 100644
--- a/src/FlightMap/FlightMap.qml
+++ b/src/FlightMap/FlightMap.qml
@@ -120,7 +120,7 @@ Map {
     signal mapPanStart
     signal mapPanStop
     signal mapClicked(var position)
-    
+
     PinchHandler {
         id:     pinchHandler
         target: null
diff --git a/src/FlightMap/MapItems/ProximityRadarMapView.qml b/src/FlightMap/MapItems/ProximityRadarMapView.qml
index ac5d4eff44e4..0ad79b478136 100644
--- a/src/FlightMap/MapItems/ProximityRadarMapView.qml
+++ b/src/FlightMap/MapItems/ProximityRadarMapView.qml
@@ -121,4 +121,3 @@ MapQuickItem {
 
     }
 }
-
diff --git a/src/FlightMap/MapItems/QGCMapCircleVisuals.qml b/src/FlightMap/MapItems/QGCMapCircleVisuals.qml
index 598a22429721..5999c259ee9e 100644
--- a/src/FlightMap/MapItems/QGCMapCircleVisuals.qml
+++ b/src/FlightMap/MapItems/QGCMapCircleVisuals.qml
@@ -285,4 +285,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml b/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml
index 12e22c6437d3..59002467ef1c 100644
--- a/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml
+++ b/src/FlightMap/MapItems/QGCMapPolygonVisuals.qml
@@ -63,8 +63,8 @@ Item {
     function addEditingVisuals() {
         if (_objMgrEditingVisuals.empty) {
             _objMgrEditingVisuals.createObjects(
-                [ dragHandlesComponent, splitHandlesComponent, centerDragHandleComponent, edgeLengthHandlesComponent ], 
-                mapControl, 
+                [ dragHandlesComponent, splitHandlesComponent, centerDragHandleComponent, edgeLengthHandlesComponent ],
+                mapControl,
                 false /* addToMap */)
         }
     }
@@ -738,4 +738,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightMap/MapItems/QGCMapPolylineVisuals.qml b/src/FlightMap/MapItems/QGCMapPolylineVisuals.qml
index b58ab68e2a7f..296711fa1815 100644
--- a/src/FlightMap/MapItems/QGCMapPolylineVisuals.qml
+++ b/src/FlightMap/MapItems/QGCMapPolylineVisuals.qml
@@ -376,4 +376,3 @@ Item {
         }
     }
 }
-
diff --git a/src/FlightMap/MapItems/VehicleMapItem.qml b/src/FlightMap/MapItems/VehicleMapItem.qml
index fc3342fa27e6..5a6940a1d5b7 100644
--- a/src/FlightMap/MapItems/VehicleMapItem.qml
+++ b/src/FlightMap/MapItems/VehicleMapItem.qml
@@ -56,10 +56,10 @@ MapQuickItem {
             blurMax: 32
             blurMultiplier: .1
         }
-            
+
         Repeater {
-            model: vehicle ? vehicle.gimbalController.gimbals : [] 
-            
+            model: vehicle ? vehicle.gimbalController.gimbals : []
+
             Item {
                 id:                           canvasItem
                 anchors.centerIn:             vehicleItem
diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml
index b9b76b0cea22..76a3f388278e 100644
--- a/src/FlightMap/MapScale.qml
+++ b/src/FlightMap/MapScale.qml
@@ -17,7 +17,7 @@ import QGroundControl.Controls
 
 /// Map scale control
 Item {
-    id:     scale
+    id:     control
     width:  buttonsOnLeft || !_zoomButtonsVisible ? rightEnd.x + rightEnd.width : zoomDownButton.x + zoomDownButton.width
     height: rightEnd.y + rightEnd.height
 
@@ -26,6 +26,7 @@ Item {
     property alias  terrainButtonChecked:   terrainButton.checked
     property bool   zoomButtonsVisible:     true
     property bool   buttonsOnLeft:          true    ///< Buttons to left/right of scale bar
+    property bool   autoHide:               false   ///< true: disappears after a timeout on scale change
 
     signal terrainButtonClicked
 
@@ -118,8 +119,8 @@ Item {
     function calculateScale() {
         if(mapControl) {
             var scaleLinePixelLength = 100
-            var leftCoord  = mapControl.toCoordinate(Qt.point(0, scale.y), false /* clipToViewPort */)
-            var rightCoord = mapControl.toCoordinate(Qt.point(scaleLinePixelLength, scale.y), false /* clipToViewPort */)
+            var leftCoord  = mapControl.toCoordinate(Qt.point(0, control.y), false /* clipToViewPort */)
+            var rightCoord = mapControl.toCoordinate(Qt.point(scaleLinePixelLength, control.y), false /* clipToViewPort */)
             var scaleLineMeters = Math.round(leftCoord.distanceTo(rightCoord))
             if (QGroundControl.settingsManager.unitsSettings.horizontalDistanceUnits.value === UnitsSettings.HorizontalDistanceUnitsFeet) {
                 calculateFeetRatio(scaleLineMeters, scaleLinePixelLength)
@@ -129,19 +130,38 @@ Item {
         }
     }
 
+    function triggerRecalc() {
+        calculateScale()
+        if (control.autoHide) {
+            autoHideTimer.restart()
+            autoHideAnimation.stop()
+            control.opacity = 1
+        }
+    }
+
+
+    Component.onCompleted: calculateScale()
+
     Connections {
-        target:             mapControl
-        function onWidthChanged() {     scaleTimer.restart() }
-        function onHeightChanged() {    scaleTimer.restart() }
-        function onZoomLevelChanged() { scaleTimer.restart() }
+        target: mapControl
+        function onWidthChanged() { triggerRecalc() }
+        function onHeightChanged() { triggerRecalc() }
+        function onZoomLevelChanged() { triggerRecalc() }
+    }
+
+    PropertyAnimation {
+        id:         autoHideAnimation
+        target:     control
+        property:   "opacity"
+        from:       1
+        to:         0
+        duration:   500
     }
 
     Timer {
-        id:                 scaleTimer
-        interval:           100
-        running:            false
-        repeat:             false
-        onTriggered:        calculateScale()
+        id:             autoHideTimer
+        interval:       3000
+        onTriggered:    autoHideAnimation.start()
     }
 
     QGCMapLabel {
@@ -223,10 +243,4 @@ Item {
         visible:            _zoomButtonsVisible
         onClicked:          mapControl.zoomLevel -= 0.5
     }
-
-    Component.onCompleted: {
-        if (scale.visible) {
-            calculateScale();
-        }
-    }
 }
diff --git a/src/FlightMap/Widgets/CompassDial.qml b/src/FlightMap/Widgets/CompassDial.qml
index 81e6ca960110..b5a3b416bb5b 100644
--- a/src/FlightMap/Widgets/CompassDial.qml
+++ b/src/FlightMap/Widgets/CompassDial.qml
@@ -23,7 +23,7 @@ Item {
 
     function translateCenterToAngleX(radius, angle) {
         return radius * Math.sin(angle * (Math.PI / 180))
-    } 
+    }
 
     function translateCenterToAngleY(radius, angle) {
         return -radius * Math.cos(angle * (Math.PI / 180))
@@ -108,5 +108,5 @@ Item {
                 angle:      45 / 2 + (45 * index)
             }
         }
-    }    
+    }
 }
diff --git a/src/FlightMap/Widgets/PhotoVideoControl.qml b/src/FlightMap/Widgets/PhotoVideoControl.qml
index 74df33cba472..fc220da114ce 100644
--- a/src/FlightMap/Widgets/PhotoVideoControl.qml
+++ b/src/FlightMap/Widgets/PhotoVideoControl.qml
@@ -14,20 +14,15 @@ import QtQuick.Controls
 import QtQuick.Dialogs
 
 import QGroundControl
-
 import QGroundControl.Controls
-
-
-
-
 import QGroundControl.FactControls
 
 Rectangle {
-    width:      mainLayout.width + (_margins * 2)
-    height:     mainLayout.height + (_margins * 2)
+    width:      mainLayout.width + (_smallMargins * 2)
+    height:     mainLayout.height + (_smallMargins * 2)
     color:      Qt.rgba(qgcPal.window.r, qgcPal.window.g, qgcPal.window.b, 0.5)
     radius:     _margins
-    visible:    _camera.capturesVideo || _camera.capturesPhotos
+    visible:    _camera.capturesVideo || _camera.capturesPhotos || _camera.hasTracking || _camera.hasVideoStream
 
     property real   _margins:                   ScreenTools.defaultFontPixelHeight / 2
     property real   _smallMargins:              ScreenTools.defaultFontPixelWidth / 2
@@ -40,6 +35,67 @@ Rectangle {
     property bool   _photoCaptureSingleIdle:    _camera.photoCaptureStatus === MavlinkCameraControl.PHOTO_CAPTURE_IDLE
     property bool   _photoCaptureIntervalIdle:  _camera.photoCaptureStatus === MavlinkCameraControl.PHOTO_CAPTURE_INTERVAL_IDLE
     property bool   _photoCaptureIdle:          _photoCaptureSingleIdle || _photoCaptureIntervalIdle
+    property color  _captureButtonColor:       _cameraInPhotoMode ? qgcPal.photoCaptureButtonColor : qgcPal.videoCaptureButtonColor
+
+/*
+    // Used for testing camera ui options. Set _camera to testCamera to use.
+    QtObject {
+        id: testCamera
+
+        property bool capturesVideo: false
+        property bool capturesPhotos: true
+        property bool hasModes: true
+        property bool hasZoom: true
+        property bool hasTracking: true
+        property string modelName: "Test Camera"
+        property int cameraMode: MavlinkCameraControl.CAM_MODE_PHOTO
+        property int videoCaptureStatus: MavlinkCameraControl.VIDEO_CAPTURE_STATUS_STOPPED
+        property int photoCaptureStatus: MavlinkCameraControl.PHOTO_CAPTURE_IDLE
+        property int zoomLevel: 0
+        property int photoCaptureMode: MavlinkCameraControl.PHOTO_CAPTURE_SINGLE
+        property int photoLapse: 5
+        property int thermalMode: MavlinkCameraControl.THERMAL_OFF
+        property int thermalOpacity: 50
+        property int storageStatus: MavlinkCameraControl.STORAGE_READY
+        property int batteryRemaining: 75
+        property int recordTime: 0
+        property string storageFreeStr: "32 GB"
+        property string batteryRemainingStr: "75 %"
+        property string recordTimeStr: "00:00:00"
+        property bool trackingEnabled: false
+
+        function setCameraModeVideo() {
+            cameraMode = MavlinkCameraControl.CAM_MODE_VIDEO;
+            videoCaptureStatus = MavlinkCameraControl.VIDEO_CAPTURE_STATUS_STOPPED;
+            photoCaptureStatus = MavlinkCameraControl.PHOTO_CAPTURE_IDLE;
+        }
+
+        function setCameraModePhoto() {
+            cameraMode = MavlinkCameraControl.CAM_MODE_PHOTO;
+            videoCaptureStatus = MavlinkCameraControl.VIDEO_CAPTURE_STATUS_STOPPED;
+            photoCaptureStatus = MavlinkCameraControl.PHOTO_CAPTURE_IDLE;
+        }
+
+        function takePhoto() {
+            photoCaptureStatus = MavlinkCameraControl.PHOTO_CAPTURE_IN_PROGRESS;
+            takePhotoTimer.start();
+        }
+
+        function toggleVideoRecording() {
+            if (videoCaptureStatus === MavlinkCameraControl.VIDEO_CAPTURE_STATUS_RUNNING) {
+                videoCaptureStatus = MavlinkCameraControl.VIDEO_CAPTURE_STATUS_STOPPED;
+            } else {
+                videoCaptureStatus = MavlinkCameraControl.VIDEO_CAPTURE_STATUS_RUNNING;
+            }
+        }
+    }
+
+    Timer {
+        id:             takePhotoTimer
+        interval:       500
+        onTriggered:    testCamera.photoCaptureStatus = MavlinkCameraControl.PHOTO_CAPTURE_IDLE
+    }
+*/
 
     QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
 
@@ -47,14 +103,14 @@ Rectangle {
 
     RowLayout {
         id:                 mainLayout
-        anchors.margins:    _margins
+        anchors.margins:    _smallMargins
         anchors.top:        parent.top
         anchors.left:       parent.left
         spacing:            _margins
 
         ColumnLayout {
             Layout.fillHeight:  true
-            spacing:            _margins
+            spacing:            0
             visible:            _camera.hasZoom
 
             QGCLabel {
@@ -74,108 +130,122 @@ Rectangle {
                 onValueChanged:     _camera.zoomLevel = value
             }
         }
-        
+
         ColumnLayout {
-            spacing: _margins * 2
+            spacing: _margins
 
-            ColumnLayout {
-                spacing: _margins
+            // Camera name
+            QGCLabel {
+                Layout.alignment:   Qt.AlignHCenter
+                text:               _camera.modelName
+                visible:            _cameraManager.cameras.length > 1
+            }
 
-                // Camera name
-                QGCLabel {
-                    Layout.alignment:   Qt.AlignHCenter
-                    text:               _camera.modelName
-                    visible:            _cameraManager.cameras.length > 1
-                }
+            // Photo/Video Mode Selector
+            Rectangle {
+                Layout.alignment:   Qt.AlignHCenter
+                width:              ScreenTools.defaultFontPixelWidth * 10
+                height:             width / 2
+                color:              qgcPal.windowShadeLight
+                radius:             height * 0.5
+                visible:            _camera.hasModes
 
-                // Photo/Video Mode Selector
+                //-- Video Mode
                 Rectangle {
-                    Layout.alignment:   Qt.AlignHCenter
-                    width:              ScreenTools.defaultFontPixelWidth * 10
-                    height:             width / 2
-                    color:              qgcPal.windowShadeLight
-                    radius:             height * 0.5
-                    visible:            _camera.hasModes
+                    anchors.verticalCenter: parent.verticalCenter
+                    width:                  parent.height
+                    height:                 parent.height
+                    color:                  _cameraInVideoMode ? qgcPal.window : qgcPal.windowShadeLight
+                    radius:                 height * 0.5
+                    anchors.left:           parent.left
+                    border.color:           qgcPal.text
+                    border.width:           _cameraInPhotoMode ? 0 : 1
 
-                    //-- Video Mode
-                    Rectangle {
-                        anchors.verticalCenter: parent.verticalCenter
-                        width:                  parent.height
-                        height:                 parent.height
-                        color:                  _cameraInVideoMode ? qgcPal.window : qgcPal.windowShadeLight
-                        radius:                 height * 0.5
-                        anchors.left:           parent.left
-                        border.color:           qgcPal.text
-                        border.width:           _cameraInPhotoMode ? 0 : 1
-
-                        QGCColoredImage {
-                            height:             parent.height * 0.5
-                            width:              height
-                            anchors.centerIn:   parent
-                            source:             "/qmlimages/camera_video.svg"
-                            fillMode:           Image.PreserveAspectFit
-                            sourceSize.height:  height
-                            color:              _cameraInVideoMode ? qgcPal.colorGreen : qgcPal.text
-
-                            MouseArea {
-                                anchors.fill:   parent
-                                enabled:        _cameraInPhotoMode ? _photoCaptureIdle : true
-                                onClicked:      _camera.setCameraModeVideo()
-                            }
+                    QGCColoredImage {
+                        height:             parent.height * 0.5
+                        width:              height
+                        anchors.centerIn:   parent
+                        source:             "/qmlimages/camera_video.svg"
+                        fillMode:           Image.PreserveAspectFit
+                        sourceSize.height:  height
+                        color:              _cameraInVideoMode ? qgcPal.colorGreen : qgcPal.text
+
+                        MouseArea {
+                            anchors.fill:   parent
+                            enabled:        _cameraInPhotoMode ? _photoCaptureIdle : true
+                            onClicked:      _camera.setCameraModeVideo()
                         }
                     }
-                    
-                    //-- Photo Mode
-                    Rectangle {
-                        anchors.verticalCenter: parent.verticalCenter
-                        width:                  parent.height
-                        height:                 parent.height
-                        color:                  _cameraInPhotoMode ? qgcPal.window : qgcPal.windowShadeLight
-                        radius:                 height * 0.5
-                        anchors.right:          parent.right
-                        border.color:           qgcPal.text
-                        border.width:           _cameraInPhotoMode ? 1 : 0
-
-                        QGCColoredImage {
-                            height:             parent.height * 0.5
-                            width:              height
-                            anchors.centerIn:   parent
-                            source:             "/qmlimages/camera_photo.svg"
-                            fillMode:           Image.PreserveAspectFit
-                            sourceSize.height:  height
-                            color:              _cameraInPhotoMode ? qgcPal.colorGreen : qgcPal.text
-
-                            MouseArea {
-                                anchors.fill:   parent
-                                enabled:        _cameraInVideoMode ? _videoCaptureIdle : true
-                                onClicked:      _camera.setCameraModePhoto()
-                            }
+                }
+
+                //-- Photo Mode
+                Rectangle {
+                    anchors.verticalCenter: parent.verticalCenter
+                    width:                  parent.height
+                    height:                 parent.height
+                    color:                  _cameraInPhotoMode ? qgcPal.window : qgcPal.windowShadeLight
+                    radius:                 height * 0.5
+                    anchors.right:          parent.right
+                    border.color:           qgcPal.text
+                    border.width:           _cameraInPhotoMode ? 1 : 0
+
+                    QGCColoredImage {
+                        height:             parent.height * 0.5
+                        width:              height
+                        anchors.centerIn:   parent
+                        source:             "/qmlimages/camera_photo.svg"
+                        fillMode:           Image.PreserveAspectFit
+                        sourceSize.height:  height
+                        color:              _cameraInPhotoMode ? qgcPal.colorGreen : qgcPal.text
+
+                        MouseArea {
+                            anchors.fill:   parent
+                            enabled:        _cameraInVideoMode ? _videoCaptureIdle : true
+                            onClicked:      _camera.setCameraModePhoto()
                         }
                     }
                 }
+            }
+
+            ColumnLayout {
+                Layout.alignment:   Qt.AlignHCenter
+                spacing:            _smallMargins
+                visible:            _camera.capturesVideo || _camera.capturesPhotos
 
                 // Take Photo, Start/Stop Video button
                 Rectangle {
                     Layout.alignment:   Qt.AlignHCenter
-                    color:              Qt.rgba(0,0,0,0)
+                    color:              qgcPal.button
                     width:              ScreenTools.defaultFontPixelWidth * 6
                     height:             width
                     radius:             width * 0.5
-                    border.color:       qgcPal.buttonText
-                    border.width:       3
+                    border.width:       1
+                    border.color:       qgcPal.buttonBorder
+
+                   Rectangle {
+                        anchors.centerIn:           parent
+                        anchors.alignWhenCentered:  false // Prevents anchors.centerIn from snapping to integer coordinates, which can throw off centering.
+                        color:                      qgcPal.buttonBorder
+                        width:                      parent.width * 0.75
+                        height:                     width
+                        radius:                     width * 0.5
+                    }
 
                     Rectangle {
-                        anchors.centerIn:   parent
-                        width:              parent.width * (_isShootingInCurrentMode ? 0.5 : 0.75)
-                        height:             width
-                        radius:             _isShootingInCurrentMode ? 0 : width * 0.5
-                        color:              _isShootingInCurrentMode || _canShootInCurrentMode ? qgcPal.colorRed : qgcPal.colorGrey
+                        anchors.centerIn:           parent
+                        anchors.alignWhenCentered:  false // Prevents anchors.centerIn from snapping to integer coordinates, which can throw off centering.
+                        width:                      parent.width * (_isShootingInCurrentMode ? 0.5 : 0.75)
+                        height:                     width
+                        radius:                     _isShootingInCurrentMode ? ScreenTools.defaultFontPixelWidth * 0.5 : width * 0.5
+                        color:                      _captureButtonColor
+                        border.width:               1
+                        border.color:               qgcPal.buttonBorder
 
                         property bool _isShootingInPhotoMode:   _cameraInPhotoMode && _camera.photoCaptureStatus === MavlinkCameraControl.PHOTO_CAPTURE_IN_PROGRESS
                         property bool _isShootingInVideoMode:   (!_cameraInPhotoMode && _camera.videoCaptureStatus === MavlinkCameraControl.VIDEO_CAPTURE_STATUS_RUNNING)
                         property bool _isShootingInCurrentMode: _cameraInPhotoMode ? _isShootingInPhotoMode : _isShootingInVideoMode
                         property bool _isShootingInOtherMode:   _cameraInPhotoMode ? _isShootingInVideoMode : _isShootingInPhotoMode
-                        property bool _canShootInCurrentMode:   _isShootingInOtherMode ? 
+                        property bool _canShootInCurrentMode:   _isShootingInOtherMode ?
                                                                     (_cameraInPhotoMode ? _camera.photosInVideoMode : _camera.videoInPhotoMode) :
                                                                     true
                     }
@@ -201,10 +271,10 @@ Rectangle {
                 // Record time / Capture count
                 Rectangle {
                     Layout.alignment:       Qt.AlignHCenter
-                    color:                  !_videoCaptureIdle && !_photoCaptureIdle ? "transparent" : qgcPal.colorRed
+                    color:                  _videoCaptureIdle && _photoCaptureIdle ? "transparent" : _captureButtonColor
                     Layout.preferredWidth:  (_cameraInVideoMode ? videoRecordTime.width : photoCaptureCount.width) + (_smallMargins * 2)
                     Layout.preferredHeight: (_cameraInVideoMode ? videoRecordTime.height : photoCaptureCount.height)
-                    radius:                 _margins / 2
+                    radius:                 _smallMargins
 
                     // Video record time
                     QGCLabel {
@@ -213,7 +283,6 @@ Rectangle {
                         anchors.left:       parent.left
                         anchors.top:        parent.top
                         text:               _videoCaptureIdle ? "00:00:00" : _camera.recordTimeStr
-                        font.pointSize:     ScreenTools.largeFontPointSize
                         visible:            _cameraInVideoMode
                     }
 
@@ -224,37 +293,39 @@ Rectangle {
                         anchors.left:       parent.left
                         anchors.top:        parent.top
                         text:               _activeVehicle ? ('00000' + _activeVehicle.cameraTriggerPoints.count).slice(-5) : "00000"
-                        font.pointSize:     ScreenTools.largeFontPointSize
                         visible:            _cameraInPhotoMode
                     }
                 }
+            }
 
-                //-- Status Information
-                ColumnLayout {
-                    Layout.alignment:   Qt.AlignHCenter
-                    spacing:            0
+            //-- Status Information
+            ColumnLayout {
+                Layout.alignment:   Qt.AlignHCenter
+                spacing:            0
+                visible:            storageStatus.visible || batteryStatus.visible
 
-                    QGCLabel {
-                        Layout.alignment:   Qt.AlignHCenter
-                        text:               qsTr("Free Space: ") + _camera.storageFreeStr
-                        font.pointSize:     ScreenTools.defaultFontPointSize
-                        visible:            _camera.storageStatus === MavlinkCameraControl.STORAGE_READY
-                    }
+                QGCLabel {
+                    id:                 storageStatus
+                    Layout.alignment:   Qt.AlignHCenter
+                    text:               qsTr("Free: ") + _camera.storageFreeStr
+                    font.pointSize:     ScreenTools.defaultFontPointSize
+                    visible:            _camera.storageStatus === MavlinkCameraControl.STORAGE_READY
+                }
 
-                    QGCLabel {
-                        Layout.alignment:   Qt.AlignHCenter
-                        text:               qsTr("Battery: ") + _camera.batteryRemainingStr
-                        font.pointSize:     ScreenTools.defaultFontPointSize
-                        visible:            _camera.batteryRemaining >= 0
-                    }
+                QGCLabel {
+                    id:                 batteryStatus
+                    Layout.alignment:   Qt.AlignHCenter
+                    text:               qsTr("Battery: ") + _camera.batteryRemainingStr
+                    font.pointSize:     ScreenTools.defaultFontPointSize
+                    visible:            _camera.batteryRemaining >= 0
                 }
             }
 
             ColumnLayout {
                 id:                 trackingControls
                 Layout.alignment:   Qt.AlignHCenter
-                spacing:            _margins
-                visible:            _camera && _camera.hasTracking
+                spacing:            0
+                visible:            _camera.hasTracking
 
                 Rectangle {
                     Layout.alignment:       Qt.AlignHCenter
@@ -263,7 +334,7 @@ Rectangle {
                     Layout.preferredHeight: Layout.preferredWidth
                     border.color:           qgcPal.buttonText
                     border.width:           3
-                    
+
                     QGCColoredImage {
                         height:             parent.height * 0.5
                         width:              height
@@ -288,8 +359,7 @@ Rectangle {
                 QGCLabel {
                     Layout.alignment:   Qt.AlignHCenter
                     text:               qsTr("Camera Tracking")
-                    font.pointSize:     ScreenTools.defaultFontPointSize
-                    visible:            _camera && _camera.hasTracking
+                    font.pointSize:     ScreenTools.smallFontPointSize
                 }
             }
 
diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml
index aa3113348499..5d5cd5cfe28a 100644
--- a/src/FlightMap/Widgets/QGCCompassWidget.qml
+++ b/src/FlightMap/Widgets/QGCCompassWidget.qml
@@ -59,7 +59,7 @@ Rectangle {
 
     function translateCenterToAngleX(radius, angle) {
         return radius * Math.sin(angle * (Math.PI / 180))
-    } 
+    }
 
     function translateCenterToAngleY(radius, angle) {
         return -radius * Math.cos(angle * (Math.PI / 180))
diff --git a/src/FollowMe/CMakeLists.txt b/src/FollowMe/CMakeLists.txt
index d5ad7bae7269..d7f127e164e2 100644
--- a/src/FollowMe/CMakeLists.txt
+++ b/src/FollowMe/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Follow Me Module
+# Enables vehicles to follow a ground station's GPS position
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         FollowMe.cc
diff --git a/src/FollowMe/FollowMe.cc b/src/FollowMe/FollowMe.cc
index 41a540d43681..8e903bd7c5f4 100644
--- a/src/FollowMe/FollowMe.cc
+++ b/src/FollowMe/FollowMe.cc
@@ -18,7 +18,7 @@
 
 #include <QtPositioning/QGeoPositionInfo>
 
-QGC_LOGGING_CATEGORY(FollowMeLog, "qgc.followme")
+QGC_LOGGING_CATEGORY(FollowMeLog, "API.FollowMe")
 
 Q_APPLICATION_STATIC(FollowMe, _followMeInstance);
 
@@ -29,7 +29,7 @@ FollowMe::FollowMe(QObject *parent)
     // qCDebug(FollowMeLog) << Q_FUNC_INFO << this;
 
     _gcsMotionReportTimer->setSingleShot(false);
-    // We set the update interval to a fixed amount of time. 
+    // We set the update interval to a fixed amount of time.
     // Even if the device can't update this quickly we'll pick up a new value on the next time around.
     // We can't trust the value for update interval which comes from the actual device.
     _gcsMotionReportTimer->setInterval(kMotionUpdateInterval);
diff --git a/src/GPS/CMakeLists.txt b/src/GPS/CMakeLists.txt
index d101c261e08f..1d745b488994 100644
--- a/src/GPS/CMakeLists.txt
+++ b/src/GPS/CMakeLists.txt
@@ -1,3 +1,9 @@
+# ============================================================================
+# GPS Module
+# GPS/GNSS positioning and RTK support
+# ============================================================================
+
+# GPS requires serial link support
 if(QGC_NO_SERIAL_LINK)
     return()
 endif()
@@ -12,6 +18,8 @@ target_sources(${CMAKE_PROJECT_NAME}
         GPSRtk.h
         GPSRTKFactGroup.cc
         GPSRTKFactGroup.h
+        NTRIP.cc
+        NTRIP.h
         RTCMMavlink.cc
         RTCMMavlink.h
         satellite_info.h
@@ -23,7 +31,9 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Core)
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-#===========================================================================#
+# ============================================================================
+# PX4 GPS Drivers Integration
+# ============================================================================
 
 CPMAddPackage(
     NAME px4-gpsdrivers
@@ -32,14 +42,23 @@ CPMAddPackage(
     SOURCE_SUBDIR src
 )
 
-file(GLOB GPS_DRIVERS_SOURCES "${px4-gpsdrivers_SOURCE_DIR}/src/*")
+# NOTE: Using file(GLOB) for external dependency sources
+# CONFIGURE_DEPENDS ensures CMake re-runs if files are added/removed
+file(GLOB GPS_DRIVERS_SOURCES
+    CONFIGURE_DEPENDS
+    "${px4-gpsdrivers_SOURCE_DIR}/src/*.c"
+    "${px4-gpsdrivers_SOURCE_DIR}/src/*.cpp"
+    "${px4-gpsdrivers_SOURCE_DIR}/src/*.h"
+)
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         definitions.h
         ${GPS_DRIVERS_SOURCES}
 )
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# GPS/RTK Configuration Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} json_gps_drivers
     PREFIX "/json/Vehicle"
     FILES GPSRTKFact.json
diff --git a/src/GPS/GPSManager.cc b/src/GPS/GPSManager.cc
index fb00f7ab3a83..00f533ffdcf1 100644
--- a/src/GPS/GPSManager.cc
+++ b/src/GPS/GPSManager.cc
@@ -13,7 +13,7 @@
 
 #include <QtCore/QApplicationStatic>
 
-QGC_LOGGING_CATEGORY(GPSManagerLog, "qgc.gps.gpsmanager")
+QGC_LOGGING_CATEGORY(GPSManagerLog, "GPS.GPSManager")
 
 Q_APPLICATION_STATIC(GPSManager, _gpsManager);
 
diff --git a/src/GPS/GPSProvider.cc b/src/GPS/GPSProvider.cc
index 6eec729ac270..f22b6efe2509 100644
--- a/src/GPS/GPSProvider.cc
+++ b/src/GPS/GPSProvider.cc
@@ -24,8 +24,8 @@
 #include <QtSerialPort/QSerialPort>
 #endif
 
-QGC_LOGGING_CATEGORY(GPSProviderLog, "qgc.gps.gpsprovider")
-QGC_LOGGING_CATEGORY(GPSDriversLog, "qgc.gps.drivers")
+QGC_LOGGING_CATEGORY(GPSProviderLog, "GPS.GPSProvider")
+QGC_LOGGING_CATEGORY(GPSDriversLog, "GPS.Drivers")
 
 GPSProvider::GPSProvider(const QString &device, GPSType type, const rtk_data_s &rtkData, const std::atomic_bool &requestStop, QObject *parent)
     : QThread(parent)
diff --git a/src/GPS/GPSRTKFactGroup.cc b/src/GPS/GPSRTKFactGroup.cc
index ac5018c5495b..774f0ef2f0ee 100644
--- a/src/GPS/GPSRTKFactGroup.cc
+++ b/src/GPS/GPSRTKFactGroup.cc
@@ -10,7 +10,7 @@
 #include "GPSRTKFactGroup.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(GPSRTKFactGroupLog, "qgc.gps.gpsrtkfactgroup")
+QGC_LOGGING_CATEGORY(GPSRTKFactGroupLog, "GPS.GPSRTKFactGroup")
 
 GPSRTKFactGroup::GPSRTKFactGroup(QObject *parent)
     : FactGroup(1000, QStringLiteral(":/json/Vehicle/GPSRTKFact.json"), parent)
diff --git a/src/GPS/GPSRtk.cc b/src/GPS/GPSRtk.cc
index 0d2d38b0d421..0c38055bbce0 100644
--- a/src/GPS/GPSRtk.cc
+++ b/src/GPS/GPSRtk.cc
@@ -15,7 +15,7 @@
 #include "RTKSettings.h"
 #include "SettingsManager.h"
 
-QGC_LOGGING_CATEGORY(GPSRtkLog, "qgc.gps.gpsrtk")
+QGC_LOGGING_CATEGORY(GPSRtkLog, "GPS.GPSRtk")
 
 GPSRtk::GPSRtk(QObject *parent)
     : QObject(parent)
diff --git a/src/GPS/NTRIP.cc b/src/GPS/NTRIP.cc
new file mode 100644
index 000000000000..72121fab3389
--- /dev/null
+++ b/src/GPS/NTRIP.cc
@@ -0,0 +1,1304 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "NTRIP.h"
+#include "NTRIPSettings.h"
+#include "Fact.h"
+#include "FactGroup.h"
+#include "QGCApplication.h"
+#include "QGCLoggingCategory.h"
+#include "RTCMMavlink.h"
+#include "SettingsManager.h"
+#include <QtNetwork/QSslSocket>
+#include <QtNetwork/QSslError>
+
+#include "MultiVehicleManager.h"
+#include "Vehicle.h"
+#include "PositionManager.h"
+#include <QtPositioning/QGeoCoordinate>
+#include <QtCore/QDateTime>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QtGlobal>
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QJSEngine>
+
+QGC_LOGGING_CATEGORY(NTRIPLog, "qgc.ntrip")
+
+// Register the QML type without constructing the singleton up-front.
+// This avoids creating NTRIPManager during a temporary Q(Core)Application
+// used for command-line parsing, which could lead to it being destroyed
+// early and leaving a dangling static pointer.
+static QObject* _ntripManagerQmlProvider(QQmlEngine*, QJSEngine*)
+{
+    return NTRIPManager::instance();
+}
+
+static void _ntripManagerRegisterQmlTypes()
+{
+    qmlRegisterSingletonType<NTRIPManager>("QGroundControl.NTRIP", 1, 0, "NTRIPManager", _ntripManagerQmlProvider);
+}
+Q_COREAPP_STARTUP_FUNCTION(_ntripManagerRegisterQmlTypes)
+
+NTRIPManager* NTRIPManager::_instance = nullptr;
+
+// constructor
+NTRIPManager::NTRIPManager(QObject* parent)
+    : QObject(parent)
+    , _ntripStatus(tr("Disconnected"))
+{
+    qCDebug(NTRIPLog) << "NTRIPManager created";
+    _startupTimer.start();
+
+    _rtcmMavlink = qgcApp() ? qgcApp()->findChild<RTCMMavlink*>() : nullptr;
+    if (!_rtcmMavlink) {
+        QObject* parentObj = qgcApp() ? static_cast<QObject*>(qgcApp()) : static_cast<QObject*>(this);
+        // Ensure an RTCMMavlink helper exists for forwarding RTCM messages
+        _rtcmMavlink = new RTCMMavlink(parentObj);
+        _rtcmMavlink->setObjectName(QStringLiteral("RTCMMavlink"));
+        qCDebug(NTRIPLog) << "NTRIP Created RTCMMavlink helper";
+    }
+
+    // Force NTRIP checkbox OFF during app startup and keep it OFF until first settings tick.
+    {
+        NTRIPSettings* settings = SettingsManager::instance()->ntripSettings();
+        if (settings && settings->ntripServerConnectEnabled()) {
+            Fact* fact = settings->ntripServerConnectEnabled();
+
+            // Force OFF immediately
+            fact->setRawValue(false);
+
+            // While !_forcedOffOnce, if something tries to flip it ON, flip it back OFF.
+            _ntripEnableConn = connect(fact, &Fact::rawValueChanged,
+                                       this, [this, fact]() {
+                if (!_forcedOffOnce) {
+                    const bool wantOn = fact->rawValue().toBool();
+                    if (wantOn) {
+                        qCDebug(NTRIPLog) << "NTRIP Startup: coercing ntripServerConnectEnabled back to false";
+                        fact->setRawValue(false);
+                    }
+                }
+            });
+        }
+    }
+
+    // Check settings periodically
+    _settingsCheckTimer = new QTimer(this);
+    connect(_settingsCheckTimer, &QTimer::timeout, this, &NTRIPManager::_checkSettings);
+    _settingsCheckTimer->start(1000); // Check every second
+
+    _ggaTimer = new QTimer(this);
+    _ggaTimer->setInterval(5000);
+    connect(_ggaTimer, &QTimer::timeout, this, &NTRIPManager::_sendGGA);
+
+    connect(qApp, &QCoreApplication::aboutToQuit, this, &NTRIPManager::stopNTRIP, Qt::QueuedConnection);
+
+    _checkSettings();
+}
+
+// destructor
+NTRIPManager::~NTRIPManager()
+{
+    qCDebug(NTRIPLog) << "NTRIPManager destroyed";
+    stopNTRIP();
+    // Clear singleton pointer in case we were destroyed (e.g., if created under
+    // a short-lived Q(Core)Application).
+    if (_instance == this) {
+        _instance = nullptr;
+    }
+}
+
+RTCMParser::RTCMParser()
+{
+    reset();
+}
+
+void RTCMParser::reset()
+{
+    _state = WaitingForPreamble;
+    _messageLength = 0;
+    _bytesRead = 0;
+    _lengthBytesRead = 0;
+    _crcBytesRead = 0;
+}
+
+bool RTCMParser::addByte(uint8_t byte)
+{
+    switch (_state) {
+    case WaitingForPreamble:
+        if (byte == RTCM3_PREAMBLE) {
+            _buffer[0] = byte;
+            _bytesRead = 1;
+            _state = ReadingLength;
+            _lengthBytesRead = 0;
+        }
+        break;
+
+    case ReadingLength:
+        _lengthBytes[_lengthBytesRead++] = byte;
+        _buffer[_bytesRead++] = byte;
+        if (_lengthBytesRead == 2) {
+            // Extract 10-bit length from bytes (6 reserved bits + 10 length bits)
+            _messageLength = ((_lengthBytes[0] & 0x03) << 8) | _lengthBytes[1];
+            if (_messageLength > 0 && _messageLength < 1021) { // Valid RTCM3 length
+                _state = ReadingMessage;
+            } else {
+                reset(); // Invalid length, restart
+            }
+        }
+        break;
+
+    case ReadingMessage:
+        _buffer[_bytesRead++] = byte;
+        if (_bytesRead >= _messageLength + 3) { // +3 for header
+            _state = ReadingCRC;
+            _crcBytesRead = 0;
+        }
+        break;
+
+    case ReadingCRC:
+        _crcBytes[_crcBytesRead++] = byte;
+        if (_crcBytesRead == 3) {
+            // Message complete - for simplicity, we'll skip CRC validation
+            return true;
+        }
+        break;
+    }
+    return false;
+}
+
+uint16_t RTCMParser::messageId()
+{
+    if (_messageLength >= 2) {
+        // Message ID is in bits 14-25 of the message (after the 24-bit header)
+        return ((_buffer[3] << 4) | (_buffer[4] >> 4)) & 0xFFF;
+    }
+    return 0;
+}
+
+NTRIPTCPLink::NTRIPTCPLink(const QString& hostAddress,
+                           int port,
+                           const QString& username,
+                           const QString& password,
+                           const QString& mountpoint,
+                           const QString& whitelist,
+                           bool useSpartn,
+                           QObject* parent)
+    : QObject(parent)
+    , _hostAddress(hostAddress)
+    , _port(port)
+    , _username(username)
+    , _password(password)
+    , _mountpoint(mountpoint)
+    , _useSpartn(useSpartn)
+{
+
+
+    if (_useSpartn) {
+        // SPARTN path does not use RTCM whitelist or parser
+        if (!whitelist.isEmpty()) {
+            qCDebug(NTRIPLog) << "NTRIP SPARTN enabled; ignoring RTCM whitelist:" << whitelist;
+        }
+        // Initialize SPARTN header-strip guard
+        _spartnBuf.clear();
+        _spartnNeedHeaderStrip = true;
+
+        // Helpful hint if user left the default RTCM port
+        if (_port != 2102) {
+            qCWarning(NTRIPLog) << "NTRIP SPARTN is enabled but port is" << _port << "(expected 2102 for TLS)";
+        }
+    } else {
+        // RTCM path: build whitelist and parser as before
+        for (const auto& msg : whitelist.split(',')) {
+            int msg_int = msg.toInt();
+            if (msg_int)
+                _whitelist.append(msg_int);
+        }
+        qCDebug(NTRIPLog) << "NTRIP whitelist:" << _whitelist;
+        if (_whitelist.empty()) {
+            qCDebug(NTRIPLog) << "NTRIP whitelist is empty; all RTCM message IDs will be forwarded.";
+        }
+        if (!_rtcmParser) {
+            _rtcmParser = new RTCMParser();
+        }
+        _rtcmParser->reset();
+    }
+
+    _state = NTRIPState::uninitialised;
+
+    // Start the thread only after all members are initialized to avoid races
+    start();
+}
+
+NTRIPTCPLink::~NTRIPTCPLink()
+{
+    _stopping.store(true);
+
+    if (_socket) {
+        QObject::disconnect(_readyReadConn);
+        _socket->disconnectFromHost();
+        _socket->close();
+        delete _socket;
+        _socket = nullptr;
+    }
+
+    if (_rtcmParser) {
+        delete _rtcmParser;
+        _rtcmParser = nullptr;
+    }
+}
+
+void NTRIPTCPLink::start()
+{
+    // This runs in the worker thread after QThread::started is emitted
+    _hardwareConnect();
+}
+
+void NTRIPTCPLink::_hardwareConnect()
+{
+    if (_stopping.load()) {
+        return;
+    }
+
+    qCDebug(NTRIPLog) << "NTRIP connectToHost" << _hostAddress << ":" << _port << " mount=" << _mountpoint
+                       << " tls=" << (_useSpartn ? "yes" : "no");
+
+    // allocate the appropriate socket type
+    // SPARTN selection (TLS on 2102 or when explicitly enabled)
+    if (_useSpartn) {
+        QSslSocket* sslSocket = new QSslSocket(this);
+        _socket = sslSocket;
+    } else {
+        _socket = new QTcpSocket(this);
+    }
+
+    _socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
+    _socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
+    _socket->setReadBufferSize(0);
+
+    QObject::connect(_socket, &QTcpSocket::errorOccurred, this, [this](QAbstractSocket::SocketError code) {
+        // Suppress errors generated during intentional shutdown
+        if (_stopping.load() || !_socket) {
+            qCDebug(NTRIPLog) << "NTRIP suppressing socket error during intentional stop:" << int(code);
+            return;
+        }
+
+        QString msg = _socket->errorString();
+
+        // If the peer closes before we receive any HTTP headers, try to give a helpful hint.
+        if (code == QAbstractSocket::RemoteHostClosedError && _state == NTRIPState::waiting_for_http_response) {
+            const QByteArray leftover = _socket->readAll();
+            if (!leftover.isEmpty()) {
+                qCWarning(NTRIPLog) << "NTRIP peer closed; trailing bytes before close:" << leftover;
+                msg += QString(" (peer closed after %1 bytes)").arg(leftover.size());
+            } else {
+                if (_port == 2102) {
+                    msg += " (hint: port 2102 expects HTTPS/TLS; current socket is plain TCP)";
+                } else if (!_mountpoint.isEmpty()) {
+                    msg += " (peer closed before HTTP response; check mountpoint and credentials)";
+                }
+            }
+        }
+
+        qCWarning(NTRIPLog) << "NTRIP socket error code:" << int(code)
+                            << " msg:" << msg
+                            << " state:" << int(_socket->state())
+                            << " peer:"  << _socket->peerAddress().toString() << ":" << _socket->peerPort()
+                            << " local:" << _socket->localAddress().toString() << ":" << _socket->localPort();
+        emit error(msg);
+    }, Qt::DirectConnection);
+
+    // If the server cleanly disconnects, capture reason and emit error so NTRIPManager updates status
+    QObject::connect(_socket, &QTcpSocket::disconnected, this, [this]() {
+        // Suppress disconnect noise during intentional shutdown
+        if (_stopping.load() || !_socket) {
+            qCDebug(NTRIPLog) << "NTRIP suppressing disconnect signal during intentional stop";
+            return;
+        }
+
+        const QByteArray trailing = _socket->readAll();
+        QString reason;
+        if (!trailing.isEmpty()) {
+            reason = QString::fromUtf8(trailing).trimmed();
+            qCWarning(NTRIPLog) << "NTRIP disconnected; trailing bytes:" << trailing;
+        } else {
+            reason = "Server disconnected";
+            qCWarning(NTRIPLog) << "NTRIP disconnected cleanly by server";
+        }
+        // Emit richer context on disconnect
+        const qint64 t0 = this->property("ntrip_postok_t0_ms").toLongLong();
+        const bool saw = this->property("ntrip_saw_rtcm").toBool();
+        const qint64 dt = (t0 > 0) ? (QDateTime::currentMSecsSinceEpoch() - t0) : -1;
+        qCWarning(NTRIPLog) << "NTRIP disconnect context:"
+                            << "rtcm_received_first_byte=" << (saw ? "yes" : "no")
+                            << "ms_since_200=" << dt
+                            << "peer=" << _socket->peerAddress().toString() << ":" << _socket->peerPort()
+                            << "local=" << _socket->localAddress().toString() << ":" << _socket->localPort();
+        emit error(reason);  // Will call NTRIPManager::_tcpError()
+    }, Qt::DirectConnection);
+
+    _readyReadConn = QObject::connect(_socket, &QTcpSocket::readyRead,this, &NTRIPTCPLink::_readBytes,Qt::DirectConnection);
+
+    auto sendHttpRequest = [this]() {
+        if (!_mountpoint.isEmpty()) {
+            qCDebug(NTRIPLog) << "NTRIP Sending HTTP request";
+            const QByteArray authB64 = QString(_username + ":" + _password).toUtf8().toBase64();
+            QString query =
+                "GET /%1 HTTP/1.1\r\n"
+                "Host: %2\r\n"
+                "Ntrip-Version: Ntrip/2.0\r\n"
+                "User-Agent: QGC-NTRIP\r\n"
+                "Connection: keep-alive\r\n"
+                "Accept: */*\r\n"
+                "Authorization: Basic %3\r\n"
+                "\r\n";
+            const QByteArray req = query.arg(_mountpoint).arg(_hostAddress).arg(QString::fromUtf8(authB64)).toUtf8();
+            const qint64 written = _socket->write(req);
+            _socket->flush();
+
+            // Extra diagnostics: request line and auth presence (length only)
+            const QString reqStr = QString::fromUtf8(req);
+            const int cr = reqStr.indexOf("\r");
+            const QString firstLine = (cr > 0) ? reqStr.left(cr).trimmed() : QString();
+            const int authIdx = reqStr.indexOf("Authorization: Basic ");
+            int b64Len = -1;
+            if (authIdx >= 0) {
+                const int eol = reqStr.indexOf("\r\n", authIdx);
+                if (eol > authIdx) b64Len = eol - (authIdx + 21);
+            }
+            qCDebug(NTRIPLog) << "NTRIP HTTP request first line:" << firstLine;
+            qCDebug(NTRIPLog) << "NTRIP HTTP auth present:" << (authIdx >= 0) << "auth_b64_len:" << b64Len;
+
+            qCDebug(NTRIPLog) << "NTRIP HTTP request bytes written:" << written;
+            _state = NTRIPState::waiting_for_http_response;
+        }
+        else {
+            _state = NTRIPState::waiting_for_rtcm_header;
+            emit connected();
+        }
+        qCDebug(NTRIPLog) << "NTRIP Socket connected"
+                           << "local" << _socket->localAddress().toString() << ":" << _socket->localPort()
+                           << "-> peer" << _socket->peerAddress().toString() << ":" << _socket->peerPort();
+    };
+
+    if (_useSpartn) {
+        QSslSocket* sslSocket = qobject_cast<QSslSocket*>(_socket);
+        Q_ASSERT(sslSocket);
+
+        QObject::connect(sslSocket, &QSslSocket::encrypted, this, [this, sendHttpRequest]() {
+            qCDebug(NTRIPLog) << "SPARTN TLS connection established";
+            sendHttpRequest();
+        }, Qt::DirectConnection);
+
+        QObject::connect(sslSocket, QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors),
+                         this, [this](const QList<QSslError> &errors) {
+            for (const QSslError &e : errors) {
+                qCWarning(NTRIPLog) << "TLS Error:" << e.errorString();
+            }
+        }, Qt::DirectConnection);
+
+        sslSocket->connectToHostEncrypted(_hostAddress, static_cast<quint16>(_port));
+
+        if (!sslSocket->waitForEncrypted(10000)) {
+            qCDebug(NTRIPLog) << "NTRIP TLS socket failed to establish encryption";
+            emit error(_socket->errorString());
+            delete _socket;
+            _socket = nullptr;
+            return;
+        }
+
+        if (sslSocket->isEncrypted()) {
+            sendHttpRequest();
+        }
+    } else {
+        QTcpSocket* tcpSocket = qobject_cast<QTcpSocket*>(_socket);
+        Q_ASSERT(tcpSocket);
+
+        tcpSocket->connectToHost(_hostAddress, static_cast<quint16>(_port));
+
+        if (!tcpSocket->waitForConnected(10000)) {
+            qCDebug(NTRIPLog) << "NTRIP Socket failed to connect";
+            emit error(_socket->errorString());
+            delete _socket;
+            _socket = nullptr;
+            return;
+        }
+
+        sendHttpRequest();
+    }
+}
+
+void NTRIPTCPLink::_parse(const QByteArray& buffer)
+{
+    if (_stopping.load()) {
+        return;
+    }
+
+    static bool logged_empty_once = false;
+    if (!logged_empty_once && _whitelist.empty()) {
+        qCDebug(NTRIPLog) << "NTRIP whitelist is empty at runtime; forwarding all RTCM messages.";
+        logged_empty_once = true;
+    }
+
+    // RTCM v3 transport sizes
+    constexpr int kRtcmHeaderSize = 3;  // preamble (1) + length (2)
+
+    for (char ch : buffer) {
+        const uint8_t byte = static_cast<uint8_t>(static_cast<unsigned char>(ch));
+
+        if (_state == NTRIPState::waiting_for_rtcm_header) {
+            if (byte != RTCM3_PREAMBLE) {
+                continue;
+            }
+            _state = NTRIPState::accumulating_rtcm_packet;
+        }
+
+        if (_rtcmParser->addByte(byte)) {
+            _state = NTRIPState::waiting_for_rtcm_header;
+
+            // Build exact on-wire frame: [D3 | len(2) | payload | CRC(3)]
+            const int payload_len = static_cast<int>(_rtcmParser->messageLength());
+            QByteArray message(reinterpret_cast<const char*>(_rtcmParser->message()),
+                               kRtcmHeaderSize + payload_len);
+
+            const uint8_t* crc_ptr = _rtcmParser->crcBytes();
+            const int crc_len = _rtcmParser->crcSize();
+            message.append(reinterpret_cast<const char*>(crc_ptr), crc_len);
+
+            const uint16_t id = _rtcmParser->messageId();
+
+            if (_whitelist.empty() || _whitelist.contains(id)) {
+                qCDebug(NTRIPLog) << "NTRIP RTCM packet id" << id << "len" << message.length();
+                emit RTCMDataUpdate(message);
+                qCDebug(NTRIPLog) << "NTRIP Sending" << id << "of size" << message.length();
+            } else {
+                qCDebug(NTRIPLog) << "NTRIP Ignoring" << id;
+            }
+
+            _rtcmParser->reset();
+        }
+    }
+}
+
+void NTRIPTCPLink::_handleSpartnData(const QByteArray& dataIn)
+{
+    if (dataIn.isEmpty()) {
+        return;
+    }
+
+    // Accumulate so we can remove a response header exactly once if it ever appears here.
+    _spartnBuf.append(dataIn);
+
+    if (_spartnNeedHeaderStrip) {
+        const bool looksHttp = _spartnBuf.startsWith("HTTP/") || _spartnBuf.startsWith("ICY ");
+        if (looksHttp) {
+            const int headerEnd = _spartnBuf.indexOf("\r\n\r\n");
+            if (headerEnd < 0) {
+                // Header incomplete; cap buffer to avoid growth on a bad stream.
+                if (_spartnBuf.size() > 32768) {
+                    _spartnBuf = _spartnBuf.right(32768);
+                }
+                return;
+            }
+            // Drop the header and keep the payload.
+            _spartnBuf.remove(0, headerEnd + 4);
+        }
+        _spartnNeedHeaderStrip = false;
+    }
+
+    if (_spartnBuf.isEmpty()) {
+        return;
+    }
+
+    // Deliver raw SPARTN bytes to whoever is consuming them (e.g., a GNSS forwarder).
+    emit SPARTNDataUpdate(_spartnBuf);
+
+    // Clear after handing off.
+    _spartnBuf.clear();
+}
+
+void NTRIPTCPLink::_readBytes()
+{
+    if (_stopping.load()) {
+        return;
+    }
+
+    // SPARTN path: after HTTP 200 OK, feed raw bytes through the SPARTN handler
+    if (_socket && _state == NTRIPState::waiting_for_spartn_data) {
+        const QByteArray bytes = _socket->readAll();
+        if (!bytes.isEmpty()) {
+            _handleSpartnData(bytes);
+        }
+        return;
+    }
+
+    if (!_socket) {
+        return;
+    }
+
+    // Static counters and flags scoped to this function (no header changes needed)
+    static quint64 s_totalRtcm = 0;
+
+    if (_state == NTRIPState::waiting_for_http_response) {
+        QByteArray responseData = _socket->readAll();
+        if (responseData.isEmpty()) {
+            return;
+        }
+
+        QString response = QString::fromUtf8(responseData);
+        qCDebug(NTRIPLog) << "NTRIP HTTP response received:" << response.left(200);
+
+        // Dump full headers once for diagnostics
+        const int hdrEnd = response.indexOf("\r\n\r\n");
+        const QString headers = (hdrEnd >= 0) ? response.left(hdrEnd) : response;
+        qCDebug(NTRIPLog) << "NTRIP HTTP response headers BEGIN >>>";
+        for (const QString& line : headers.split("\r\n")) {
+            if (!line.isEmpty()) qCDebug(NTRIPLog) << line;
+        }
+        qCDebug(NTRIPLog) << "NTRIP HTTP response headers <<< END";
+
+        // Parse status line
+        QStringList lines = response.split('\n');
+        bool foundOkResponse = false;
+        for (const QString& line : lines) {
+            const QString trimmed = line.trimmed();
+            if ((trimmed.startsWith("HTTP/") || trimmed.startsWith("ICY ")) &&
+                (trimmed.contains(" 200 ") || trimmed.contains(" 201 "))) {
+                foundOkResponse = true;
+                qCDebug(NTRIPLog) << "NTRIP: Found OK response:" << trimmed;
+                break;
+            } else if ((trimmed.startsWith("HTTP/") || trimmed.startsWith("ICY ")) &&
+                       (trimmed.contains(" 4") || trimmed.contains(" 5"))) {
+                qCWarning(NTRIPLog) << "NTRIP: Server error response:" << trimmed;
+                emit error(QString("NTRIP HTTP error: %1").arg(trimmed));
+
+                _socket->disconnectFromHost();
+                _socket->close();
+                delete _socket;
+                _socket = nullptr;
+                _state = NTRIPState::uninitialised;
+
+                if (!_stopping.load()) {
+                    QTimer::singleShot(3000, this, [this]() {
+                        if (!_stopping.load()) {
+                            _hardwareConnect();
+                        }
+                    });
+                }
+                return;
+            }
+        }
+
+        if (foundOkResponse) {
+            // Mark the 200 OK time and reset first-RTCM flag using QObject properties.
+            const qint64 nowMs = QDateTime::currentMSecsSinceEpoch();
+            this->setProperty("ntrip_postok_t0_ms", nowMs);
+            this->setProperty("ntrip_saw_rtcm", false);
+            this->setProperty("ntrip_watchdog_fired", false);
+
+            // Fire a one-shot watchdog that only logs if no RTCM arrives by ~28s.
+            QTimer::singleShot(28000, this, [this]() {
+                if (this->property("ntrip_watchdog_fired").toBool()) return;
+                const bool saw = this->property("ntrip_saw_rtcm").toBool();
+                if (!saw) {
+                    this->setProperty("ntrip_watchdog_fired", true);
+                    qCWarning(NTRIPLog)
+                        << "NTRIP no RTCM received 28s after 200 OK. Likely caster timeout."
+                        << "Check: duplicate login, entitlement/region, GGA validity.";
+                }
+            });
+
+            _state = _useSpartn ? NTRIPState::waiting_for_spartn_data
+                                : NTRIPState::waiting_for_rtcm_header;
+
+            qCDebug(NTRIPLog) << "NTRIP: HTTP handshake complete, transitioning to data state";
+            emit connected();
+
+            // Process any remaining data after the headers
+            if (hdrEnd >= 0) {
+                QByteArray remainingData = responseData.mid(hdrEnd + 4);
+                if (!remainingData.isEmpty()) {
+                    qCDebug(NTRIPLog) << "NTRIP: Processing data after HTTP headers:" << remainingData.size() << "bytes";
+                    if (_useSpartn) {
+                        _handleSpartnData(remainingData);
+                    } else {
+                        _parse(remainingData);
+                    }
+                }
+            }
+        } else {
+            qCDebug(NTRIPLog) << "NTRIP: Waiting for complete HTTP response...";
+        }
+
+        return; // done with HTTP response handling
+    }
+
+    // Data after handshake (RTCM path)
+    QByteArray bytes = _socket->readAll();
+    if (!bytes.isEmpty()) {
+        // Mark first RTCM arrival and log timing/sample
+        if (!this->property("ntrip_saw_rtcm").toBool()) {
+            this->setProperty("ntrip_saw_rtcm", true);
+            const qint64 t0 = this->property("ntrip_postok_t0_ms").toLongLong();
+            const qint64 dt = (t0 > 0) ? (QDateTime::currentMSecsSinceEpoch() - t0) : -1;
+            const QByteArray sample = bytes.left(48);
+            const unsigned char b0 = static_cast<unsigned char>(sample.isEmpty() ? 0 : sample[0]);
+            qCDebug(NTRIPLog) << "NTRIP first RTCM bytes at" << dt << "ms after 200 OK";
+            qCDebug(NTRIPLog) << "NTRIP rx sample (hex, first 48B):" << sample.toHex(' ');
+            qCDebug(NTRIPLog) << "NTRIP preamble_check first_byte=0x" << QByteArray::number(b0, 16);
+        }
+
+        s_totalRtcm += static_cast<quint64>(bytes.size());
+        qCDebug(NTRIPLog) << "NTRIP rx bytes:" << bytes.size()
+                           << "total:" << s_totalRtcm
+                           << "bytesAvailable:" << _socket->bytesAvailable();
+
+        _parse(bytes);
+    }
+}
+
+void NTRIPTCPLink::debugFetchSourceTable()
+{
+    // Build request (include Authorization so the caster can tailor the table to your creds)
+    const QByteArray authB64 = QString(_username + ":" + _password).toUtf8().toBase64();
+    const QByteArray req =
+        QByteArray("GET / HTTP/1.1\r\n")
+        + "Host: " + _hostAddress.toUtf8() + "\r\n"
+        + "User-Agent: QGC-NTRIP\r\n"
+        + "Ntrip-Version: Ntrip/2.0\r\n"
+        + "Accept: */*\r\n"
+        + "Authorization: Basic " + authB64 + "\r\n"
+        + "Connection: close\r\n\r\n";
+
+    QByteArray all;
+
+    if (_useSpartn || _port == 2102) {
+        // TLS (e.g., SPARTN/2102)
+        QSslSocket sock;
+        sock.connectToHostEncrypted(_hostAddress, static_cast<quint16>(_port));
+        if (!sock.waitForEncrypted(7000)) {
+            qCWarning(NTRIPLog) << "SOURCETABLE TLS connect failed:" << sock.errorString();
+            return;
+        }
+        if (sock.write(req) <= 0 || !sock.waitForBytesWritten(3000)) {
+            qCWarning(NTRIPLog) << "SOURCETABLE TLS write failed:" << sock.errorString();
+            return;
+        }
+        while (sock.waitForReadyRead(3000)) {
+            all += sock.readAll();
+            if (sock.bytesAvailable() == 0 && sock.state() != QAbstractSocket::ConnectedState) break;
+        }
+        sock.close();
+    } else {
+        // Plain TCP (e.g., RTCM/2101)
+        QTcpSocket sock;
+        sock.connectToHost(_hostAddress, static_cast<quint16>(_port));
+        if (!sock.waitForConnected(5000)) {
+            qCWarning(NTRIPLog) << "SOURCETABLE connect failed:" << sock.errorString();
+            return;
+        }
+        if (sock.write(req) <= 0 || !sock.waitForBytesWritten(3000)) {
+            qCWarning(NTRIPLog) << "SOURCETABLE write failed:" << sock.errorString();
+            return;
+        }
+        while (sock.waitForReadyRead(3000)) {
+            all += sock.readAll();
+            if (sock.bytesAvailable() == 0 && sock.state() != QAbstractSocket::ConnectedState) break;
+        }
+        sock.close();
+    }
+
+    // Split headers/body and dump the body (the sourcetable)
+    const int hdrEnd = all.indexOf("\r\n\r\n");
+    const QByteArray body = (hdrEnd >= 0) ? all.mid(hdrEnd + 4) : all;
+
+    qCDebug(NTRIPLog) << "----- NTRIP SOURCETABLE BEGIN -----";
+    for (const QByteArray& line : body.split('\n')) {
+        const QByteArray l = line.trimmed();
+        if (!l.isEmpty()) qCDebug(NTRIPLog) << l;
+    }
+    qCDebug(NTRIPLog) << "------ NTRIP SOURCETABLE END ------";
+}
+
+void NTRIPTCPLink::sendNMEA(const QByteArray& sentence)
+{
+    if (_stopping.load()) {
+        return;
+    }
+    if (!_socket || _socket->state() != QAbstractSocket::ConnectedState) {
+        return;
+    }
+
+    QByteArray line = sentence;
+
+    // Validate or repair checksum in the form $CORE*XX
+    if (line.size() >= 5 && line.at(0) == '$') {
+        int star = line.lastIndexOf('*');
+        if (star > 1) {
+            // Calculate checksum over bytes between '$' and '*'
+            quint8 calc = 0;
+            for (int i = 1; i < star; ++i) {
+                calc ^= static_cast<quint8>(line.at(i));
+            }
+
+            // Format calculated checksum as two uppercase hex digits
+            QByteArray calcCks = QByteArray::number(calc, 16)
+                                     .rightJustified(2, '0')
+                                     .toUpper();
+
+            bool needsRepair = false;
+            if (star + 3 > line.size()) {
+                // Not enough chars after '*', definitely needs repair
+                needsRepair = true;
+            } else {
+                QByteArray txCks = line.mid(star + 1, 2).toUpper();
+                if (txCks != calcCks) {
+                    needsRepair = true;
+                }
+            }
+
+            if (needsRepair) {
+                // Remove any existing checksum and replace with correct one
+                line = line.left(star + 1) + calcCks;
+            }
+        } else {
+            // No '*' found, append one and correct checksum
+            quint8 calc = 0;
+            for (int i = 1; i < line.size(); ++i) {
+                calc ^= static_cast<quint8>(line.at(i));
+            }
+            QByteArray calcCks = QByteArray::number(calc, 16)
+                                     .rightJustified(2, '0')
+                                     .toUpper();
+            line.append('*').append(calcCks);
+        }
+    }
+
+    // Ensure CRLF termination
+    if (!line.endsWith("\r\n")) {
+        line.append("\r\n");
+    }
+
+    qCDebug(NTRIPLog) << "NTRIP Sent NMEA:" << QString::fromUtf8(line.trimmed());
+
+    const qint64 written = _socket->write(line);
+    _socket->flush();
+
+    qCDebug(NTRIPLog) << "NTRIP Socket state:" << (_socket ? _socket->state() : -1);
+    qCDebug(NTRIPLog) << "NTRIP Bytes written:" << written;
+}
+
+
+void NTRIPTCPLink::requestStop()
+{
+    _stopping.store(true);
+
+    if (_socket) {
+        QObject::disconnect(_readyReadConn);
+        _socket->disconnectFromHost();
+        _socket->close();
+        delete _socket;
+        _socket = nullptr;
+    }
+
+    emit finished();   // let NTRIPManager's QThread quit in response
+}
+
+NTRIPManager* NTRIPManager::instance()
+{
+    if (!_instance) {
+        // Prefer QGCApplication as parent if available, otherwise fall back to qApp
+        QObject* parent = qgcApp() ? static_cast<QObject*>(qgcApp()) : static_cast<QObject*>(qApp);
+        _instance = new NTRIPManager(parent);
+    }
+    return _instance;
+}
+
+void NTRIPManager::startNTRIP()
+{
+    if (_startStopBusy) {
+        return;
+    }
+    _startStopBusy = true;   // guard begin
+
+    qCDebug(NTRIPLog) << "startNTRIP: begin";
+
+    if (_tcpLink) {
+        _startStopBusy = false;  // already started; release guard
+        return;
+    }
+
+    _ntripStatus = tr("Connecting...");
+    emit ntripStatusChanged();
+
+
+    NTRIPSettings* settings = SettingsManager::instance()->ntripSettings();
+    QString host;
+    int port = 2101;
+    QString user;
+    QString pass;
+    QString mount;
+    QString whitelist;
+
+    if (settings) {
+        if (settings->ntripServerHostAddress()) host = settings->ntripServerHostAddress()->rawValue().toString();
+        if (settings->ntripServerPort())        port = settings->ntripServerPort()->rawValue().toInt();
+        if (settings->ntripUsername())          user = settings->ntripUsername()->rawValue().toString();
+        if (settings->ntripPassword())          pass = settings->ntripPassword()->rawValue().toString();
+        if (settings->ntripMountpoint())        mount = settings->ntripMountpoint()->rawValue().toString();
+        if (settings->ntripWhitelist())         whitelist = settings->ntripWhitelist()->rawValue().toString();
+        if (settings->ntripUseSpartn())         _useSpartn = settings->ntripUseSpartn()->rawValue().toBool();
+    } else {
+        qCWarning(NTRIPLog) << "NTRIP settings group is null; starting with defaults";
+    }
+
+    qCDebug(NTRIPLog) << "startNTRIP: host=" << host
+                      << " port=" << port
+                      << " mount=" << mount
+                      << " userIsEmpty=" << user.isEmpty();
+
+    _tcpThread = new QThread(this);
+    NTRIPTCPLink* link = new NTRIPTCPLink(host, port, user, pass, mount, whitelist, _useSpartn);
+    _tcpLink = link;
+
+    link->moveToThread(_tcpThread);
+
+    connect(_tcpThread, &QThread::started, link, &NTRIPTCPLink::start);
+    connect(link, &NTRIPTCPLink::finished, _tcpThread, &QThread::quit);
+    connect(_tcpThread, &QThread::finished, _tcpThread, &QObject::deleteLater);
+    connect(_tcpThread, &QThread::finished, link, &QObject::deleteLater);
+
+    // Surface errors (including server disconnect reasons) to status/UI
+    connect(_tcpLink, &NTRIPTCPLink::error,
+            this, &NTRIPManager::_tcpError,
+            Qt::QueuedConnection);
+
+    connect(_tcpLink, &NTRIPTCPLink::connected, this, [this]() {
+        _casterStatus = CasterStatus::Connected;
+        emit casterStatusChanged(_casterStatus);
+
+        const QString want = _useSpartn ? tr("Connected (SPARTN)") : tr("Connected");
+        if (_ntripStatus != want) {
+            _ntripStatus = want;
+            emit ntripStatusChanged();
+        }
+
+        // >>> ONE-SHOT SOURCETABLE DUMP (enable with env var QGC_NTRIP_DUMP_TABLE=1)
+        if (qEnvironmentVariableIsSet("QGC_NTRIP_DUMP_TABLE")) {
+            static bool dumped = false;
+            if (!dumped && _tcpLink) {
+                dumped = true;
+                QMetaObject::invokeMethod(_tcpLink, "debugFetchSourceTable", Qt::QueuedConnection);
+            }
+        }
+        // <<<
+
+        // Start rapid 1 Hz GGA until we get the first valid coord
+        if (_ggaTimer && !_ggaTimer->isActive()) {
+            _ggaTimer->setInterval(1000); // 1 Hz while waiting for fix
+            _sendGGA();                   // try immediately
+            _ggaTimer->start();
+        }
+
+    }, Qt::QueuedConnection);
+
+    if (_useSpartn) {
+        connect(_tcpLink, &NTRIPTCPLink::SPARTNDataUpdate, this, [this](const QByteArray& data){
+            static uint32_t spartn_count = 0;
+            if ((spartn_count++ % 50) == 0) {
+                qCDebug(NTRIPLog) << "SPARTN bytes flowing:" << data.size();
+            }
+            if (_ntripStatus != tr("Connected (SPARTN)")) {
+                _ntripStatus = tr("Connected (SPARTN)");
+                emit ntripStatusChanged();
+            }
+            _casterStatus = CasterStatus::Connected;
+            emit casterStatusChanged(_casterStatus);
+
+            _rtcmDataReceived(data);
+        }, Qt::QueuedConnection);
+    } else {
+        connect(_tcpLink, &NTRIPTCPLink::RTCMDataUpdate, this, &NTRIPManager::_rtcmDataReceived, Qt::QueuedConnection);
+    }
+
+    _tcpThread->start();
+    qCDebug(NTRIPLog) << "NTRIP started";
+
+    _startStopBusy = false;  // guard end
+}
+
+void NTRIPManager::stopNTRIP()
+{
+    if (_startStopBusy) {
+        return;
+    }
+    _startStopBusy = true;   // guard begin
+
+    if (_tcpLink) {
+        // Prevent spurious "NTRIP error: ..." toasts during user-initiated shutdown
+        disconnect(_tcpLink, &NTRIPTCPLink::error, this, &NTRIPManager::_tcpError);
+
+        // Ask the worker to stop in its own thread
+        QMetaObject::invokeMethod(_tcpLink, "requestStop", Qt::QueuedConnection);
+
+        // If we still own the thread, stop and wait for it
+        if (_tcpThread) {
+            _tcpThread->quit();   // or just rely on 'finished' from requestStop()
+            _tcpThread->wait();
+            _tcpThread = nullptr;
+        }
+
+        // _tcpLink will be deleted via deleteLater() when the thread finishes
+        _tcpLink = nullptr;
+
+        _ntripStatus = tr("Disconnected");
+        emit ntripStatusChanged();
+        qCDebug(NTRIPLog) << "NTRIP stopped";
+    }
+
+    if (_ggaTimer && _ggaTimer->isActive()) {
+        _ggaTimer->stop();
+    }
+
+    _startStopBusy = false;  // guard end
+}
+
+void NTRIPManager::_tcpError(const QString& errorMsg)
+{
+    qCWarning(NTRIPLog) << "NTRIP Server Error:" << errorMsg;
+    _ntripStatus = errorMsg;
+    emit ntripStatusChanged();
+    _startStopBusy = false;  // make sure guard clears on error
+
+    // Check for specific "no location provided" disconnect reason
+    if (errorMsg.contains("NO_LOCATION_PROVIDED", Qt::CaseInsensitive)) {
+        _onCasterDisconnected(errorMsg);
+    } else {
+        _casterStatus = CasterStatus::OtherError;
+        emit casterStatusChanged(_casterStatus);
+    }
+
+    // Show error to user via QGC notification (toast)
+    if (qgcApp()) {
+        qgcApp()->showAppMessage(tr("NTRIP error: %1").arg(errorMsg));
+    }
+}
+
+void NTRIPManager::_rtcmDataReceived(const QByteArray& data)
+{
+
+    qCDebug(NTRIPLog) << "NTRIP Forwarding RTCM to vehicle:" << data.size() << "bytes";
+
+    // Lazily resolve the tool if we don't have it yet
+    if (!_rtcmMavlink && qgcApp()) {
+        _rtcmMavlink = qgcApp()->findChild<RTCMMavlink*>();
+    }
+
+    if (_rtcmMavlink) {
+        // Forward raw RTCM bytes to the autopilot via MAVLink GPS_RTCM_DATA
+        _rtcmMavlink->RTCMDataUpdate(data);
+
+        if (_ntripStatus != tr("Connected")) {
+            _ntripStatus = tr("Connected");
+            emit ntripStatusChanged();
+        }
+    } else {
+        // Tool not constructed yet — avoid crash, keep status, and don't spam
+        static uint32_t drop_warn_counter = 0;
+        if ((drop_warn_counter++ % 50) == 0) {
+            qCWarning(NTRIPLog) << "RTCMMavlink tool not ready; dropping RTCM bytes:" << data.size();
+        }
+    }
+
+    _startStopBusy = false;  // guard clears once bytes flow (or we tried)
+}
+
+static QByteArray _makeGGA(const QGeoCoordinate& coord, double altitude_msl)
+{
+    // UTC time hhmmss format
+    const QTime utc = QDateTime::currentDateTimeUtc().time();
+    const QString hhmmss = QString("%1%2%3")
+        .arg(utc.hour(),   2, 10, QChar('0'))
+        .arg(utc.minute(), 2, 10, QChar('0'))
+        .arg(utc.second(), 2, 10, QChar('0'));
+
+    // Convert decimal degrees to NMEA DMM with zero-padded minutes:
+    // lat:  ddmm.mmmm, lon: dddmm.mmmm
+    auto dmm = [](double deg, bool lat) -> QString {
+        double a = qFabs(deg);
+        int d = int(a);
+        double m = (a - d) * 60.0;
+
+        // Round to 4 decimals and handle 59.99995 -> 60.0000 carry into degrees
+        int m10000 = int(m * 10000.0 + 0.5);
+        double m_rounded = m10000 / 10000.0;
+        if (m_rounded >= 60.0) {
+            m_rounded -= 60.0;
+            d += 1;
+        }
+
+        // Ensure minutes have two digits before the decimal (e.g. 08.1234)
+        QString mm = QString::number(m_rounded, 'f', 4);
+        if (m_rounded < 10.0) {
+            mm.prepend("0");
+        }
+
+        if (lat) {
+            return QString("%1%2").arg(d, 2, 10, QChar('0')).arg(mm);
+        } else {
+            return QString("%1%2").arg(d, 3, 10, QChar('0')).arg(mm);
+        }
+    };
+
+    const bool latNorth = coord.latitude() >= 0.0;
+    const bool lonEast  = coord.longitude() >= 0.0;
+
+    const QString latField = dmm(coord.latitude(), true);
+    const QString lonField = dmm(coord.longitude(), false);
+
+    // IMPORTANT: include geoid separation as 0.0 and unit 'M'
+    // Fields: time,lat,N,lon,E,fix,nsat,hdop,alt,M,geoid,M,age,station
+    const QString core = QString("GPGGA,%1,%2,%3,%4,%5,1,12,1.0,%6,M,0.0,M,,")
+        .arg(hhmmss)
+        .arg(latField)
+        .arg(latNorth ? "N" : "S")
+        .arg(lonField)
+        .arg(lonEast  ? "E" : "W")
+        .arg(QString::number(altitude_msl, 'f', 1));
+
+    // NMEA checksum over bytes between '$' and '*'
+    quint8 cksum = 0;
+    const QByteArray coreBytes = core.toUtf8();
+    for (char ch : coreBytes) {
+        cksum ^= static_cast<quint8>(ch);
+    }
+
+    const QString cks = QString("%1").arg(cksum, 2, 16, QChar('0')).toUpper();
+    const QByteArray sentence = QByteArray("$") + coreBytes + QByteArray("*") + cks.toUtf8();
+    return sentence;
+}
+
+void NTRIPManager::_sendGGA()
+{
+    if (!_tcpLink) {
+        return;
+    }
+
+    QGeoCoordinate coord;
+    double alt_msl = 0.0;
+    bool validCoord = false;
+    QString srcUsed;
+
+    if (qgcApp()) {
+        // PRIORITY 1: Raw GPS data from vehicle GPS facts (most important for RTK)
+        MultiVehicleManager* mvm = MultiVehicleManager::instance();
+        if (mvm) {
+            if (Vehicle* veh = mvm->activeVehicle()) {
+                FactGroup* gps = veh->gpsFactGroup();
+                if (gps) {
+                    // Try common GPS fact names
+                    Fact* latF = gps->getFact(QStringLiteral("lat"));
+                    Fact* lonF = gps->getFact(QStringLiteral("lon"));
+
+                    // If "lat"/"lon" don't work, try alternative names
+                    if (!latF) latF = gps->getFact(QStringLiteral("latitude"));
+                    if (!lonF) lonF = gps->getFact(QStringLiteral("longitude"));
+                    if (!latF) latF = gps->getFact(QStringLiteral("lat_deg"));
+                    if (!lonF) lonF = gps->getFact(QStringLiteral("lon_deg"));
+                    if (!latF) latF = gps->getFact(QStringLiteral("latitude_deg"));
+                    if (!lonF) lonF = gps->getFact(QStringLiteral("longitude_deg"));
+
+                    if (latF && lonF) {
+                        const double glat = latF->rawValue().toDouble();
+                        const double glon = lonF->rawValue().toDouble();
+
+                        // GPS coordinates might be in 1e-7 degrees format (int32 scaled)
+                        double lat_deg = glat;
+                        double lon_deg = glon;
+
+                        // Check if values look like scaled integers (> 1000 suggests 1e-7 format)
+                        if (qAbs(glat) > 1000.0 || qAbs(glon) > 1000.0) {
+                            lat_deg = glat * 1e-7;
+                            lon_deg = glon * 1e-7;
+                        }
+
+                        if (qIsFinite(lat_deg) && qIsFinite(lon_deg) &&
+                            !(lat_deg == 0.0 && lon_deg == 0.0) &&
+                            qAbs(lat_deg) <= 90.0 && qAbs(lon_deg) <= 180.0) {
+
+                            coord = QGeoCoordinate(lat_deg, lon_deg);
+                            validCoord = true;
+
+                            // Get altitude from GPS if available
+                            Fact* altF = gps->getFact(QStringLiteral("alt"));
+                            if (!altF) altF = gps->getFact(QStringLiteral("altitude"));
+                            if (altF) {
+                                double raw_alt = altF->rawValue().toDouble();
+                                // Altitude might be in mm or cm, convert to meters
+                                if (qAbs(raw_alt) > 10000.0) {  // > 10km suggests mm format
+                                    alt_msl = raw_alt * 1e-3;   // mm to meters
+                                } else if (qAbs(raw_alt) > 1000.0) {  // > 1km suggests cm format
+                                    alt_msl = raw_alt * 1e-2;   // cm to meters
+                                } else {
+                                    alt_msl = raw_alt;          // already in meters
+                                }
+                                if (!qIsFinite(alt_msl)) alt_msl = 0.0;
+                            }
+
+                            srcUsed = QStringLiteral("GPS Raw");
+                            qCDebug(NTRIPLog) << "NTRIP: Using raw GPS data for GGA"
+                                              << "lat:" << lat_deg << "lon:" << lon_deg << "alt:" << alt_msl;
+                        }
+                    }
+                } else {
+                    // Vehicle exists but no GPS FactGroup yet
+                    qCDebug(NTRIPLog) << "NTRIP: Vehicle found but no GPS FactGroup available yet";
+                }
+            } else {
+                // MultiVehicleManager exists but no active vehicle yet
+                static int no_vehicle_count = 0;
+                if ((no_vehicle_count++ % 10) == 0) { // Log every 10th time to avoid spam
+                    qCDebug(NTRIPLog) << "NTRIP: MultiVehicleManager found but no active vehicle yet";
+                }
+            }
+        } else {
+            // MultiVehicleManager not found yet - this is normal during early startup
+            static int no_mvm_count = 0;
+            if ((no_mvm_count++ % 10) == 0) { // Log every 10th time to avoid spam
+                qCDebug(NTRIPLog) << "NTRIP: MultiVehicleManager not available yet (startup)";
+            }
+        }
+
+        // PRIORITY 2: Vehicle global position estimate (EKF output)
+        if (!validCoord) {
+            MultiVehicleManager* mvm2 = MultiVehicleManager::instance();
+            if (mvm2) {
+                if (Vehicle* veh2 = mvm2->activeVehicle()) {
+                    coord = veh2->coordinate();
+                    if (coord.isValid() && !(coord.latitude() == 0.0 && coord.longitude() == 0.0)) {
+                        validCoord = true;
+                        double a = coord.altitude();
+                        alt_msl = qIsFinite(a) ? a : 0.0;
+                        srcUsed = QStringLiteral("Vehicle EKF");
+                        qCDebug(NTRIPLog) << "NTRIP: Using vehicle EKF position for GGA" << coord;
+                    }
+                }
+            }
+        }
+
+    }
+
+    if (!validCoord) {
+        qCDebug(NTRIPLog) << "NTRIP: No valid position available, skipping GGA.";
+        return;
+    }
+
+    // Once we have a real valid coord, slow down GGA to 5 seconds
+    if (_ggaTimer && _ggaTimer->interval() != 5000) {
+        _ggaTimer->setInterval(5000);
+        qCDebug(NTRIPLog) << "NTRIP: Real position acquired, reducing GGA frequency to 5s";
+    }
+
+    const QByteArray gga = _makeGGA(coord, alt_msl);
+
+    // Debug: Log the GGA sentence being sent (but reduce spam)
+    static int gga_send_count = 0;
+    if ((gga_send_count++ % 5) == 0) { // Log every 5th GGA to reduce spam
+        qCDebug(NTRIPLog) << "NTRIP: Sending GGA:" << gga;
+        qCDebug(NTRIPLog) << "NTRIP: GGA coord:" << coord << "alt:" << alt_msl << "source:" << srcUsed;
+    }
+
+    QMetaObject::invokeMethod(_tcpLink, "sendNMEA",
+                              Qt::QueuedConnection,
+                              Q_ARG(QByteArray, gga));
+
+    // Update GGA source for UI display
+    if (!srcUsed.isEmpty() && srcUsed != _ggaSource) {
+        _ggaSource = srcUsed;
+        emit ggaSourceChanged();
+    }
+}
+
+void NTRIPManager::_checkSettings()
+{
+    if (_startStopBusy) {
+        qCDebug(NTRIPLog) << "NTRIP _checkSettings: busy, skipping";
+        return;
+    }
+
+    NTRIPSettings* settings = SettingsManager::instance()->ntripSettings();
+    Fact* enableFact = nullptr;
+    if (settings && settings->ntripServerConnectEnabled()) {
+        enableFact = settings->ntripServerConnectEnabled();
+    }
+
+    // During startup, keep forcing OFF until we observe the Fact stable at false
+    // for 2 consecutive ticks. This defeats late restores from QML/settings.
+    if (_startupSuppress) {
+        if (enableFact) {
+            if (enableFact->rawValue().toBool()) {
+                qCDebug(NTRIPLog) << "NTRIP Startup: coercing OFF (late restore detected)";
+                enableFact->setRawValue(false);
+                _startupStableTicks = 0;   // reset stability counter on any true
+            } else {
+                _startupStableTicks++;
+            }
+        } else {
+            _startupStableTicks = 0;       // no fact yet, not stable
+        }
+
+        // Release once we have seen false for 2 ticks
+        if (_startupStableTicks >= 2) {
+            _startupSuppress = false;
+            if (!_forcedOffOnce) {
+                _forcedOffOnce = true;
+                if (_ntripEnableConn) {
+                    disconnect(_ntripEnableConn);
+                }
+            }
+            qCDebug(NTRIPLog) << "NTRIP Startup: suppression released; honoring user setting from now on";
+        } else {
+            return; // keep suppressing this tick
+        }
+    }
+
+    bool shouldBeRunning = false;
+    if (enableFact) {
+        shouldBeRunning = enableFact->rawValue().toBool();
+    } else {
+        qCWarning(NTRIPLog) << "NTRIP settings missing; defaulting to disabled";
+    }
+
+    bool isRunning = (_tcpLink != nullptr);
+
+    qCDebug(NTRIPLog) << "NTRIP _checkSettings:"
+                      << " isRunning=" << isRunning
+                      << " shouldBeRunning=" << shouldBeRunning;
+
+    if (shouldBeRunning && !isRunning) {
+        qCDebug(NTRIPLog) << "NTRIP _checkSettings: calling startNTRIP()";
+        startNTRIP();
+    } else if (!shouldBeRunning && isRunning) {
+        qCDebug(NTRIPLog) << "NTRIP _checkSettings: calling stopNTRIP()";
+        stopNTRIP();
+    }
+}
+
+void NTRIPManager::_onCasterDisconnected(const QString& reason)
+{
+    qWarning() << "NTRIP: Disconnected by server:" << reason;
+    if (reason.contains("NO_LOCATION_PROVIDED", Qt::CaseInsensitive)) {
+        _casterStatus = CasterStatus::NoLocationError;
+    } else {
+        _casterStatus = CasterStatus::OtherError;
+    }
+    emit casterStatusChanged(_casterStatus);
+}
diff --git a/src/GPS/NTRIP.h b/src/GPS/NTRIP.h
new file mode 100644
index 000000000000..60b3f747a14d
--- /dev/null
+++ b/src/GPS/NTRIP.h
@@ -0,0 +1,190 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include <atomic>
+
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QObject>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtPositioning/QGeoCoordinate>
+
+Q_DECLARE_LOGGING_CATEGORY(NTRIPLog)
+
+class RTCMMavlink;
+class NTRIPSettings;
+class Vehicle;
+class MultiVehicleManager;
+
+#define RTCM3_PREAMBLE 0xD3
+
+class RTCMParser
+{
+public:
+    RTCMParser();
+    void reset();
+    bool addByte(uint8_t byte);
+    uint8_t* message() { return _buffer; }
+    uint16_t messageLength() { return _messageLength; }
+    uint16_t messageId();
+    const uint8_t* crcBytes() const { return _crcBytes; }
+    int crcSize() const { return 3; }
+
+private:
+    enum State {
+        WaitingForPreamble,
+        ReadingLength,
+        ReadingMessage,
+        ReadingCRC
+    };
+
+    State _state;
+    uint8_t _buffer[1024];
+    uint16_t _messageLength;
+    uint16_t _bytesRead;
+    uint16_t _lengthBytesRead;
+    uint8_t _lengthBytes[2];
+    uint16_t _crcBytesRead;
+    uint8_t _crcBytes[3];
+};
+
+class NTRIPTCPLink : public QObject
+{
+    Q_OBJECT
+
+public:
+    NTRIPTCPLink(const QString& hostAddress,
+                 int port,
+                 const QString& username,
+                 const QString& password,
+                 const QString& mountpoint,
+                 const QString& whitelist,
+                 bool useSpartn,
+                 QObject* parent = nullptr);
+
+    Q_INVOKABLE void debugFetchSourceTable();
+
+    ~NTRIPTCPLink();
+
+public slots:
+    void start();
+    void requestStop();
+    void sendNMEA(const QByteArray& sentence);
+
+signals:
+    void finished();
+    void error(const QString& errorMsg);
+    void RTCMDataUpdate(const QByteArray& message);
+    // Called when SPARTN corrections are received from the NTRIPTCPLink
+    // These corrections are forwarded to the connected vehicle (PX4/ArduPilot)
+    // using the same path as RTCM corrections via _rtcmDataReceived().
+    void SPARTNDataUpdate(const QByteArray& message);
+    void connected();
+
+
+private slots:
+    void _readBytes();
+
+private:
+    enum class NTRIPState {
+        uninitialised,
+        waiting_for_http_response,
+        waiting_for_spartn_data,
+        waiting_for_rtcm_header,
+        accumulating_rtcm_packet,
+    };
+
+    void _hardwareConnect();
+    void _parse(const QByteArray& buffer);
+    void _handleSpartnData(const QByteArray& data);
+
+    QTcpSocket* _socket = nullptr;
+
+    QString _hostAddress;
+    int _port;
+    QString _username;
+    QString _password;
+    QString _mountpoint;
+    bool _useSpartn = false;
+    QVector<int> _whitelist;
+
+    RTCMParser* _rtcmParser = nullptr;
+    NTRIPState _state;
+
+    std::atomic<bool> _stopping{false};
+    QMetaObject::Connection _readyReadConn;
+
+    // Small buffer to strip a response header only once if needed
+    QByteArray _spartnBuf;
+    bool _spartnNeedHeaderStrip = true;
+
+};
+
+class NTRIPManager : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString ntripStatus READ ntripStatus NOTIFY ntripStatusChanged)
+    Q_PROPERTY(CasterStatus casterStatus READ casterStatus NOTIFY casterStatusChanged)
+    Q_PROPERTY(QString ggaSource READ ggaSource NOTIFY ggaSourceChanged)
+
+public:
+    enum class CasterStatus { Connected, NoLocationError, OtherError };
+
+    NTRIPManager(QObject* parent = nullptr);
+    ~NTRIPManager();
+
+    static NTRIPManager* instance();
+
+    QString ntripStatus() const { return _ntripStatus; }
+    CasterStatus casterStatus() const { return _casterStatus; }
+    QString ggaSource() const { return _ggaSource; }
+
+    void startNTRIP();
+    void stopNTRIP();
+
+signals:
+    void ntripStatusChanged();
+    void casterStatusChanged(CasterStatus status);
+    void ggaSourceChanged();
+
+public slots:
+    void _tcpError(const QString& errorMsg);
+    void _rtcmDataReceived(const QByteArray& data);
+
+private:
+    void _checkSettings();
+    void _sendGGA();
+    void _onCasterDisconnected(const QString& reason);
+
+    QTimer* _ggaTimer = nullptr;
+
+    QString _ntripStatus;
+    QString _ggaSource;
+    QMetaObject::Connection _ntripEnableConn;
+
+    NTRIPTCPLink* _tcpLink = nullptr;
+    QThread* _tcpThread = nullptr;
+    RTCMMavlink* _rtcmMavlink = nullptr;
+    QTimer* _settingsCheckTimer = nullptr;
+    bool _startStopBusy = false;
+    bool _forcedOffOnce = false;
+    bool _useSpartn = false;
+
+    QElapsedTimer _startupTimer;
+    bool _startupSuppress = true;
+    int  _startupStableTicks = 0;
+
+    CasterStatus _casterStatus = CasterStatus::OtherError;
+
+    static NTRIPManager* _instance;
+};
diff --git a/src/GPS/RTCMMavlink.cc b/src/GPS/RTCMMavlink.cc
index bd34cfeb7e57..1205d0a849f0 100644
--- a/src/GPS/RTCMMavlink.cc
+++ b/src/GPS/RTCMMavlink.cc
@@ -13,7 +13,7 @@
 #include "QGCLoggingCategory.h"
 #include "Vehicle.h"
 
-QGC_LOGGING_CATEGORY(RTCMMavlinkLog, "qgc.gps.rtcmmavlink")
+QGC_LOGGING_CATEGORY(RTCMMavlinkLog, "GPS.RTCMMavlink")
 
 RTCMMavlink::RTCMMavlink(QObject *parent)
     : QObject(parent)
diff --git a/src/Gimbal/CMakeLists.txt b/src/Gimbal/CMakeLists.txt
index d8fafa30c2cd..f694b50c5f6b 100644
--- a/src/Gimbal/CMakeLists.txt
+++ b/src/Gimbal/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Gimbal Module
+# Camera gimbal control and stabilization
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         Gimbal.cc
@@ -6,7 +11,9 @@ target_sources(${CMAKE_PROJECT_NAME}
         GimbalController.h
 )
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# Gimbal Configuration Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} json_gimbal
     PREFIX "/json/Vehicle"
     FILES GimbalFact.json
diff --git a/src/Gimbal/Gimbal.cc b/src/Gimbal/Gimbal.cc
index d7b7451b0f1b..a66bf8ba5147 100644
--- a/src/Gimbal/Gimbal.cc
+++ b/src/Gimbal/Gimbal.cc
@@ -11,12 +11,12 @@
 #include "GimbalController.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(GimbalLog, "qgc.gimbal.gimbal")
+QGC_LOGGING_CATEGORY(GimbalLog, "Gimbal.Gimbal")
 
 Gimbal::Gimbal(GimbalController *parent)
     : FactGroup(1000, QStringLiteral(":/json/Vehicle/GimbalFact.json"), parent)
 {
-    // qCDebug(GimbalLog) << Q_FUNC_INFO << this;
+    qCDebug(GimbalLog) << this;
 
     _initFacts();
 }
@@ -38,9 +38,9 @@ const Gimbal &Gimbal::operator=(const Gimbal &other)
     _requestInformationRetries = other._requestInformationRetries;
     _requestStatusRetries = other._requestStatusRetries;
     _requestAttitudeRetries = other._requestAttitudeRetries;
-    _receivedInformation = other._receivedInformation;
-    _receivedStatus = other._receivedStatus;
-    _receivedAttitude = other._receivedAttitude;
+    _receivedGimbalManagerInformation = other._receivedGimbalManagerInformation;
+    _receivedGimbalManagerStatus = other._receivedGimbalManagerStatus;
+    _receivedGimbalDeviceAttitudeStatus = other._receivedGimbalDeviceAttitudeStatus;
     _isComplete = other._isComplete;
     _retracted = other._retracted;
     _neutral = other._neutral;
@@ -74,3 +74,11 @@ void Gimbal::_initFacts()
     _deviceIdFact.setRawValue(0);
     _managerCompidFact.setRawValue(0);
 }
+
+void Gimbal::setCapabilityFlags(uint32_t flags)
+{
+    if (_capabilityFlags != flags) {
+        _capabilityFlags = flags;
+        emit capabilityFlagsChanged();
+    }
+}
diff --git a/src/Gimbal/Gimbal.h b/src/Gimbal/Gimbal.h
index 3d2a35635278..408a0ccc84fb 100644
--- a/src/Gimbal/Gimbal.h
+++ b/src/Gimbal/Gimbal.h
@@ -12,6 +12,7 @@
 #include <QtCore/QLoggingCategory>
 
 #include "FactGroup.h"
+#include "QGCMAVLink.h"
 
 Q_DECLARE_LOGGING_CATEGORY(GimbalLog)
 
@@ -32,6 +33,8 @@ class Gimbal : public FactGroup
     Q_PROPERTY(bool     retracted               READ retracted                  NOTIFY retractedChanged)
     Q_PROPERTY(bool     gimbalHaveControl       READ gimbalHaveControl          NOTIFY gimbalHaveControlChanged)
     Q_PROPERTY(bool     gimbalOthersHaveControl READ gimbalOthersHaveControl    NOTIFY gimbalOthersHaveControlChanged)
+    Q_PROPERTY(bool     supportsRetract         READ supportsRetract            NOTIFY capabilityFlagsChanged)
+    Q_PROPERTY(bool     supportsYawLock         READ supportsYawLock            NOTIFY capabilityFlagsChanged)
 
     friend class GimbalController;
 
@@ -69,6 +72,10 @@ class Gimbal : public FactGroup
     void setGimbalHaveControl(bool set) { if (set != _haveControl) { _haveControl = set; emit gimbalHaveControlChanged(); } }
     void setGimbalOthersHaveControl(bool set) { if (set != _othersHaveControl) { _othersHaveControl = set; emit gimbalOthersHaveControlChanged(); } }
 
+    void setCapabilityFlags(uint32_t flags);
+    bool supportsRetract() const { return (_capabilityFlags & GIMBAL_MANAGER_CAP_FLAGS_HAS_RETRACT) != 0; }
+    bool supportsYawLock() const { return (_capabilityFlags & GIMBAL_MANAGER_CAP_FLAGS_HAS_YAW_LOCK) != 0; }
+
 signals:
     void pitchRateChanged();
     void yawRateChanged();
@@ -76,6 +83,7 @@ class Gimbal : public FactGroup
     void retractedChanged();
     void gimbalHaveControlChanged();
     void gimbalOthersHaveControlChanged();
+    void capabilityFlagsChanged();
 
 private:
     void _initFacts();
@@ -83,11 +91,12 @@ class Gimbal : public FactGroup
     unsigned _requestInformationRetries = 3;
     unsigned _requestStatusRetries = 6;
     unsigned _requestAttitudeRetries = 3;
-    bool _receivedInformation = false;
-    bool _receivedStatus = false;
-    bool _receivedAttitude = false;
+    bool _receivedGimbalManagerInformation = false;
+    bool _receivedGimbalManagerStatus = false;
+    bool _receivedGimbalDeviceAttitudeStatus = false;
     bool _isComplete = false;
     bool _neutral = false;
+    uint32_t _capabilityFlags = 0; // GIMBAL_MANAGER_CAP_FLAGS
 
     Fact _absoluteRollFact = Fact(0, QStringLiteral("gimbalRoll"), FactMetaData::valueTypeFloat);
     Fact _absolutePitchFact = Fact(0, QStringLiteral("gimbalPitch"), FactMetaData::valueTypeFloat);
diff --git a/src/Gimbal/GimbalController.cc b/src/Gimbal/GimbalController.cc
index 7cb90402158f..1405828c5f4f 100644
--- a/src/Gimbal/GimbalController.cc
+++ b/src/Gimbal/GimbalController.cc
@@ -16,7 +16,7 @@
 #include "SettingsManager.h"
 #include "Vehicle.h"
 
-QGC_LOGGING_CATEGORY(GimbalControllerLog, "qgc.gimbal.gimbalcontroller")
+QGC_LOGGING_CATEGORY(GimbalControllerLog, "Gimbal.GimbalController")
 
 GimbalController::GimbalController(Vehicle *vehicle)
     : QObject(vehicle)
@@ -87,7 +87,7 @@ void GimbalController::_handleHeartbeat(const mavlink_message_t &message)
     // Note that we are working over potential gimbal managers here, instead of potential gimbals.
     // This is because we address the gimbal manager by compid, but a gimbal device might have an
     // id different than the message compid it comes from. For more information see https://mavlink.io/en/services/gimbal_v2.html
-    if (!gimbalManager.receivedInformation && (gimbalManager.requestGimbalManagerInformationRetries > 0)) {
+    if (!gimbalManager.receivedGimbalManagerInformation && (gimbalManager.requestGimbalManagerInformationRetries > 0)) {
         _requestGimbalInformation(message.compid);
         --gimbalManager.requestGimbalManagerInformationRetries;
     }
@@ -116,16 +116,17 @@ void GimbalController::_handleGimbalManagerInformation(const mavlink_message_t &
     Gimbal *const gimbal = gimbalIt.value();
     gimbal->setManagerCompid(message.compid);
     gimbal->setDeviceId(information.gimbal_device_id);
+    gimbal->setCapabilityFlags(information.cap_flags);
 
-    if (!gimbal->_receivedInformation) {
+    if (!gimbal->_receivedGimbalManagerInformation) {
         qCDebug(GimbalControllerLog) << "gimbal manager with compId:" << message.compid
                            << " is responsible for gimbal device:" << information.gimbal_device_id;
     }
 
-    gimbal->_receivedInformation = true;
+    gimbal->_receivedGimbalManagerInformation = true;
     // It is important to flag our potential gimbal manager as well, so we stop requesting gimbal_manger_information message
     PotentialGimbalManager &gimbalManager = _potentialGimbalManagers[message.compid];
-    gimbalManager.receivedInformation = true;
+    gimbalManager.receivedGimbalManagerInformation = true;
 
     _checkComplete(*gimbal, pairId);
 }
@@ -164,12 +165,12 @@ void GimbalController::_handleGimbalManagerStatus(const mavlink_message_t &messa
     }
 
     // Only log this message once
-    if (!gimbal->_receivedStatus) {
+    if (!gimbal->_receivedGimbalManagerStatus) {
         qCDebug(GimbalControllerLog) << "_handleGimbalManagerStatus: gimbal manager with compId" << message.compid
                                      << "is responsible for gimbal device" << status.gimbal_device_id;
     }
 
-    gimbal->_receivedStatus = true;
+    gimbal->_receivedGimbalManagerStatus = true;
 
     const bool haveControl =
         (status.primary_control_sysid == MAVLinkProtocol::instance()->getSystemId()) &&
@@ -261,7 +262,7 @@ void GimbalController::_handleGimbalDeviceAttitudeStatus(const mavlink_message_t
         gimbal->setAbsoluteYaw(absoluteYaw);
     }
 
-    gimbal->_receivedAttitude = true;
+    gimbal->_receivedGimbalDeviceAttitudeStatus = true;
 
     _checkComplete(*gimbal, pairId);
 }
@@ -285,14 +286,14 @@ void GimbalController::_checkComplete(Gimbal &gimbal, GimbalPairId pairId)
         return;
     }
 
-    if (!gimbal._receivedInformation && gimbal._requestInformationRetries > 0) {
+    if (!gimbal._receivedGimbalManagerInformation && gimbal._requestInformationRetries > 0) {
         _requestGimbalInformation(pairId.managerCompid);
         --gimbal._requestInformationRetries;
     }
     // Limit to 1 second between set message interface requests
     static qint64 lastRequestStatusMessage = 0;
     qint64 now = QDateTime::currentMSecsSinceEpoch();
-    if (!gimbal._receivedStatus && (gimbal._requestStatusRetries > 0) && (now - lastRequestStatusMessage > 1000)) {
+    if (!gimbal._receivedGimbalManagerStatus && (gimbal._requestStatusRetries > 0) && (now - lastRequestStatusMessage > 1000)) {
         lastRequestStatusMessage = now;
         _vehicle->sendMavCommand(pairId.managerCompid,
                                  MAV_CMD_SET_MESSAGE_INTERVAL,
@@ -306,8 +307,8 @@ void GimbalController::_checkComplete(Gimbal &gimbal, GimbalPairId pairId)
                            << ", retries remaining:" << gimbal._requestStatusRetries;
     }
 
-    if (!gimbal._receivedAttitude && (gimbal._requestAttitudeRetries > 0) &&
-        gimbal._receivedInformation && (pairId.deviceId != 0)) {
+    if (!gimbal._receivedGimbalDeviceAttitudeStatus && (gimbal._requestAttitudeRetries > 0) &&
+        gimbal._receivedGimbalManagerInformation && (pairId.deviceId != 0)) {
         // We request the attitude directly from the gimbal device component.
         // We can only do that once we have received the gimbal manager information
         // telling us which gimbal device it is responsible for.
@@ -325,7 +326,7 @@ void GimbalController::_checkComplete(Gimbal &gimbal, GimbalPairId pairId)
         --gimbal._requestAttitudeRetries;
     }
 
-    if (!gimbal._receivedInformation || !gimbal._receivedStatus || !gimbal._receivedAttitude) {
+    if (!gimbal._receivedGimbalManagerInformation || !gimbal._receivedGimbalManagerStatus || !gimbal._receivedGimbalDeviceAttitudeStatus) {
         // Not complete yet.
         return;
     }
@@ -426,7 +427,7 @@ void GimbalController::centerGimbal()
         qCDebug(GimbalControllerLog) << "gimbalYawStep: active gimbal is nullptr, returning";
         return;
     }
-    sendPitchBodyYaw(0.0, 0.0);
+    sendPitchBodyYaw(0.0, 0.0, true);
 }
 
 void GimbalController::gimbalOnScreenControl(float panPct, float tiltPct, bool clickAndPoint, bool clickAndDrag, bool rateControl, bool retract, bool neutral, bool yawlock)
@@ -540,7 +541,7 @@ void GimbalController::sendPitchAbsoluteYaw(float pitch, float yaw, bool showErr
         _activeGimbal->deviceId()->rawValue().toUInt());
 }
 
-void GimbalController::toggleGimbalRetracted(bool set)
+void GimbalController::setGimbalRetract(bool set)
 {
     if (!_tryGetGimbalControl()) {
         return;
@@ -596,7 +597,7 @@ void GimbalController::_rateSenderTimeout()
     sendRate();
 }
 
-void GimbalController::toggleGimbalYawLock(bool set)
+void GimbalController::setGimbalYawLock(bool set)
 {
     if (!_tryGetGimbalControl()) {
         return;
diff --git a/src/Gimbal/GimbalController.h b/src/Gimbal/GimbalController.h
index 4a2601ed587f..e570271e7651 100644
--- a/src/Gimbal/GimbalController.h
+++ b/src/Gimbal/GimbalController.h
@@ -27,8 +27,9 @@ class GimbalController : public QObject
     QML_ELEMENT
     QML_UNCREATABLE("")
     Q_MOC_INCLUDE("QmlObjectListModel.h")
-    Q_PROPERTY(Gimbal *activeGimbal READ activeGimbal WRITE setActiveGimbal NOTIFY activeGimbalChanged)
-    Q_PROPERTY(QmlObjectListModel *gimbals READ gimbals CONSTANT)
+
+    Q_PROPERTY(Gimbal*              activeGimbal    READ activeGimbal WRITE setActiveGimbal NOTIFY activeGimbalChanged)
+    Q_PROPERTY(QmlObjectListModel*  gimbals         READ gimbals                            CONSTANT)
 
 public:
     GimbalController(Vehicle *vehicle);
@@ -43,8 +44,8 @@ class GimbalController : public QObject
     Q_INVOKABLE void gimbalOnScreenControl(float panpct, float tiltpct, bool clickAndPoint, bool clickAndDrag, bool rateControl, bool retract = false, bool neutral = false, bool yawlock = false);
     Q_INVOKABLE void sendPitchBodyYaw(float pitch, float yaw, bool showError = true);
     Q_INVOKABLE void sendPitchAbsoluteYaw(float pitch, float yaw, bool showError = true);
-    Q_INVOKABLE void toggleGimbalRetracted(bool set = false);
-    Q_INVOKABLE void toggleGimbalYawLock(bool set = false);
+    Q_INVOKABLE void setGimbalRetract(bool set);
+    Q_INVOKABLE void setGimbalYawLock(bool set);
     Q_INVOKABLE void acquireGimbalControl();
     Q_INVOKABLE void releaseGimbalControl();
     Q_INVOKABLE void sendRate();
@@ -55,7 +56,7 @@ class GimbalController : public QObject
 
 public slots:
     // These slots are conected with joysticks for button control
-    void gimbalYawLock(bool yawLock) { toggleGimbalYawLock(yawLock); }
+    void gimbalYawLock(bool yawLock) { setGimbalYawLock(yawLock); }
     Q_INVOKABLE void centerGimbal();
     void gimbalPitchStart(int direction);
     void gimbalYawStart(int direction);
@@ -110,7 +111,7 @@ private slots:
 
     struct PotentialGimbalManager {
         unsigned requestGimbalManagerInformationRetries = 6;
-        bool receivedInformation = false;
+        bool receivedGimbalManagerInformation = false;
     };
     QMap<uint8_t, PotentialGimbalManager> _potentialGimbalManagers; // key is compid
 
diff --git a/src/Joystick/CMakeLists.txt b/src/Joystick/CMakeLists.txt
index 160778aa2891..f6e754d849b5 100644
--- a/src/Joystick/CMakeLists.txt
+++ b/src/Joystick/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Joystick Module
+# Game controller and joystick input support
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         Joystick.cc
@@ -8,6 +13,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Android Joystick Implementation
+# ----------------------------------------------------------------------------
 if(ANDROID)
     target_sources(${CMAKE_PROJECT_NAME}
         PRIVATE
@@ -17,6 +25,9 @@ if(ANDROID)
     return()
 endif()
 
+# ----------------------------------------------------------------------------
+# SDL Joystick Implementation (Desktop)
+# ----------------------------------------------------------------------------
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         JoystickSDL.cc
@@ -29,7 +40,9 @@ if(SDL_GAMECONTROLLERCONFIG)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE SDL_GAMECONTROLLERCONFIG=\"${SDL_GAMECONTROLLERCONFIG}\")
 endif()
 
-#===========================================================================#
+# ============================================================================
+# SDL Game Controller Database
+# ============================================================================
 
 CPMAddPackage(
     NAME sdl_gamecontrollerdb
@@ -48,8 +61,11 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "qgcresources_sdl"
         "${SDL_GAMECONTROLLERDB_PATH}"
 )
 
-#===========================================================================#
+# ============================================================================
+# SDL3 Library Integration
+# ============================================================================
 
+# Platform-specific SDL options
 set(SDL_EXTRA_OPTIONS "")
 if(WIN32)
     set(SDL_EXTRA_OPTIONS
@@ -64,6 +80,8 @@ if(UNIX)
         "SDL_UNIX_CONSOLE_BUILD ON"
     )
 endif()
+
+# Video only needed on macOS
 if(MACOS)
     set(SDL_VIDEO_FLAG "ON")
 else()
@@ -72,9 +90,9 @@ endif()
 
 CPMAddPackage(
     NAME SDL3
-    VERSION 3.2.16
+    VERSION 3.2.20
     GITHUB_REPOSITORY libsdl-org/SDL
-    GIT_TAG release-3.2.16
+    GIT_TAG release-3.2.20
     OPTIONS
         "SDL_INSTALL OFF"
         "SDL_UNINSTALL OFF"
diff --git a/src/Joystick/Joystick.cc b/src/Joystick/Joystick.cc
index 07b92d368bed..cf5c39594301 100644
--- a/src/Joystick/Joystick.cc
+++ b/src/Joystick/Joystick.cc
@@ -24,8 +24,8 @@
 #include <QtCore/QSettings>
 #include <QtCore/QThread>
 
-QGC_LOGGING_CATEGORY(JoystickLog, "qgc.joystick.joystick")
-QGC_LOGGING_CATEGORY(JoystickValuesLog, "qgc.joystick.joystickvalues")
+QGC_LOGGING_CATEGORY(JoystickLog, "Joystick.joystick")
+QGC_LOGGING_CATEGORY(JoystickValuesLog, "Joystick.joystickvalues")
 
 /*===========================================================================*/
 
@@ -61,7 +61,7 @@ Joystick::Joystick(const QString &name, int axisCount, int buttonCount, int hatC
     , _mavlinkActionManager(new MavlinkActionManager(SettingsManager::instance()->mavlinkActionsSettings()->joystickActionsFile(), this))
     , _assignableButtonActions(new QmlObjectListModel(this))
 {
-    // qCDebug(JoystickLog) << Q_FUNC_INFO << this;
+    qCDebug(JoystickLog) << Q_FUNC_INFO << this << name << "axisCount:buttonCount:hatCount" << axisCount << buttonCount << hatCount;
 
     for (int i = 0; i < _axisCount; i++) {
         _rgAxisValues[i] = 0;
@@ -212,10 +212,13 @@ void Joystick::_loadSettings()
     _circleCorrection  = settings.value(_circleCorrectionSettingsKey, false).toBool();
     _negativeThrust = settings.value(_negativeThrustSettingsKey, false).toBool();
     _throttleMode = static_cast<ThrottleMode_t>(settings.value(_throttleModeSettingsKey, ThrottleModeDownZero).toInt(&convertOk));
+    _enableManualControlExtensions = settings.value(_manualControlExtensionsEnabledKey, false).toBool();
 
     badSettings |= !convertOk;
 
-    qCDebug(JoystickLog) << Q_FUNC_INFO << "calibrated:txmode:throttlemode:exponential:deadband:badsettings" << _calibrated << _transmitterMode << _throttleMode << _exponential << _deadband << badSettings;
+    qCDebug(JoystickLog) << _name;
+    qCDebug(JoystickLog) << "  calibrated:txmode:throttlemode:exponential:deadband:badsettings";
+    qCDebug(JoystickLog) << " " << _calibrated << _transmitterMode << _throttleMode << _exponential << _deadband << badSettings;
 
     const QString minTpl("Axis%1Min");
     const QString maxTpl("Axis%1Max");
@@ -223,6 +226,7 @@ void Joystick::_loadSettings()
     const QString revTpl("Axis%1Rev");
     const QString deadbndTpl("Axis%1Deadbnd");
 
+    qCDebug(JoystickLog) << "  axis:min:max:trim:reversed:deadband:badsettings";
     for (int axis = 0; axis < _axisCount; axis++) {
         Calibration_t *const calibration = &_rgCalibration[axis];
 
@@ -240,11 +244,13 @@ void Joystick::_loadSettings()
 
         calibration->reversed = settings.value(revTpl.arg(axis), false).toBool();
 
-        qCDebug(JoystickLog) << Q_FUNC_INFO << "axis:min:max:trim:reversed:deadband:badsettings" << axis << calibration->min << calibration->max << calibration->center << calibration->reversed << calibration->deadband << badSettings;
+        qCDebug(JoystickLog) << " " << axis << calibration->min << calibration->max << calibration->center << calibration->reversed << calibration->deadband << badSettings;
     }
 
     int workingAxis = 0;
-    for (int function = 0; function < maxFunction; function++) {
+    qCDebug(JoystickLog) << "Function Axis mappings";
+    qCDebug(JoystickLog) << "  function:axis:badsettings";
+    for (int function = 0; function < maxAxisFunction; function++) {
         int functionAxis = settings.value(_rgFunctionSettingsKey[function], -1).toInt(&convertOk);
         badSettings |= (!convertOk || (functionAxis >= _axisCount));
 
@@ -256,7 +262,7 @@ void Joystick::_loadSettings()
             _rgFunctionAxis[function] = functionAxis;
         }
 
-        qCDebug(JoystickLog) << Q_FUNC_INFO << "function:axis:badsettings" << function << functionAxis << badSettings;
+        qCDebug(JoystickLog) << " " << axisFunctionToString(static_cast<AxisFunction_t>(function)) << functionAxis << badSettings;
     }
 
     badSettings |= (workingAxis < 4);
@@ -324,8 +330,14 @@ void Joystick::_saveSettings()
     settings.setValue(_throttleModeSettingsKey, _throttleMode);
     settings.setValue(_negativeThrustSettingsKey, _negativeThrust);
     settings.setValue(_circleCorrectionSettingsKey, _circleCorrection);
+    settings.setValue(_manualControlExtensionsEnabledKey, _enableManualControlExtensions);
 
-    qCDebug(JoystickLog) << Q_FUNC_INFO << "calibrated:throttlemode:deadband:txmode" << _calibrated << _throttleMode << _deadband << _circleCorrection << _transmitterMode;
+    qCDebug(JoystickLog) << _name;
+    qCDebug(JoystickLog) << "  calibrated:exponential:accumulator:circlecorrection:negativeThrust:throttlemode:deadband:axisfrequency:buttonfrequency:txmode";
+    qCDebug(JoystickLog) << " " << _calibrated << _exponential << _accumulator
+                            << _circleCorrection << _negativeThrust << _throttleMode
+                            << _deadband << _axisFrequencyHz << _buttonFrequencyHz
+                            << _transmitterMode;
 
     const QString minTpl("Axis%1Min");
     const QString maxTpl("Axis%1Max");
@@ -333,6 +345,7 @@ void Joystick::_saveSettings()
     const QString revTpl("Axis%1Rev");
     const QString deadbndTpl("Axis%1Deadbnd");
 
+    qCDebug(JoystickLog) << "  axis:min:max:trim:reversed:deadband";
     for (int axis = 0; axis < _axisCount; axis++) {
         Calibration_t* calibration = &_rgCalibration[axis];
         settings.setValue(trimTpl.arg(axis), calibration->center);
@@ -340,24 +353,22 @@ void Joystick::_saveSettings()
         settings.setValue(maxTpl.arg(axis), calibration->max);
         settings.setValue(revTpl.arg(axis), calibration->reversed);
         settings.setValue(deadbndTpl.arg(axis), calibration->deadband);
-        qCDebug(JoystickLog) << Q_FUNC_INFO
-                             << "name:axis:min:max:trim:reversed:deadband"
-                             << _name
-                             << axis
-                             << calibration->min
-                             << calibration->max
-                             << calibration->center
-                             << calibration->reversed
-                             << calibration->deadband;
+        qCDebug(JoystickLog) << " " << axis
+                                << calibration->min
+                                << calibration->max
+                                << calibration->center
+                                << calibration->reversed
+                                << calibration->deadband;
     }
 
     // Write mode 2 mappings without changing mapping currently in use
-    int temp[maxFunction];
+    int temp[maxAxisFunction];
     _remapAxes(_transmitterMode, 2, temp);
 
-    for (int function = 0; function < maxFunction; function++) {
+    qCDebug(JoystickLog) << "TX Mode mappings";
+    for (int function = 0; function < maxAxisFunction; function++) {
         settings.setValue(_rgFunctionSettingsKey[function], temp[function]);
-        qCDebug(JoystickLog) << Q_FUNC_INFO << "name:function:axis" << _name << function << _rgFunctionSettingsKey[function];
+        qCDebug(JoystickLog) << " " << axisFunctionToString(static_cast<AxisFunction_t>(function)) << _rgFunctionSettingsKey[function];
     }
 
     _saveButtonSettings();
@@ -379,15 +390,15 @@ int Joystick::_mapFunctionMode(int mode, int function)
     return -1;
 }
 
-void Joystick::_remapAxes(int currentMode, int newMode, int (&newMapping)[maxFunction])
+void Joystick::_remapAxes(int currentMode, int newMode, int (&newMapping)[maxAxisFunction])
 {
-    int temp[maxFunction];
+    int temp[maxAxisFunction];
 
-    for (int function = 0; function < maxFunction; function++) {
+    for (int function = 0; function < maxAxisFunction; function++) {
         temp[_mapFunctionMode(newMode, function)] = _rgFunctionAxis[_mapFunctionMode(currentMode, function)];
     }
 
-    for (int function = 0; function < maxFunction; function++) {
+    for (int function = 0; function < maxAxisFunction; function++) {
         newMapping[function] = temp[function];
     }
 }
@@ -608,14 +619,14 @@ void Joystick::_handleAxis()
     axis = _rgFunctionAxis[throttleFunction];
     float throttle = _adjustRange(_rgAxisValues[axis], _rgCalibration[axis], (_throttleMode == ThrottleModeDownZero) ? false :_deadband);
 
-    float gimbalPitch = 0.0f;
-    if (_axisCount > 4) {
+    float gimbalPitch = NAN;
+    if (_enableManualControlExtensions && _axisCount > 4) {
         axis = _rgFunctionAxis[gimbalPitchFunction];
         gimbalPitch = _adjustRange(_rgAxisValues[axis], _rgCalibration[axis],_deadband);
     }
 
-    float gimbalYaw = 0.0f;
-    if (_axisCount > 5) {
+    float gimbalYaw = NAN;
+    if (_enableManualControlExtensions && _axisCount > 5) {
         axis = _rgFunctionAxis[gimbalYawFunction];
         gimbalYaw = _adjustRange(_rgAxisValues[axis],   _rgCalibration[axis],_deadband);
     }
@@ -674,7 +685,7 @@ void Joystick::_handleAxis()
 
     const uint16_t lowButtons = static_cast<uint16_t>(buttonPressedBits & 0xFFFF);
     const uint16_t highButtons = static_cast<uint16_t>((buttonPressedBits >> 16) & 0xFFFF);
-    _activeVehicle->sendJoystickDataThreadSafe(roll, pitch, yaw, throttle, lowButtons, highButtons);
+    _activeVehicle->sendJoystickDataThreadSafe(roll, pitch, yaw, throttle, lowButtons, highButtons, gimbalPitch, gimbalYaw);
 }
 
 void Joystick::startPolling(Vehicle* vehicle)
@@ -691,7 +702,7 @@ void Joystick::startPolling(Vehicle* vehicle)
             (void) disconnect(this, &Joystick::gimbalPitchStop, _activeVehicle->gimbalController(), &GimbalController::gimbalPitchStop);
             (void) disconnect(this, &Joystick::gimbalYawStop, _activeVehicle->gimbalController(), &GimbalController::gimbalYawStop);
             (void) disconnect(this, &Joystick::emergencyStop, _activeVehicle, &Vehicle::emergencyStop);
-            (void) disconnect(this, &Joystick::gripperAction, _activeVehicle, &Vehicle::setGripperAction);
+            (void) disconnect(this, &Joystick::gripperAction, _activeVehicle, &Vehicle::sendGripperAction);
             (void) disconnect(this, &Joystick::landingGearDeploy, _activeVehicle, &Vehicle::landingGearDeploy);
             (void) disconnect(this, &Joystick::landingGearRetract, _activeVehicle, &Vehicle::landingGearRetract);
             (void) disconnect(this, &Joystick::motorInterlock, _activeVehicle, &Vehicle::motorInterlock);
@@ -722,7 +733,7 @@ void Joystick::startPolling(Vehicle* vehicle)
             (void) connect(this, &Joystick::gimbalPitchStop,    _activeVehicle->gimbalController(), &GimbalController::gimbalPitchStop);
             (void) connect(this, &Joystick::gimbalYawStop,      _activeVehicle->gimbalController(), &GimbalController::gimbalYawStop);
             (void) connect(this, &Joystick::emergencyStop, _activeVehicle, &Vehicle::emergencyStop);
-            (void) connect(this, &Joystick::gripperAction, _activeVehicle, &Vehicle::setGripperAction);
+            (void) connect(this, &Joystick::gripperAction, _activeVehicle, &Vehicle::sendGripperAction);
             (void) connect(this, &Joystick::landingGearDeploy, _activeVehicle, &Vehicle::landingGearDeploy);
             (void) connect(this, &Joystick::landingGearRetract, _activeVehicle, &Vehicle::landingGearRetract);
             (void) connect(this, &Joystick::motorInterlock, _activeVehicle, &Vehicle::motorInterlock);
@@ -753,7 +764,7 @@ void Joystick::stopPolling()
         (void) disconnect(this, &Joystick::gimbalYawStart, _activeVehicle->gimbalController(), &GimbalController::gimbalYawStart);
         (void) disconnect(this, &Joystick::gimbalPitchStop, _activeVehicle->gimbalController(), &GimbalController::gimbalPitchStop);
         (void) disconnect(this, &Joystick::gimbalYawStop, _activeVehicle->gimbalController(), &GimbalController::gimbalYawStop);
-        (void) disconnect(this, &Joystick::gripperAction, _activeVehicle, &Vehicle::setGripperAction);
+        (void) disconnect(this, &Joystick::gripperAction, _activeVehicle, &Vehicle::sendGripperAction);
         (void) disconnect(this, &Joystick::landingGearDeploy, _activeVehicle, &Vehicle::landingGearDeploy);
         (void) disconnect(this, &Joystick::landingGearRetract, _activeVehicle, &Vehicle::landingGearRetract);
         (void) disconnect(this, &Joystick::motorInterlock, _activeVehicle, &Vehicle::motorInterlock);
@@ -799,7 +810,7 @@ void Joystick::setFunctionAxis(AxisFunction_t function, int axis)
 
 int Joystick::getFunctionAxis(AxisFunction_t function) const
 {
-    if ((static_cast<int>(function) < 0) || (function >= maxFunction)) {
+    if ((static_cast<int>(function) < 0) || (function >= maxAxisFunction)) {
         qCWarning(JoystickLog) << "Invalid function" << function;
     }
 
@@ -836,7 +847,7 @@ void Joystick::setButtonAction(int button, const QString& action)
         return;
     }
 
-    qCWarning(JoystickLog) << Q_FUNC_INFO << button << action;
+    qCDebug(JoystickLog) << "button:action" << button << action;
 
     QSettings settings;
     settings.beginGroup(_settingsGroup);
@@ -1094,13 +1105,17 @@ void Joystick::_executeButtonAction(const QString &action, bool buttonDown)
         if (buttonDown) {
             emit emergencyStop();
         }
-    } else if (action == _buttonActionGripperGrab) {
+    } else if (action == _buttonActionGripperClose) {
+        if (buttonDown) {
+            emit gripperAction(QGCMAVLink::GripperActionClose);
+        }
+    } else if (action == _buttonActionGripperOpen) {
         if (buttonDown) {
-            emit gripperAction(GRIPPER_ACTION_GRAB);
+            emit gripperAction(QGCMAVLink::GripperActionOpen);
         }
-    } else if (action == _buttonActionGripperRelease) {
+    } else if (action == _buttonActionGripperStop) {
         if (buttonDown) {
-            emit gripperAction(GRIPPER_ACTION_RELEASE);
+            emit gripperAction(QGCMAVLink::GripperActionStop);
         }
     } else if (action == _buttonActionLandingGearDeploy) {
         if (buttonDown) {
@@ -1204,8 +1219,9 @@ void Joystick::_buildActionList(Vehicle *activeVehicle)
     _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGimbalYawLock));
     _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGimbalYawFollow));
     _assignableButtonActions->append(new AssignableButtonAction(_buttonActionEmergencyStop));
-    _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGripperGrab));
-    _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGripperRelease));
+    _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGripperClose));
+    _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGripperOpen));
+    _assignableButtonActions->append(new AssignableButtonAction(_buttonActionGripperStop));
     _assignableButtonActions->append(new AssignableButtonAction(_buttonActionLandingGearDeploy));
     _assignableButtonActions->append(new AssignableButtonAction(_buttonActionLandingGearRetract));
 #ifndef QGC_NO_ARDUPILOT_DIALECT
@@ -1230,3 +1246,32 @@ void Joystick::_buildActionList(Vehicle *activeVehicle)
 
     emit assignableActionsChanged();
 }
+
+QString Joystick::axisFunctionToString(AxisFunction_t function)
+{
+    switch (function) {
+    case rollFunction:
+        return QStringLiteral("Roll");
+    case pitchFunction:
+        return QStringLiteral("Pitch");
+    case yawFunction:
+        return QStringLiteral("Yaw");
+    case throttleFunction:
+        return QStringLiteral("Throttle");
+    case gimbalPitchFunction:
+        return QStringLiteral("Gimbal Pitch");
+    case gimbalYawFunction:
+        return QStringLiteral("Gimbal Yaw");
+    default:
+        return QStringLiteral("Unknown");
+    }
+}
+
+void Joystick::setEnableManualControlExtensions(bool enable)
+{
+    if (_enableManualControlExtensions != enable) {
+        _enableManualControlExtensions = enable;
+        _saveSettings();
+        emit enableManualControlExtensionsChanged();
+    }
+}
diff --git a/src/Joystick/Joystick.h b/src/Joystick/Joystick.h
index 95db3b2ea04a..3c359cee3f2a 100644
--- a/src/Joystick/Joystick.h
+++ b/src/Joystick/Joystick.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "MAVLinkLib.h"
+#include "QGCMAVLink.h"
 
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QObject>
@@ -82,6 +82,7 @@ class Joystick : public QThread
     Q_PROPERTY(QString                  name                    READ    name                                                CONSTANT)
     Q_PROPERTY(QStringList              assignableActionTitles  READ    assignableActionTitles                              NOTIFY assignableActionsChanged)
     Q_PROPERTY(QStringList              buttonActions           READ    buttonActions                                       NOTIFY buttonActionsChanged)
+    Q_PROPERTY(bool                     enableManualControlExtensions READ enableManualControlExtensions WRITE setEnableManualControlExtensions NOTIFY enableManualControlExtensionsChanged)
 
     enum ButtonEvent_t {
         BUTTON_UP,
@@ -108,8 +109,9 @@ class Joystick : public QThread
         throttleFunction,
         gimbalPitchFunction,
         gimbalYawFunction,
-        maxFunction
+        maxAxisFunction
     };
+    static QString axisFunctionToString(AxisFunction_t function);
 
     enum ThrottleMode_t {
         ThrottleModeCenterZero,
@@ -183,6 +185,9 @@ class Joystick : public QThread
     /// Set joystick button repeat rate (in Hz)
     void setButtonFrequency(float val);
 
+    bool enableManualControlExtensions() const { return _enableManualControlExtensions; }
+    void setEnableManualControlExtensions(bool enable);
+
 signals:
     // The raw signals are only meant for use by calibration
     void rawAxisValueChanged(int index, int value);
@@ -196,6 +201,7 @@ class Joystick : public QThread
     void accumulatorChanged(bool accumulator);
     void enabledChanged(bool enabled);
     void circleCorrectionChanged(bool circleCorrection);
+    void enableManualControlExtensionsChanged();
     void axisValues(float roll, float pitch, float yaw, float throttle);
     void axisFrequencyHzChanged();
     void buttonFrequencyHzChanged();
@@ -218,7 +224,7 @@ class Joystick : public QThread
     void setVtolInFwdFlight(bool set);
     void setFlightMode(const QString &flightMode);
     void emergencyStop();
-    void gripperAction(GRIPPER_ACTIONS gripperAction);
+    void gripperAction(QGCMAVLink::GripperActions gripperAction);
     void landingGearDeploy();
     void landingGearRetract();
     void motorInterlock(bool enable);
@@ -254,6 +260,7 @@ private slots:
 
     /// Adjust the raw axis value to the -1:1 range given calibration information
     float _adjustRange(int value, const Calibration_t &calibration, bool withDeadbands);
+
     void _executeButtonAction(const QString &action, bool buttonDown);
     int  _findAssignableButtonAction(const QString &action);
     bool _validAxis(int axis) const;
@@ -268,7 +275,7 @@ private slots:
     int _mapFunctionMode(int mode, int function);
 
     /// Remap current axis functions from current TX mode to new TX mode
-    void _remapAxes(int currentMode, int newMode, int (&newMapping)[maxFunction]);
+    void _remapAxes(int currentMode, int newMode, int (&newMapping)[maxAxisFunction]);
 
     int _hatButtonCount = 0;
     int _totalButtonCount = 0;
@@ -285,10 +292,11 @@ private slots:
     bool _deadband = false;
     bool _negativeThrust = false;
     bool _pollingStartedForCalibration = false;
+    bool _enableManualControlExtensions = false;
     float _axisFrequencyHz = _defaultAxisFrequencyHz;
     float _buttonFrequencyHz = _defaultButtonFrequencyHz;
     float _exponential = 0;
-    int _rgFunctionAxis[maxFunction] = {};
+    int _rgFunctionAxis[maxAxisFunction] = {};
     QElapsedTimer _axisTime;
     QList<AssignedButtonAction*> _buttonActionArray;
     QStringList _availableActionTitles;
@@ -307,7 +315,7 @@ private slots:
     static constexpr float _minButtonFrequencyHz = 0.25f;
     static constexpr float _maxButtonFrequencyHz = 50.0f;
 
-    static constexpr const char *_rgFunctionSettingsKey[maxFunction] = {
+    static constexpr const char *_rgFunctionSettingsKey[maxAxisFunction] = {
         "RollAxis",
         "PitchAxis",
         "YawAxis",
@@ -333,6 +341,7 @@ private slots:
     static constexpr const char *_roverTXModeSettingsKey =         "TXMode_Rover";
     static constexpr const char *_vtolTXModeSettingsKey =          "TXMode_VTOL";
     static constexpr const char *_submarineTXModeSettingsKey =     "TXMode_Submarine";
+    static constexpr const char *_manualControlExtensionsEnabledKey = "ManualControlExtensionsEnabled";
 
     static constexpr const char *_buttonActionNone =               QT_TR_NOOP("No Action");
     static constexpr const char *_buttonActionArm =                QT_TR_NOOP("Arm");
@@ -360,8 +369,9 @@ private slots:
     static constexpr const char *_buttonActionGimbalYawLock =      QT_TR_NOOP("Gimbal Yaw Lock");
     static constexpr const char *_buttonActionGimbalYawFollow =    QT_TR_NOOP("Gimbal Yaw Follow");
     static constexpr const char *_buttonActionEmergencyStop =      QT_TR_NOOP("Emergency Stop");
-    static constexpr const char *_buttonActionGripperGrab =        QT_TR_NOOP("Gripper Close");
-    static constexpr const char *_buttonActionGripperRelease =     QT_TR_NOOP("Gripper Open");
+    static constexpr const char *_buttonActionGripperClose =       QT_TR_NOOP("Gripper Close");
+    static constexpr const char *_buttonActionGripperOpen =        QT_TR_NOOP("Gripper Open");
+    static constexpr const char *_buttonActionGripperStop =        QT_TR_NOOP("Gripper Stop");
     static constexpr const char *_buttonActionLandingGearDeploy=   QT_TR_NOOP("Landing gear deploy");
     static constexpr const char *_buttonActionLandingGearRetract=  QT_TR_NOOP("Landing gear retract");
     static constexpr const char *_buttonActionMotorInterlockEnable=   QT_TR_NOOP("Motor Interlock enable");
diff --git a/src/Joystick/JoystickAndroid.cc b/src/Joystick/JoystickAndroid.cc
index aaa58b882447..0f7c128f65f1 100644
--- a/src/Joystick/JoystickAndroid.cc
+++ b/src/Joystick/JoystickAndroid.cc
@@ -15,7 +15,7 @@
 #include <QtCore/QJniEnvironment>
 #include <QtCore/QJniObject>
 
-QGC_LOGGING_CATEGORY(JoystickAndroidLog, "qgc.joystick.joystickandroid")
+QGC_LOGGING_CATEGORY(JoystickAndroidLog, "Joystick.joystickandroid")
 
 QList<int> JoystickAndroid::_androidBtnList(_androidBtnListCount);
 int JoystickAndroid::ACTION_DOWN = 0;
diff --git a/src/Joystick/JoystickManager.cc b/src/Joystick/JoystickManager.cc
index 8a3cfae4a4ff..2bac13c32b53 100644
--- a/src/Joystick/JoystickManager.cc
+++ b/src/Joystick/JoystickManager.cc
@@ -20,7 +20,7 @@
 #include <QtCore/QApplicationStatic>
 #include <QtCore/QSettings>
 
-QGC_LOGGING_CATEGORY(JoystickManagerLog, "qgc.joystick.joystickmanager")
+QGC_LOGGING_CATEGORY(JoystickManagerLog, "Joystick.joystickmanager")
 
 Q_APPLICATION_STATIC(JoystickManager, _joystickManager);
 
@@ -29,7 +29,7 @@ JoystickManager::JoystickManager(QObject *parent)
 {
     qCDebug(JoystickManagerLog) << this;
 
-    _joystickCheckTimer.setInterval(kTimerInterval);
+    _joystickCheckTimer.setInterval(1000);
     _joystickCheckTimer.setSingleShot(false);
     (void) connect(&_joystickCheckTimer, &QTimer::timeout, this, &JoystickManager::_updateAvailableJoysticks);
 }
diff --git a/src/Joystick/JoystickManager.h b/src/Joystick/JoystickManager.h
index 640d2c20f36b..e1cf4e78929f 100644
--- a/src/Joystick/JoystickManager.h
+++ b/src/Joystick/JoystickManager.h
@@ -67,7 +67,6 @@ private slots:
     int _joystickCheckTimerCounter = 0;
     QTimer _joystickCheckTimer;
 
-    static constexpr int kTimerInterval = 1000;
     static constexpr int kTimeout = 1000;
     static constexpr const char *_settingsGroup = "JoystickManager";
     static constexpr const char *_settingsKeyActiveJoystick = "ActiveJoystick";
diff --git a/src/Joystick/JoystickSDL.cc b/src/Joystick/JoystickSDL.cc
index 1bc39e7946fe..7b742f411012 100644
--- a/src/Joystick/JoystickSDL.cc
+++ b/src/Joystick/JoystickSDL.cc
@@ -16,10 +16,12 @@
 
 #include <SDL3/SDL.h>
 
-QGC_LOGGING_CATEGORY(JoystickSDLLog, "qgc.joystick.joysticksdl")
+QGC_LOGGING_CATEGORY(JoystickSDLLog, "Joystick.joysticksdl")
 
-JoystickSDL::JoystickSDL(const QString &name, int axisCount, int buttonCount, int hatCount, int instanceId, bool isGamepad, QObject *parent)
-    : Joystick(name, axisCount, buttonCount, hatCount, parent)
+JoystickSDL::JoystickSDL(const QString &name, QList<int> gamepadAxes, QList<int> nonGamepadAxes, int buttonCount, int hatCount, int instanceId, bool isGamepad, QObject *parent)
+    : Joystick(name, gamepadAxes.length() + nonGamepadAxes.length(), buttonCount, hatCount, parent)
+    , _gamepadAxes(gamepadAxes)
+    , _nonGamepadAxes(nonGamepadAxes)
     , _isGamepad(isGamepad)
     , _instanceId(instanceId)
 {
@@ -75,13 +77,57 @@ QMap<QString, Joystick*> JoystickSDL::discover()
             continue;
         }
 
+        QList<int> gamepadAxes;
+        QSet<int> joyAxesMappedToGamepad;
+
+        if (SDL_IsGamepad(jid)) {
+            auto tmpGamepad = SDL_OpenGamepad(jid);
+            if (!tmpGamepad) {
+                qCWarning(JoystickSDLLog) << "Failed to open gamepad" << jid << SDL_GetError();
+                continue;
+            }
+
+            // Determine if this gamepad axis is one we should show to the user
+            for (int i = 0; i < SDL_GAMEPAD_AXIS_COUNT; i++) {
+                if (SDL_GamepadHasAxis(tmpGamepad, static_cast<SDL_GamepadAxis>(i))) {
+                    gamepadAxes.append(i);
+                }
+            }
+
+            // If a sdlJoystick axis is mapped to a sdlGamepad axis, then the axis is represented
+            // by both the sdlJoystick interface and the sdlGamepad interface. If this is the case,
+            // We'll only show the sdlGamepad interface version of the axis to the user.
+            int count = 0;
+            SDL_GamepadBinding **bindings = SDL_GetGamepadBindings(tmpGamepad, &count);
+            if (bindings) {
+                for (int i = 0; i < count; ++i) {
+                    SDL_GamepadBinding *binding = bindings[i];
+                    if (binding && binding->input_type == SDL_GAMEPAD_BINDTYPE_AXIS && binding->output_type == SDL_GAMEPAD_BINDTYPE_AXIS) {
+                        joyAxesMappedToGamepad.insert(binding->input.axis.axis);
+                    }
+                }
+                SDL_free(bindings);
+            } else {
+                qCWarning(JoystickSDLLog) << "Failed to get bindings for" << name << "error:" << SDL_GetError();
+            }
+
+            SDL_CloseGamepad(tmpGamepad);
+        }
+
         SDL_Joystick *tmpJoy = SDL_OpenJoystick(jid);
         if (!tmpJoy) {
             qCWarning(JoystickSDLLog) << "Failed to open joystick" << jid << SDL_GetError();
             continue;
         }
 
+        QList<int> nonGamepadAxes;
         const int axisCount = SDL_GetNumJoystickAxes(tmpJoy);
+        for (int i = 0; i < axisCount; i++) {
+            if (!joyAxesMappedToGamepad.contains(i)) {
+                nonGamepadAxes.append(i);
+            }
+        }
+
         const int buttonCount = SDL_GetNumJoystickButtons(tmpJoy);
         const int hatCount = SDL_GetNumJoystickHats(tmpJoy);
         SDL_CloseJoystick(tmpJoy);
@@ -95,7 +141,8 @@ QMap<QString, Joystick*> JoystickSDL::discover()
         }
 
         current[name] = new JoystickSDL(name,
-                                        qMax(0, axisCount),
+                                        gamepadAxes,
+                                        nonGamepadAxes,
                                         qMax(0, buttonCount),
                                         qMax(0, hatCount),
                                         jid,
@@ -162,15 +209,17 @@ bool JoystickSDL::_update()
 
 bool JoystickSDL::_getButton(int idx) const
 {
-    int button = -1;
+    // First try the standardized gamepad set if idx is inside that set
+    if (_sdlGamepad && (idx >= 0) && (idx < SDL_GAMEPAD_BUTTON_COUNT)) {
+        return SDL_GetGamepadButton(_sdlGamepad, static_cast<SDL_GamepadButton>(idx));
+    }
 
-    if (_isGamepad) {
-        button = SDL_GetGamepadButton(_sdlGamepad, static_cast<SDL_GamepadButton>(idx));
-    } else {
-        button = SDL_GetJoystickButton(_sdlJoystick, idx);
+    // Fall back to raw joystick buttons (covers unmapped/extras)
+    if (_sdlJoystick && (idx >= 0) && (idx < SDL_GetNumJoystickButtons(_sdlJoystick))) {
+        return SDL_GetJoystickButton(_sdlJoystick, idx);
     }
 
-    return (button == 1);
+    return false;
 }
 
 int JoystickSDL::_getAxis(int idx) const
@@ -178,7 +227,12 @@ int JoystickSDL::_getAxis(int idx) const
     int axis = -1;
 
     if (_isGamepad) {
-        axis = SDL_GetGamepadAxis(_sdlGamepad, static_cast<SDL_GamepadAxis>(idx));
+        if (idx < _gamepadAxes.length()) {
+            axis = SDL_GetGamepadAxis(_sdlGamepad, static_cast<SDL_GamepadAxis>(_gamepadAxes[idx]));
+        }
+        else {
+            axis = SDL_GetJoystickAxis(_sdlJoystick, _nonGamepadAxes[idx - _gamepadAxes.length()]);
+        }
     } else {
         axis = SDL_GetJoystickAxis(_sdlJoystick, idx);
     }
diff --git a/src/Joystick/JoystickSDL.h b/src/Joystick/JoystickSDL.h
index 6a2215deef6c..526e0280c57a 100644
--- a/src/Joystick/JoystickSDL.h
+++ b/src/Joystick/JoystickSDL.h
@@ -24,7 +24,7 @@ Q_DECLARE_LOGGING_CATEGORY(JoystickSDLLog)
 class JoystickSDL : public Joystick
 {
 public:
-    explicit JoystickSDL(const QString &name, int axisCount, int buttonCount, int hatCount, int instanceId, bool isGamepad, QObject *parent = nullptr);
+    explicit JoystickSDL(const QString &name, QList<int> gamepadAxes, QList<int> nonGamepadAxes, int buttonCount, int hatCount, int instanceId, bool isGamepad, QObject *parent = nullptr);
     ~JoystickSDL() override;
 
     int instanceId() const { return _instanceId; }
@@ -46,6 +46,8 @@ class JoystickSDL : public Joystick
 
     static void _loadGamepadMappings();
 
+    QList<int> _gamepadAxes;
+    QList<int> _nonGamepadAxes;
     bool _isGamepad = false;
     int _instanceId = -1;
 
diff --git a/src/MAVLink/CMakeLists.txt b/src/MAVLink/CMakeLists.txt
index 15e37b0411fc..c31b7b55196d 100644
--- a/src/MAVLink/CMakeLists.txt
+++ b/src/MAVLink/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# MAVLink Module
+# MAVLink protocol implementation and communication handling
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ImageProtocolManager.cc
@@ -19,37 +24,31 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-#===========================================================================#
-
-message(STATUS "Building MAVLink")
+# ============================================================================
+# MAVLink Protocol Library Integration
+# ============================================================================
 
-# TODO:
-# CPMAddPackage(
-#     NAME mavlink
-#     GITHUB_REPOSITORY ${QGC_MAVLINK_GIT_REPO}
-#     GIT_TAG ${QGC_MAVLINK_GIT_TAG}
-#     OPTIONS
-#         "MAVLINK_DIALECT all"
-#         "MAVLINK_VERSION 2.0"
-# )
+message(STATUS "QGC: Building MAVLink")
 
 CPMAddPackage(
     NAME mavlink
     GIT_REPOSITORY ${QGC_MAVLINK_GIT_REPO}
     GIT_TAG ${QGC_MAVLINK_GIT_TAG}
+    OPTIONS
+        "MAVLINK_DIALECT ${QGC_MAVLINK_DIALECT}"
+        "MAVLINK_VERSION ${QGC_MAVLINK_VERSION}"
 )
 
-# For QGC all dialects means common and development. Though use of development mavlink code should be restricted to debug builds only.
-target_include_directories(${CMAKE_PROJECT_NAME}
-    PRIVATE
-        ${mavlink_SOURCE_DIR}
-        ${mavlink_SOURCE_DIR}/all
-        ${mavlink_SOURCE_DIR}/common
-        ${mavlink_SOURCE_DIR}/development
-)
-
-# if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-#   target_compile_options(comm PRIVATE -Wno-address-of-packed-member)
-# endif()
-
+if(mavlink_ADDED)
+    add_dependencies(${CMAKE_PROJECT_NAME} mavlink)
+    target_include_directories(${CMAKE_PROJECT_NAME}
+        PRIVATE
+            ${mavlink_BINARY_DIR}/include/mavlink
+            ${mavlink_BINARY_DIR}/include/mavlink/${QGC_MAVLINK_DIALECT}
+    )
+endif()
+
+# ----------------------------------------------------------------------------
+# LibEvents - MAVLink event handling
+# ----------------------------------------------------------------------------
 add_subdirectory(LibEvents)
diff --git a/src/MAVLink/ImageProtocolManager.cc b/src/MAVLink/ImageProtocolManager.cc
index 08f700139c16..ae835913a014 100644
--- a/src/MAVLink/ImageProtocolManager.cc
+++ b/src/MAVLink/ImageProtocolManager.cc
@@ -10,7 +10,7 @@
 #include "ImageProtocolManager.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(ImageProtocolManagerLog, "qgc.mavlink.imageprotocolmanager")
+QGC_LOGGING_CATEGORY(ImageProtocolManagerLog, "MAVLink.ImageProtocolManager")
 
 ImageProtocolManager::ImageProtocolManager(QObject *parent)
     : QObject(parent)
diff --git a/src/MAVLink/LibEvents/CMakeLists.txt b/src/MAVLink/LibEvents/CMakeLists.txt
index 35554453bc85..96d8dfefae26 100644
--- a/src/MAVLink/LibEvents/CMakeLists.txt
+++ b/src/MAVLink/LibEvents/CMakeLists.txt
@@ -1,22 +1,29 @@
-target_sources(${CMAKE_PROJECT_NAME}
-    PRIVATE
-        EventHandler.cc
-        EventHandler.h
-        HealthAndArmingCheckReport.cc
-        HealthAndArmingCheckReport.h
-        logging.cpp
-)
-
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-#===========================================================================#
-
-CPMAddPackage(
-    NAME libevents
-    GITHUB_REPOSITORY mavlink/libevents
-    GIT_TAG main
-    SOURCE_SUBDIR libs/cpp
-)
-
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE libevents)
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${libevents_SOURCE_DIR}/libs/cpp)
+# ============================================================================
+# LibEvents - MAVLink Event Handling
+# Event logging, health reporting, and arming checks
+# ============================================================================
+
+target_sources(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        EventHandler.cc
+        EventHandler.h
+        HealthAndArmingCheckReport.cc
+        HealthAndArmingCheckReport.h
+        logging.cpp
+)
+
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+# ============================================================================
+# LibEvents Library Integration
+# ============================================================================
+
+CPMAddPackage(
+    NAME libevents
+    GITHUB_REPOSITORY mavlink/libevents
+    GIT_TAG main
+    SOURCE_SUBDIR libs/cpp
+)
+
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE libevents)
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${libevents_SOURCE_DIR}/libs/cpp)
diff --git a/src/MAVLink/LibEvents/HealthAndArmingCheckReport.h b/src/MAVLink/LibEvents/HealthAndArmingCheckReport.h
index 0620777c93b9..193e893a9fdf 100644
--- a/src/MAVLink/LibEvents/HealthAndArmingCheckReport.h
+++ b/src/MAVLink/LibEvents/HealthAndArmingCheckReport.h
@@ -92,4 +92,3 @@ class HealthAndArmingCheckReport : public QObject
 
     QmlObjectListModel* _problemsForCurrentMode = nullptr; ///< list of HealthAndArmingCheckProblem*
 };
-
diff --git a/src/MAVLink/LibEvents/logging.cpp b/src/MAVLink/LibEvents/logging.cpp
index 5e074fde7dfc..885548fd8a41 100644
--- a/src/MAVLink/LibEvents/logging.cpp
+++ b/src/MAVLink/LibEvents/logging.cpp
@@ -11,7 +11,7 @@
 
 #include "libevents_includes.h"
 
-QGC_LOGGING_CATEGORY(EventsLog, "EventsLog");
+QGC_LOGGING_CATEGORY(EventsLog, "API.Events")
 
 void qgc_events_parser_debug_printf(const char *fmt, ...) {
     char msg[256];
@@ -23,4 +23,4 @@ void qgc_events_parser_debug_printf(const char *fmt, ...) {
     int len = strlen(msg);
     if (len > 0) msg[len-1] = '\0'; // remove newline
     qCDebug(EventsLog) << msg;
-}
\ No newline at end of file
+}
diff --git a/src/MAVLink/MAVLinkFTP.cc b/src/MAVLink/MAVLinkFTP.cc
index 306da0a64d0d..ba56a8a5f92a 100644
--- a/src/MAVLink/MAVLinkFTP.cc
+++ b/src/MAVLink/MAVLinkFTP.cc
@@ -82,4 +82,3 @@ QString MavlinkFTP::errorCodeToString(ErrorCode_t errorCode)
 
     return "Unknown Error";
 }
-
diff --git a/src/MAVLink/MAVLinkStreamConfig.cc b/src/MAVLink/MAVLinkStreamConfig.cc
index 79a64fa8f62a..f585afa7d71b 100644
--- a/src/MAVLink/MAVLinkStreamConfig.cc
+++ b/src/MAVLink/MAVLinkStreamConfig.cc
@@ -11,7 +11,7 @@
 #include "MAVLinkLib.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MAVLinkStreamConfigLog, "qgc.mavlink.mavlinkstreamconfig")
+QGC_LOGGING_CATEGORY(MAVLinkStreamConfigLog, "MAVLink.MAVLinkStreamConfig")
 
 MAVLinkStreamConfig::MAVLinkStreamConfig(const SetMessageIntervalCb &messageIntervalCb)
     : _messageIntervalCb(messageIntervalCb)
diff --git a/src/MAVLink/QGCMAVLink.cc b/src/MAVLink/QGCMAVLink.cc
index 1863cd7b55a6..df9e91d075d7 100644
--- a/src/MAVLink/QGCMAVLink.cc
+++ b/src/MAVLink/QGCMAVLink.cc
@@ -10,9 +10,11 @@
 #include "QGCMAVLink.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(QGCMAVLinkLog, "qgc.mavlink.qgcmavlink")
+QGC_LOGGING_CATEGORY(QGCMAVLinkLog, "MAVLink.QGCMAVLink")
 
 const QHash<int, QString> QGCMAVLink::mavlinkCompIdHash {
+    { MAV_COMP_ID_AUTOPILOT1, "Autopilot" },
+    { MAV_COMP_ID_ONBOARD_COMPUTER, "Onboard Computer" },
     { MAV_COMP_ID_CAMERA,   "Camera1" },
     { MAV_COMP_ID_CAMERA2,  "Camera2" },
     { MAV_COMP_ID_CAMERA3,  "Camera3" },
@@ -76,7 +78,7 @@ QGCMAVLink::QGCMAVLink(QObject *parent)
    (void) qRegisterMetaType<mavlink_message_t>("mavlink_message_t");
    (void) qRegisterMetaType<MAV_TYPE>("MAV_TYPE");
    (void) qRegisterMetaType<MAV_AUTOPILOT>("MAV_AUTOPILOT");
-   (void) qRegisterMetaType<GRIPPER_ACTIONS>("GRIPPER_ACTIONS");
+   (void) qRegisterMetaType<QGCMAVLink::GripperActions>("QGCMAVLink::GripperActions");
 }
 
 QGCMAVLink::~QGCMAVLink()
@@ -134,6 +136,18 @@ QString QGCMAVLink::firmwareClassToString(FirmwareClass_t firmwareClass)
     }
 }
 
+MAV_AUTOPILOT QGCMAVLink::firmwareTypeFromString(const QString &firmwareTypeStr)
+{
+    const QString type = firmwareTypeStr.trimmed();
+    if (type == QLatin1String("ArduPilot")) {
+        return MAV_AUTOPILOT_ARDUPILOTMEGA;
+    }
+    if (type == QLatin1String("PX4 Pro")) {
+        return MAV_AUTOPILOT_PX4;
+    }
+    return MAV_AUTOPILOT_GENERIC;
+}
+
 bool QGCMAVLink::isAirship(MAV_TYPE mavType)
 {
     return vehicleClass(mavType) == VehicleClassAirship;
@@ -149,6 +163,11 @@ bool QGCMAVLink::isRoverBoat(MAV_TYPE mavType)
     return vehicleClass(mavType) == VehicleClassRoverBoat;
 }
 
+bool QGCMAVLink::isSpacecraft(MAV_TYPE mavType)
+{
+    return vehicleClass(mavType) == VehicleClassSpacecraft;
+}
+
 bool QGCMAVLink::isSub(MAV_TYPE mavType)
 {
     return vehicleClass(mavType) == VehicleClassSub;
@@ -172,6 +191,8 @@ QGCMAVLink::VehicleClass_t QGCMAVLink::vehicleClass(MAV_TYPE mavType)
         return VehicleClassRoverBoat;
     case MAV_TYPE_SUBMARINE:
         return VehicleClassSub;
+    case MAV_TYPE_SPACECRAFT_ORBITER:
+        return VehicleClassSpacecraft;
     case MAV_TYPE_QUADROTOR:
     case MAV_TYPE_COAXIAL:
     case MAV_TYPE_HELICOPTER:
@@ -207,6 +228,8 @@ QString QGCMAVLink::vehicleClassToUserVisibleString(VehicleClass_t vehicleClass)
         return QT_TRANSLATE_NOOP("Vehicle Class", "Rover-Boat");
     case VehicleClassSub:
         return QT_TRANSLATE_NOOP("Vehicle Class", "Sub");
+    case VehicleClassSpacecraft:
+        return QT_TRANSLATE_NOOP("Vehicle Class", "Spacecraft");
     case VehicleClassMultiRotor:
         return QT_TRANSLATE_NOOP("Vehicle Class", "Multi-Rotor");
     case VehicleClassVTOL:
@@ -218,6 +241,24 @@ QString QGCMAVLink::vehicleClassToUserVisibleString(VehicleClass_t vehicleClass)
     }
 }
 
+MAV_TYPE QGCMAVLink::vehicleTypeFromString(const QString &vehicleStr)
+{
+    const QString type = vehicleStr.trimmed();
+    if (type == QLatin1String("Multi-Rotor")) {
+        return MAV_TYPE_QUADROTOR;
+    }
+    if (type == QLatin1String("Fixed Wing")) {
+        return MAV_TYPE_FIXED_WING;
+    }
+    if (type == QLatin1String("Rover")) {
+        return MAV_TYPE_GROUND_ROVER;
+    }
+    if (type == QLatin1String("Sub")) {
+        return MAV_TYPE_SUBMARINE;
+    }
+    return MAV_TYPE_GENERIC;
+}
+
 QString QGCMAVLink::vehicleClassToInternalString(VehicleClass_t vehicleClass)
 {
     switch (vehicleClass) {
@@ -229,6 +270,8 @@ QString QGCMAVLink::vehicleClassToInternalString(VehicleClass_t vehicleClass)
         return QStringLiteral("RoverBoat");
     case VehicleClassSub:
         return QStringLiteral("Sub");
+    case VehicleClassSpacecraft:
+        return QStringLiteral("Spacecraft");
     case VehicleClassMultiRotor:
         return QStringLiteral("MultiRotor");
     case VehicleClassVTOL:
@@ -240,7 +283,7 @@ QString QGCMAVLink::vehicleClassToInternalString(VehicleClass_t vehicleClass)
     }
 }
 
-QString QGCMAVLink::mavResultToString(MAV_RESULT result)
+QString QGCMAVLink::mavResultToString(uint8_t result)
 {
     switch (result) {
     case MAV_RESULT_ACCEPTED:
@@ -328,6 +371,7 @@ QString QGCMAVLink::mavTypeToString(MAV_TYPE mavType) {
         { MAV_TYPE_GROUND_ROVER,    tr("Ground rover")},
         { MAV_TYPE_SURFACE_BOAT,    tr("Surface vessel, boat, ship")},
         { MAV_TYPE_SUBMARINE,       tr("Submarine")},
+        { MAV_TYPE_SPACECRAFT_ORBITER, tr("Spacecraft, orbiter")},
         { MAV_TYPE_HEXAROTOR,       tr("Hexarotor")},
         { MAV_TYPE_OCTOROTOR,       tr("Octorotor")},
         { MAV_TYPE_TRICOPTER,       tr("trirotor")},
@@ -365,6 +409,24 @@ QString QGCMAVLink::firmwareVersionTypeToString(FIRMWARE_VERSION_TYPE firmwareVe
     }
 }
 
+FIRMWARE_VERSION_TYPE QGCMAVLink::firmwareVersionTypeFromString(const QString &typeStr)
+{
+    const QString type = typeStr.trimmed();
+    if (type == QLatin1String("dev")) {
+        return FIRMWARE_VERSION_TYPE_DEV;
+    }
+    if (type == QLatin1String("alpha")) {
+        return FIRMWARE_VERSION_TYPE_ALPHA;
+    }
+    if (type == QLatin1String("beta")) {
+        return FIRMWARE_VERSION_TYPE_BETA;
+    }
+    if (type == QLatin1String("rc")) {
+        return FIRMWARE_VERSION_TYPE_RC;
+    }
+    return FIRMWARE_VERSION_TYPE_OFFICIAL;
+}
+
 int QGCMAVLink::motorCount(MAV_TYPE mavType, uint8_t frameType)
 {
     switch (mavType) {
@@ -419,6 +481,8 @@ int QGCMAVLink::motorCount(MAV_TYPE mavType, uint8_t frameType)
             return -1;
         }
     }
+    case MAV_TYPE_SPACECRAFT_ORBITER:
+        return 8;
 
     default:
         return -1;
@@ -453,3 +517,16 @@ uint32_t QGCMAVLink::highLatencyFailuresToMavSysStatus(mavlink_high_latency2_t&
 
     return onboardControlSensorsEnabled;
 }
+
+QString QGCMAVLink::compIdToString(uint8_t compId)
+{
+    QString compIdStr;
+
+    if (mavlinkCompIdHash.contains(compId)) {
+        compIdStr = mavlinkCompIdHash.value(compId);
+    } else {
+        compIdStr = QStringLiteral("Unknown");
+    }
+
+    return QStringLiteral("%1 (%2)").arg(compIdStr).arg(static_cast<int>(compId));
+}
diff --git a/src/MAVLink/QGCMAVLink.h b/src/MAVLink/QGCMAVLink.h
index d12ccf3727ea..58d39f7da10b 100644
--- a/src/MAVLink/QGCMAVLink.h
+++ b/src/MAVLink/QGCMAVLink.h
@@ -44,6 +44,7 @@ class QGCMAVLink : public QObject
     static constexpr const VehicleClass_t VehicleClassFixedWing   = MAV_TYPE_FIXED_WING;
     static constexpr const VehicleClass_t VehicleClassRoverBoat   = MAV_TYPE_GROUND_ROVER;
     static constexpr const VehicleClass_t VehicleClassSub         = MAV_TYPE_SUBMARINE;
+    static constexpr const VehicleClass_t VehicleClassSpacecraft  = MAV_TYPE_SPACECRAFT_ORBITER;
     static constexpr const VehicleClass_t VehicleClassMultiRotor  = MAV_TYPE_QUADROTOR;
     static constexpr const VehicleClass_t VehicleClassVTOL        = MAV_TYPE_VTOL_TAILSITTER_QUADROTOR;
     static constexpr const VehicleClass_t VehicleClassGeneric     = MAV_TYPE_GENERIC;
@@ -56,26 +57,32 @@ class QGCMAVLink : public QObject
     static FirmwareClass_t          firmwareClass               (MAV_AUTOPILOT autopilot);
     static MAV_AUTOPILOT            firmwareClassToAutopilot    (FirmwareClass_t firmwareClass) { return static_cast<MAV_AUTOPILOT>(firmwareClass); }
     static QString                  firmwareClassToString       (FirmwareClass_t firmwareClass);
-    static QList<FirmwareClass_t>   allFirmwareClasses          (void);
+    static MAV_AUTOPILOT            firmwareTypeFromString      (const QString &firmwareTypeStr);
+    static QList<FirmwareClass_t>   allFirmwareClasses          ();
 
     static bool                     isAirship                   (MAV_TYPE mavType);
     static bool                     isFixedWing                 (MAV_TYPE mavType);
     static bool                     isRoverBoat                 (MAV_TYPE mavType);
     static bool                     isSub                       (MAV_TYPE mavType);
+    static bool                     isSpacecraft                (MAV_TYPE mavType);
     static bool                     isMultiRotor                (MAV_TYPE mavType);
     static bool                     isVTOL                      (MAV_TYPE mavType);
     static VehicleClass_t           vehicleClass                (MAV_TYPE mavType);
     static MAV_TYPE                 vehicleClassToMavType       (VehicleClass_t vehicleClass) { return static_cast<MAV_TYPE>(vehicleClass); }
     static QString                  vehicleClassToUserVisibleString(VehicleClass_t vehicleClass);
     static QString                  vehicleClassToInternalString(VehicleClass_t vehicleClass);
+    static MAV_TYPE                 vehicleTypeFromString(const QString &vehicleStr);
     static QList<VehicleClass_t>    allVehicleClasses           (void);
 
-    static QString                  mavResultToString           (MAV_RESULT result);
+    static QString                  mavResultToString           (uint8_t result);
+    static QString                  mavResultToString           (MAV_RESULT result) { return mavResultToString(static_cast<uint8_t>(result)); }
     static QString                  mavSysStatusSensorToString  (MAV_SYS_STATUS_SENSOR sysStatusSensor);
     static QString                  mavTypeToString             (MAV_TYPE mavType);
     static QString                  firmwareVersionTypeToString (FIRMWARE_VERSION_TYPE firmwareVersionType);
+    static FIRMWARE_VERSION_TYPE    firmwareVersionTypeFromString(const QString &typeStr);
     static int                      motorCount                  (MAV_TYPE mavType, uint8_t frameType = 0);
     static uint32_t                 highLatencyFailuresToMavSysStatus(mavlink_high_latency2_t& highLatency2);
+    static QString                  compIdToString              (uint8_t compId);
 
     // Expose mavlink enums to Qml. I've tried various way to make this work without duping, but haven't found anything that works.
 
@@ -132,12 +139,13 @@ class QGCMAVLink : public QObject
     };
     Q_ENUM(MavlinkSysStatus)
 
-    enum GRIPPER_OPTIONS {
-        Gripper_release = GRIPPER_ACTION_RELEASE,
-        Gripper_grab    = GRIPPER_ACTION_GRAB,
-        Invalid_option  = GRIPPER_ACTIONS_ENUM_END,
+    enum GripperActions {
+        GripperActionOpen     = GRIPPER_ACTION_OPEN,
+        GripperActionClose    = GRIPPER_ACTION_CLOSE,
+        GripperActionStop     = GRIPPER_ACTION_STOP,
+        GripperOptionInvalid  = GRIPPER_ACTIONS_ENUM_END,
     };
-    Q_ENUM(GRIPPER_OPTIONS)
+    Q_ENUM(GripperActions)
 
     enum CalibrationType {
         CalibrationNone,
@@ -182,4 +190,4 @@ class QGCMAVLink : public QObject
 
     static const QHash<int, QString> mavlinkCompIdHash;
 };
-Q_DECLARE_METATYPE(GRIPPER_ACTIONS)
+Q_DECLARE_METATYPE(QGCMAVLink::GripperActions)
diff --git a/src/MAVLink/StatusTextHandler.cc b/src/MAVLink/StatusTextHandler.cc
index 1ba99dbe638e..8044c38e4d0d 100644
--- a/src/MAVLink/StatusTextHandler.cc
+++ b/src/MAVLink/StatusTextHandler.cc
@@ -13,7 +13,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QDateTime>
 
-QGC_LOGGING_CATEGORY(StatusTextHandlerLog, "qgc.mavlink.statustexthandler")
+QGC_LOGGING_CATEGORY(StatusTextHandlerLog, "MAVLink.StatusTextHandler")
 
 StatusText::StatusText(MAV_COMPONENT componentid, MAV_SEVERITY severity, const QString &text)
     : m_compId(componentid)
@@ -57,17 +57,17 @@ StatusTextHandler::~StatusTextHandler()
 
 QString StatusTextHandler::getMessageText(const mavlink_message_t &message)
 {
-    QByteArray b;
+    // Warning: There is a bug in mavlink which causes mavlink_msg_statustext_get_text to work incorrect.
+    // It ends up copying crap off the end of the buffer, so don't use it for now.
 
-    b.resize(MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN + 1);
-    (void) mavlink_msg_statustext_get_text(&message, b.data());
+    mavlink_statustext_t statusText;
+    mavlink_msg_statustext_decode(&message, &statusText);
 
-    // Ensure NUL-termination
-    b[b.length()-1] = '\0';
+    char buffer[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN + 1];
+    memcpy(buffer, statusText.text, MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN);
+    buffer[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN] = '\0';
 
-    const QString text = QString::fromLocal8Bit(b.constData(), std::strlen(b.constData()));
-
-    return text;
+    return QString(buffer);
 }
 
 QString StatusTextHandler::formattedMessages() const
diff --git a/src/MAVLink/SysStatusSensorInfo.cc b/src/MAVLink/SysStatusSensorInfo.cc
index 2b7499c47d06..45153058c1ef 100644
--- a/src/MAVLink/SysStatusSensorInfo.cc
+++ b/src/MAVLink/SysStatusSensorInfo.cc
@@ -11,7 +11,7 @@
 #include "QGCLoggingCategory.h"
 #include "QGCMAVLink.h"
 
-QGC_LOGGING_CATEGORY(SysStatusSensorInfoLog, "qgc.mavlink.sysstatussensorinfo")
+QGC_LOGGING_CATEGORY(SysStatusSensorInfoLog, "MAVLink.SysStatusSensorInfo")
 
 SysStatusSensorInfo::SysStatusSensorInfo(QObject *parent)
     : QObject(parent)
diff --git a/src/MissionManager/BlankPlanCreator.h b/src/MissionManager/BlankPlanCreator.h
index 7d1701d710b0..9b5d0c8cce7f 100644
--- a/src/MissionManager/BlankPlanCreator.h
+++ b/src/MissionManager/BlankPlanCreator.h
@@ -14,7 +14,7 @@
 class BlankPlanCreator : public PlanCreator
 {
     Q_OBJECT
-    
+
 public:
     BlankPlanCreator(PlanMasterController* planMasterController, QObject* parent = nullptr);
 
diff --git a/src/MissionManager/CMakeLists.txt b/src/MissionManager/CMakeLists.txt
index 8c90c9955c34..3a86a95c481b 100644
--- a/src/MissionManager/CMakeLists.txt
+++ b/src/MissionManager/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Mission Manager Module
+# Handles mission planning, geofences, rally points, and survey patterns
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         BlankPlanCreator.cc
@@ -75,7 +80,9 @@ target_sources(${CMAKE_PROJECT_NAME}
         VTOLLandingComplexItem.h
 )
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# Mission Definition JSON Resources
+# ----------------------------------------------------------------------------
 file(GLOB_RECURSE JSON_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.json)
 qt_add_resources(${CMAKE_PROJECT_NAME} json_mission_manager
     PREFIX "/json"
diff --git a/src/MissionManager/CameraSection.cc b/src/MissionManager/CameraSection.cc
index 02323924120b..af147eb6d7e0 100644
--- a/src/MissionManager/CameraSection.cc
+++ b/src/MissionManager/CameraSection.cc
@@ -15,7 +15,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(CameraSectionLog, "CameraSectionLog")
+QGC_LOGGING_CATEGORY(CameraSectionLog, "Plan.CameraSection")
 
 QMap<QString, FactMetaData*> CameraSection::_metaDataMap;
 
diff --git a/src/MissionManager/CameraSection.h b/src/MissionManager/CameraSection.h
index 4188144ae46f..827d816684b8 100644
--- a/src/MissionManager/CameraSection.h
+++ b/src/MissionManager/CameraSection.h
@@ -63,11 +63,9 @@ class CameraSection : public Section
     void setSpecifyGimbal       (bool specifyGimbal);
     void setSpecifyCameraMode   (bool specifyCameraMode);
 
-    ///< Signals specifiedGimbalYawChanged
     ///< @return The gimbal yaw specified by this item, NaN if not specified
     double specifiedGimbalYaw(void) const;
 
-    ///< Signals specifiedGimbalPitchChanged
     ///< @return The gimbal pitch specified by this item, NaN if not specified
     double specifiedGimbalPitch(void) const;
 
diff --git a/src/MissionManager/ComplexMissionItem.cc b/src/MissionManager/ComplexMissionItem.cc
index aa6011135e0c..8a34e163e96e 100644
--- a/src/MissionManager/ComplexMissionItem.cc
+++ b/src/MissionManager/ComplexMissionItem.cc
@@ -144,4 +144,3 @@ void ComplexMissionItem::_segmentTerrainCollisionChanged(bool terrainCollision)
     }
     emit terrainCollisionChanged(_cTerrainCollisionSegments != 0);
 }
-
diff --git a/src/MissionManager/CorridorScanComplexItem.cc b/src/MissionManager/CorridorScanComplexItem.cc
index 44267774fbf6..55f0eb2e4a18 100644
--- a/src/MissionManager/CorridorScanComplexItem.cc
+++ b/src/MissionManager/CorridorScanComplexItem.cc
@@ -17,13 +17,13 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(CorridorScanComplexItemLog, "CorridorScanComplexItemLog")
+QGC_LOGGING_CATEGORY(CorridorScanComplexItemLog, "Plan.CorridorScanComplexItemL")
 
 const QString CorridorScanComplexItem::name(CorridorScanComplexItem::tr("Corridor Scan"));
 
 CorridorScanComplexItem::CorridorScanComplexItem(PlanMasterController* masterController, bool flyView, const QString& kmlOrShpFile)
     : TransectStyleComplexItem  (masterController, flyView, settingsGroup)
-    , _entryPoint               (0)
+    , _entryPointLocation       (EntryPointDefaultOrder)
     , _metaDataMap              (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/CorridorScan.SettingsGroup.json"), this))
     , _corridorWidthFact        (settingsGroup, _metaDataMap[corridorWidthName])
 {
@@ -76,7 +76,7 @@ void CorridorScanComplexItem::_saveCommon(QJsonObject& saveObject)
     saveObject[VisualMissionItem::jsonTypeKey] =                VisualMissionItem::jsonTypeComplexItemValue;
     saveObject[ComplexMissionItem::jsonComplexItemTypeKey] =    jsonComplexItemTypeValue;
     saveObject[corridorWidthName] =                             _corridorWidthFact.rawValue().toDouble();
-    saveObject[_jsonEntryPointKey] =                            _entryPoint;
+    saveObject[_jsonEntryPointKey] =                            static_cast<int>(_entryPointLocation);
 
     _corridorPolyline.saveToJson(saveObject);
 }
@@ -140,7 +140,7 @@ bool CorridorScanComplexItem::_loadWorker(const QJsonObject& complexObject, int
 
     _corridorWidthFact.setRawValue(complexObject[corridorWidthName].toDouble());
 
-    _entryPoint = complexObject[_jsonEntryPointKey].toInt();
+    _entryPointLocation = static_cast<EntryPointLocation>(complexObject[_jsonEntryPointKey].toInt());
 
     _ignoreRecalc = false;
 
@@ -178,11 +178,21 @@ void CorridorScanComplexItem::_polylineDirtyChanged(bool dirty)
 
 void CorridorScanComplexItem::rotateEntryPoint(void)
 {
-    _entryPoint++;
-    if (_entryPoint > 3) {
-        _entryPoint = 0;
+    int modeAsInt = static_cast<int>(_entryPointLocation);
+
+    if (_calcTransectCount() < 2) {
+        // A single transect has no "opposite side of center" so we need to bump by 2 to get to the opposite end of the scan
+        modeAsInt += 2;
+    } else {
+        modeAsInt++;
     }
 
+    if (modeAsInt > EntryPointStartOppositeEndOppositeSide) {
+        modeAsInt = 0;
+    }
+
+    _entryPointLocation = static_cast<EntryPointLocation>(modeAsInt);
+
     _rebuildTransects();
 }
 
@@ -292,20 +302,20 @@ void CorridorScanComplexItem::_rebuildTransectsPhase1(void)
 
         bool reverseTransects = false;
         bool reverseVertices = false;
-        switch (_entryPoint) {
-        case 0:
+        switch (_entryPointLocation) {
+        case EntryPointDefaultOrder:
             reverseTransects = false;
             reverseVertices = false;
             break;
-        case 1:
+        case EntryPointStartSameEndOppositeSide:
             reverseTransects = true;
             reverseVertices = false;
             break;
-        case 2:
+        case EntryPointStartOppositeEndSameSide:
             reverseTransects = false;
             reverseVertices = true;
             break;
-        case 3:
+        case EntryPointStartOppositeEndOppositeSide:
             reverseTransects = true;
             reverseVertices = true;
             break;
@@ -384,11 +394,11 @@ double CorridorScanComplexItem::timeBetweenShots(void)
 double CorridorScanComplexItem::_calcTransectSpacing(void) const
 {
     double transectSpacing = _cameraCalc.adjustedFootprintSide()->rawValue().toDouble();
-    if (transectSpacing < 0.5) {
+    if (transectSpacing < _minimumTransectSpacingMeters) {
         // We can't let spacing get too small otherwise we will end up with too many transects.
-        // So we limit to 0.5 meter spacing as min and set to huge value which will cause a single
-        // transect to be added.
-        transectSpacing = 100000;
+        // So we limit the spacing to be above a small increment and below that value we set to huge spacing
+        // which will cause a single transect to be added instead of having things blow up.
+        transectSpacing = _forceLargeTransectSpacingMeters;
     }
 
     return transectSpacing;
diff --git a/src/MissionManager/CorridorScanComplexItem.h b/src/MissionManager/CorridorScanComplexItem.h
index a0f883d4c397..4f13ddf38349 100644
--- a/src/MissionManager/CorridorScanComplexItem.h
+++ b/src/MissionManager/CorridorScanComplexItem.h
@@ -29,6 +29,16 @@ class CorridorScanComplexItem : public TransectStyleComplexItem
     Q_PROPERTY(QGCMapPolyline*  corridorPolyline    READ corridorPolyline   CONSTANT)
     Q_PROPERTY(Fact*            corridorWidth       READ corridorWidth      CONSTANT)
 
+    // Note1: These values are persisted to plan files so they cannot be changed with breaking plan file back compat
+    // Note2: rotateEntryPoint expects these values in this order
+    enum EntryPointLocation {
+        EntryPointDefaultOrder = 0,                 // Standard transect generation order
+        EntryPointStartSameEndOppositeSide = 1,     // Start at same end, opposite side of center
+        EntryPointStartOppositeEndSameSide = 2,     // Start at opposite end, same side
+        EntryPointStartOppositeEndOppositeSide = 3, // Start at opposite end, opposite side
+    };
+    Q_ENUM(EntryPointLocation)
+
     Fact*           corridorWidth   (void) { return &_corridorWidthFact; }
     QGCMapPolyline* corridorPolyline(void) { return &_corridorPolyline; }
 
@@ -79,7 +89,7 @@ private slots:
     QGCMapPolyline                  _corridorPolyline;
     QList<QList<QGeoCoordinate>>    _transectSegments;      ///< Internal transect segments including grid exit, turnaround and internal camera points
 
-    int                             _entryPoint;
+    EntryPointLocation              _entryPointLocation;
 
     QMap<QString, FactMetaData*>    _metaDataMap;
     SettingsFact                    _corridorWidthFact;
diff --git a/src/MissionManager/CorridorScanPlanCreator.h b/src/MissionManager/CorridorScanPlanCreator.h
index 8b80ec213d36..93bbf8d44a05 100644
--- a/src/MissionManager/CorridorScanPlanCreator.h
+++ b/src/MissionManager/CorridorScanPlanCreator.h
@@ -14,7 +14,7 @@
 class CorridorScanPlanCreator : public PlanCreator
 {
     Q_OBJECT
-    
+
 public:
     CorridorScanPlanCreator(PlanMasterController* planMasterController, QObject* parent = nullptr);
 
diff --git a/src/MissionManager/FixedWingLandingComplexItem.cc b/src/MissionManager/FixedWingLandingComplexItem.cc
index 462c8be2b507..bfc9cfa9e59f 100644
--- a/src/MissionManager/FixedWingLandingComplexItem.cc
+++ b/src/MissionManager/FixedWingLandingComplexItem.cc
@@ -17,7 +17,7 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(FixedWingLandingComplexItemLog, "FixedWingLandingComplexItemLog")
+QGC_LOGGING_CATEGORY(FixedWingLandingComplexItemLog, "Plan.FixedWingLandingComplexItem")
 
 const QString FixedWingLandingComplexItem::name(FixedWingLandingComplexItem::tr("Fixed Wing Landing"));
 
@@ -135,16 +135,6 @@ void FixedWingLandingComplexItem::_calcGlideSlope(void)
     _glideSlopeFact.setRawValue(qRadiansToDegrees(qAtan(landingAltDifference / landingDistance)));
 }
 
-void FixedWingLandingComplexItem::moveLandingPosition(const QGeoCoordinate& coordinate)
-{
-    double savedHeading = landingHeading()->rawValue().toDouble();
-    double savedDistance = landingDistance()->rawValue().toDouble();
-
-    setLandingCoordinate(coordinate);
-    landingHeading()->setRawValue(savedHeading);
-    landingDistance()->setRawValue(savedDistance);
-}
-
 bool FixedWingLandingComplexItem::_isValidLandItem(const MissionItem& missionItem)
 {
     if (missionItem.command() != MAV_CMD_NAV_LAND ||
diff --git a/src/MissionManager/FixedWingLandingComplexItem.h b/src/MissionManager/FixedWingLandingComplexItem.h
index 043f5067ab24..5de926d83b19 100644
--- a/src/MissionManager/FixedWingLandingComplexItem.h
+++ b/src/MissionManager/FixedWingLandingComplexItem.h
@@ -31,8 +31,6 @@ class FixedWingLandingComplexItem : public LandingComplexItem
     Q_PROPERTY(Fact*            valueSetIsDistance      READ    valueSetIsDistance                                          CONSTANT)
     Q_PROPERTY(Fact*            glideSlope              READ    glideSlope                                                  CONSTANT)
 
-    Q_INVOKABLE void moveLandingPosition(const QGeoCoordinate& coordinate); // Maintains the current landing distance and heading
-
     Fact*           glideSlope              (void) { return &_glideSlopeFact; }
     Fact*           valueSetIsDistance      (void) { return &_valueSetIsDistanceFact; }
 
diff --git a/src/MissionManager/GeoFenceController.cc b/src/MissionManager/GeoFenceController.cc
index 9bbcee4fda24..72390503daa7 100644
--- a/src/MissionManager/GeoFenceController.cc
+++ b/src/MissionManager/GeoFenceController.cc
@@ -26,7 +26,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 
-QGC_LOGGING_CATEGORY(GeoFenceControllerLog, "GeoFenceControllerLog")
+QGC_LOGGING_CATEGORY(GeoFenceControllerLog, "PlanManager.GeoFenceController")
 
 QMap<QString, FactMetaData*> GeoFenceController::_metaDataMap;
 
@@ -105,17 +105,11 @@ void GeoFenceController::_managerVehicleChanged(Vehicle* managerVehicle)
     connect(_geoFenceManager, &GeoFenceManager::removeAllComplete,              this, &GeoFenceController::_managerRemoveAllComplete);
     connect(_geoFenceManager, &GeoFenceManager::inProgressChanged,              this, &GeoFenceController::syncInProgressChanged);
 
-    //-- GeoFenceController::supported() tests both the capability bit AND the protocol version.
     (void) connect(_managerVehicle, &Vehicle::capabilityBitsChanged, this, [this](uint64_t capabilityBits) {
         Q_UNUSED(capabilityBits);
         emit supportedChanged(supported());
     });
 
-    (void) connect(_managerVehicle, &Vehicle::requestProtocolVersion, this, [this](unsigned version) {
-        Q_UNUSED(version);
-        emit supportedChanged(supported());
-    });
-
     connect(_managerVehicle->parameterManager(), &ParameterManager::parametersReadyChanged, this, &GeoFenceController::_parametersReady);
     _parametersReady();
 
@@ -225,7 +219,7 @@ void GeoFenceController::save(QJsonObject& json)
 }
 
 void GeoFenceController::removeAll(void)
-{    
+{
     setBreachReturnPoint(QGeoCoordinate());
     _polygons.clearAndDeleteContents();
     _circles.clearAndDeleteContents();
@@ -489,7 +483,7 @@ void GeoFenceController::clearAllInteractive(void)
 
 bool GeoFenceController::supported(void) const
 {
-    return (_managerVehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_FENCE) && (_managerVehicle->maxProtoVersion() >= 200);
+    return _managerVehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_FENCE;
 }
 
 /* Returns the radius of the "paramCircularFence"
diff --git a/src/MissionManager/GeoFenceManager.cc b/src/MissionManager/GeoFenceManager.cc
index 8a46b101c42b..ed60d944f5ff 100644
--- a/src/MissionManager/GeoFenceManager.cc
+++ b/src/MissionManager/GeoFenceManager.cc
@@ -12,7 +12,7 @@
 #include "QmlObjectListModel.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(GeoFenceManagerLog, "GeoFenceManagerLog")
+QGC_LOGGING_CATEGORY(GeoFenceManagerLog, "PlanManager.GeoFenceManager")
 
 GeoFenceManager::GeoFenceManager(Vehicle* vehicle)
     : PlanManager       (vehicle, MAV_MISSION_TYPE_FENCE)
@@ -193,5 +193,5 @@ void GeoFenceManager::_planManagerLoadComplete(bool removeAllRequested)
 
 bool GeoFenceManager::supported(void) const
 {
-    return (_vehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_FENCE) && (_vehicle->maxProtoVersion() >= 200);
+    return _vehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_FENCE;
 }
diff --git a/src/MissionManager/GeoFenceManager.h b/src/MissionManager/GeoFenceManager.h
index 65cbdcb5871c..eac26ba1d45a 100644
--- a/src/MissionManager/GeoFenceManager.h
+++ b/src/MissionManager/GeoFenceManager.h
@@ -27,11 +27,11 @@ Q_DECLARE_LOGGING_CATEGORY(GeoFenceManagerLog)
 class GeoFenceManager : public PlanManager
 {
     Q_OBJECT
-    
+
 public:
     GeoFenceManager(Vehicle* vehicle);
     ~GeoFenceManager();
-    
+
     bool supported(void) const;
 
     /// Signals sendComplete when done
@@ -60,7 +60,7 @@ class GeoFenceManager : public PlanManager
         BadPolygonItemFormat,   ///< Error re-creating polygons from mission items
         InvalidCircleRadius,
     } ErrorCode_t;
-    
+
 signals:
     void loadComplete       (void);
     void inProgressChanged  (bool inProgress);
diff --git a/src/MissionManager/LandingComplexItem.cc b/src/MissionManager/LandingComplexItem.cc
index 1764059157cf..287294e0ea8a 100644
--- a/src/MissionManager/LandingComplexItem.cc
+++ b/src/MissionManager/LandingComplexItem.cc
@@ -22,7 +22,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(LandingComplexItemLog, "LandingComplexItemLog")
+QGC_LOGGING_CATEGORY(LandingComplexItemLog, "Plan.LandingComplexItem")
 
 LandingComplexItem::LandingComplexItem(PlanMasterController* masterController, bool flyView)
     : ComplexMissionItem        (masterController, flyView)
@@ -643,6 +643,19 @@ void LandingComplexItem::_setDirty(void)
     setDirty(true);
 }
 
+void LandingComplexItem::setCoordinate(const QGeoCoordinate& coordinate) {
+    if (!_landingCoordSet) {
+        setLandingCoordinate(coordinate);
+        return;
+    }
+
+    // Move entire complex item, preserving heading and distance
+    _ignoreRecalcSignals = true;
+    setLandingCoordinate(coordinate);
+    _ignoreRecalcSignals = false;
+    _recalcFromHeadingAndDistanceChange();
+}
+
 void LandingComplexItem::setSequenceNumber(int sequenceNumber)
 {
     if (_sequenceNumber != sequenceNumber) {
diff --git a/src/MissionManager/LandingComplexItem.h b/src/MissionManager/LandingComplexItem.h
index 0cc10b27a286..e50dadd8fa33 100644
--- a/src/MissionManager/LandingComplexItem.h
+++ b/src/MissionManager/LandingComplexItem.h
@@ -110,7 +110,7 @@ class LandingComplexItem : public ComplexMissionItem
     ReadyForSaveState   readyForSaveState           (void) const final;
     bool                exitCoordinateSameAsEntry   (void) const final { return false; }
     void                setDirty                    (bool dirty) final;
-    void                setCoordinate               (const QGeoCoordinate& coordinate) final { setFinalApproachCoordinate(coordinate); }
+    void                setCoordinate               (const QGeoCoordinate& coordinate) final;
     void                setSequenceNumber           (int sequenceNumber) final;
     double              amslEntryAlt                (void) const final;
     double              amslExitAlt                 (void) const final;
diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json
index a4dd6f45da14..97c00107180d 100644
--- a/src/MissionManager/MavCmdInfoCommon.json
+++ b/src/MissionManager/MavCmdInfoCommon.json
@@ -300,7 +300,7 @@
                 "default":          0,
                 "decimalPlaces":    0,
                 "min":              0
-            }        
+            }
         },
         { "id": 83, "rawName": "MAV_CMD_NAV_ALTITUDE_WAIT", "friendlyName": "Altitude wait" },
         {
@@ -1066,7 +1066,7 @@
         {
             "id":                   211,
             "rawName":              "MAV_CMD_DO_GRIPPER",
-            "friendlyName":         "Gripper Mechanism",
+            "friendlyName":         "Gripper Action",
             "description":          "Control a gripper mechanism.",
             "specifiesCoordinate":  false,
             "friendlyEdit":         true,
@@ -1145,7 +1145,6 @@
         { "id": 510, "rawName": "MAV_CMD_GET_MESSAGE_INTERVAL", "friendlyName": "Get message interval" },
         { "id": 511, "rawName": "MAV_CMD_SET_MESSAGE_INTERVAL", "friendlyName": "Set message interval" },
         { "id": 512, "rawName": "MAV_CMD_REQUEST_MESSAGE" },
-        { "id": 519, "rawName": "MAV_CMD_REQUEST_PROTOCOL_VERSION" },
         { "id": 520, "rawName": "MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES", "friendlyName": "Get capabilities" },
         {
             "id":           530,
diff --git a/src/MissionManager/MissionCommandList.h b/src/MissionManager/MissionCommandList.h
index f0a60373916d..f3b39b9959fd 100644
--- a/src/MissionManager/MissionCommandList.h
+++ b/src/MissionManager/MissionCommandList.h
@@ -21,7 +21,7 @@ class MissionCommandUIInfo;
 class MissionCommandList : public QObject
 {
     Q_OBJECT
-    
+
 public:
     /// @param baseCommandList true: bottomost level of mission command hierarchy (partial spec allowed), false: override level of hierarchy
     MissionCommandList(const QString& jsonFilename, bool baseCommandList, QObject* parent = nullptr);
@@ -33,7 +33,7 @@ class MissionCommandList : public QObject
     MissionCommandUIInfo* getUIInfo(MAV_CMD command) const;
 
     const QList<MAV_CMD>& commandIds(void) const { return _ids; }
-    
+
     static constexpr const char* qgcFileType = "MavCmdInfo";
 
 private:
diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc
index 1867344d9854..ec7700de0505 100644
--- a/src/MissionManager/MissionCommandTree.cc
+++ b/src/MissionManager/MissionCommandTree.cc
@@ -17,7 +17,7 @@
 
 #include <QtCore/QApplicationStatic>
 
-QGC_LOGGING_CATEGORY(MissionCommandTreeLog, "qgc.missionmanager.missioncommandtree");
+QGC_LOGGING_CATEGORY(MissionCommandTreeLog, "Plan.MissionCommandTree");
 
 Q_APPLICATION_STATIC(MissionCommandTree, _missionCommandTreeInstance);
 
diff --git a/src/MissionManager/MissionCommandUIInfo.cc b/src/MissionManager/MissionCommandUIInfo.cc
index 80359b4e7a5e..84264cea9826 100644
--- a/src/MissionManager/MissionCommandUIInfo.cc
+++ b/src/MissionManager/MissionCommandUIInfo.cc
@@ -12,7 +12,7 @@
 #include "FactMetaData.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MissionCommandsLog, "MissionCommandsLog")
+QGC_LOGGING_CATEGORY(MissionCommandsLog, "Plan.MissionCommands")
 
 MissionCmdParamInfo::MissionCmdParamInfo(QObject* parent)
     : QObject(parent)
diff --git a/src/MissionManager/MissionCommandUIInfo.h b/src/MissionManager/MissionCommandUIInfo.h
index 56cc70de88d1..a862ff78255e 100644
--- a/src/MissionManager/MissionCommandUIInfo.h
+++ b/src/MissionManager/MissionCommandUIInfo.h
@@ -214,9 +214,8 @@ class MissionCommandUIInfo : public QObject {
     static constexpr const char* _commentJsonKey               = "comment";
     static constexpr const char* _advancedCategory             = "Advanced";
 
-    friend class MissionCommandTree;    
+    friend class MissionCommandTree;
 #ifdef QGC_UNITTEST_BUILD
     friend class MissionCommandTreeTest;
 #endif
 };
-
diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc
index b8f9e5ca5530..87579c2e5c7d 100644
--- a/src/MissionManager/MissionController.cc
+++ b/src/MissionManager/MissionController.cc
@@ -38,7 +38,7 @@
 
 #define UPDATE_TIMEOUT 5000 ///< How often we check for bounding box changes
 
-QGC_LOGGING_CATEGORY(MissionControllerLog, "MissionControllerLog")
+QGC_LOGGING_CATEGORY(MissionControllerLog, "PlanManager.MissionController")
 
 MissionController::MissionController(PlanMasterController* masterController, QObject *parent)
     : PlanElementController (masterController, parent)
@@ -195,7 +195,7 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque
         _visualItems = newControllerMissionItems;
         _settingsItem = settingsItem;
 
-        // We set Altitude mode to mixed, otherwise if we need a non relative altitude frame we won't be able to change it 
+        // We set Altitude mode to mixed, otherwise if we need a non relative altitude frame we won't be able to change it
         setGlobalAltitudeMode(QGroundControlQmlGlobal::AltitudeModeMixed);
 
         MissionController::_scanForAdditionalSettings(_visualItems, _masterController);
@@ -966,8 +966,7 @@ bool MissionController::_loadTextMissionFile(QTextStream& stream, QmlObjectListM
                 } else {
                     if (TakeoffMissionItem::isTakeoffCommand(static_cast<MAV_CMD>(item->command()))) {
                         // This needs to be a TakeoffMissionItem
-                        TakeoffMissionItem* takeoffItem = new TakeoffMissionItem(_masterController, _flyView, settingsItem, true /* forLoad */);
-                        takeoffItem->load(stream);
+                        TakeoffMissionItem* takeoffItem = new TakeoffMissionItem(item->missionItem(), _masterController, _flyView, settingsItem, false /* forLoad */);
                         item->deleteLater();
                         item = takeoffItem;
                     }
diff --git a/src/MissionManager/MissionItem.cc b/src/MissionManager/MissionItem.cc
index 7cae70a93c9e..83ad6c6d4d83 100644
--- a/src/MissionManager/MissionItem.cc
+++ b/src/MissionManager/MissionItem.cc
@@ -136,7 +136,7 @@ const MissionItem& MissionItem::operator=(const MissionItem& other)
 }
 
 MissionItem::~MissionItem()
-{    
+{
 
 }
 
@@ -184,7 +184,7 @@ bool MissionItem::_convertJsonV1ToV2(const QJsonObject& json, QJsonObject& v2Jso
     if (json.contains(_jsonParamsKey)) {
         // Already V2 format
         return true;
-    }        
+    }
 
     QList<JsonHelper::KeyValidateInfo> keyInfoList = {
         { VisualMissionItem::jsonTypeKey,   QJsonValue::String, true },
diff --git a/src/MissionManager/MissionItem.h b/src/MissionManager/MissionItem.h
index cb8e74b7a541..d887dae4889e 100644
--- a/src/MissionManager/MissionItem.h
+++ b/src/MissionManager/MissionItem.h
@@ -55,7 +55,7 @@ class MissionItem : public QObject
     ~MissionItem();
 
     const MissionItem& operator=(const MissionItem& other);
-    
+
     MAV_CMD         command         (void) const { return (MAV_CMD)_commandFact.rawValue().toInt(); }
     bool            isCurrentItem   (void) const { return _isCurrentItem; }
     int             sequenceNumber  (void) const { return _sequenceNumber; }
@@ -92,7 +92,7 @@ class MissionItem : public QObject
     void setParam5          (double param5);
     void setParam6          (double param6);
     void setParam7          (double param7);
-    
+
     void save(QJsonObject& json) const;
     bool load(QTextStream &loadStream);
     bool load(const QJsonObject& json, int sequenceNumber, QString& errorString);
@@ -142,7 +142,7 @@ private slots:
     static constexpr const char*  _jsonParam2Key =          "param2";
     static constexpr const char*  _jsonParam3Key =          "param3";
     static constexpr const char*  _jsonParam4Key =          "param4";
-    
+
     // Deprecated V2 format keys
     static constexpr const char*  _jsonCoordinateKey =      "coordinate";
 
diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc
index 0e4e0d0d5bf2..6c660294683b 100644
--- a/src/MissionManager/MissionManager.cc
+++ b/src/MissionManager/MissionManager.cc
@@ -16,7 +16,7 @@
 #include "MissionCommandUIInfo.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MissionManagerLog, "MissionManagerLog")
+QGC_LOGGING_CATEGORY(MissionManagerLog, "PlanManager.MissionManager")
 
 MissionManager::MissionManager(Vehicle* vehicle)
     : PlanManager               (vehicle, MAV_MISSION_TYPE_MISSION)
@@ -258,14 +258,14 @@ void MissionManager::_updateMissionIndex(int index)
     }
 }
 
-void MissionManager::_handleHighLatency(const mavlink_message_t& message) 
+void MissionManager::_handleHighLatency(const mavlink_message_t& message)
 {
     mavlink_high_latency_t highLatency;
     mavlink_msg_high_latency_decode(&message, &highLatency);
     _updateMissionIndex(highLatency.wp_num);
 }
 
-void MissionManager::_handleHighLatency2(const mavlink_message_t& message) 
+void MissionManager::_handleHighLatency2(const mavlink_message_t& message)
 {
     mavlink_high_latency2_t highLatency2;
     mavlink_msg_high_latency2_decode(&message, &highLatency2);
@@ -290,4 +290,3 @@ void MissionManager::_handleHeartbeat(const mavlink_message_t& message)
         emit lastCurrentIndexChanged(_lastCurrentIndex);
     }
 }
-
diff --git a/src/MissionManager/MissionManager.h b/src/MissionManager/MissionManager.h
index 770fdd0812d9..7689660e4a5b 100644
--- a/src/MissionManager/MissionManager.h
+++ b/src/MissionManager/MissionManager.h
@@ -25,7 +25,7 @@ class MissionManager : public PlanManager
 public:
     MissionManager(Vehicle* vehicle);
     ~MissionManager();
-        
+
     /// Current mission item as reported by MISSION_CURRENT
     int currentIndex(void) const { return _currentMissionIndex; }
 
diff --git a/src/MissionManager/MissionSettingsItem.cc b/src/MissionManager/MissionSettingsItem.cc
index c24b8fdce032..8c5d0c2f215b 100644
--- a/src/MissionManager/MissionSettingsItem.cc
+++ b/src/MissionManager/MissionSettingsItem.cc
@@ -16,7 +16,7 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(MissionSettingsItemLog, "MissionSettingsItemLog")
+QGC_LOGGING_CATEGORY(MissionSettingsItemLog, "Plan.MissionSettingsItem")
 
 QMap<QString, FactMetaData*> MissionSettingsItem::_metaDataMap;
 
diff --git a/src/MissionManager/PlanCreator.h b/src/MissionManager/PlanCreator.h
index 5a9540e69195..712de55394f3 100644
--- a/src/MissionManager/PlanCreator.h
+++ b/src/MissionManager/PlanCreator.h
@@ -20,7 +20,7 @@ class MissionController;
 class PlanCreator : public QObject
 {
     Q_OBJECT
-    
+
 public:
     PlanCreator(PlanMasterController* planMasterController, QString name, QString imageResource, QObject* parent = nullptr);
 
diff --git a/src/MissionManager/PlanElementController.h b/src/MissionManager/PlanElementController.h
index b28e15728519..d817162c8bb6 100644
--- a/src/MissionManager/PlanElementController.h
+++ b/src/MissionManager/PlanElementController.h
@@ -24,7 +24,7 @@ class PlanElementController : public QObject
 public:
     PlanElementController(PlanMasterController* masterController, QObject* parent = nullptr);
     ~PlanElementController();
-    
+
     Q_PROPERTY(PlanMasterController*    masterController    READ masterController               CONSTANT)
     Q_PROPERTY(bool                     supported           READ supported                      NOTIFY supportedChanged)        ///< true: Element is supported by Vehicle
     Q_PROPERTY(bool                     containsItems       READ containsItems                  NOTIFY containsItemsChanged)    ///< true: Elemement is non-empty
diff --git a/src/MissionManager/PlanManager.cc b/src/MissionManager/PlanManager.cc
index f433dbd415f9..b98eca85f1da 100644
--- a/src/MissionManager/PlanManager.cc
+++ b/src/MissionManager/PlanManager.cc
@@ -15,7 +15,7 @@
 #include "MissionCommandTree.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(PlanManagerLog, "PlanManagerLog")
+QGC_LOGGING_CATEGORY(PlanManagerLog, "PlanManager.PlanManager")
 
 PlanManager::PlanManager(Vehicle* vehicle, MAV_MISSION_TYPE planType)
     : QObject                   (vehicle)
diff --git a/src/MissionManager/PlanMasterController.cc b/src/MissionManager/PlanMasterController.cc
index 92bd3d1e2f25..5c513d621d53 100644
--- a/src/MissionManager/PlanMasterController.cc
+++ b/src/MissionManager/PlanMasterController.cc
@@ -29,7 +29,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QFileInfo>
 
-QGC_LOGGING_CATEGORY(PlanMasterControllerLog, "PlanMasterControllerLog")
+QGC_LOGGING_CATEGORY(PlanMasterControllerLog, "PlanManager.PlanMasterController")
 
 PlanMasterController::PlanMasterController(QObject* parent)
     : QObject               (parent)
@@ -615,7 +615,7 @@ void PlanMasterController::_updateOverallDirty(void)
     if(_previousOverallDirty != dirty()){
         _previousOverallDirty = dirty();
         emit dirtyChanged(_previousOverallDirty);
-    }    
+    }
 }
 
 void PlanMasterController::_updatePlanCreatorsList(void)
diff --git a/src/MissionManager/PlanMasterController.h b/src/MissionManager/PlanMasterController.h
index d12646507866..15c437ec2fae 100644
--- a/src/MissionManager/PlanMasterController.h
+++ b/src/MissionManager/PlanMasterController.h
@@ -30,7 +30,7 @@ class PlanMasterController : public QObject
     QML_ELEMENT
     Q_MOC_INCLUDE("QmlObjectListModel.h")
     Q_MOC_INCLUDE("Vehicle.h")
-    
+
 public:
     PlanMasterController(QObject* parent = nullptr);
 #ifdef QT_DEBUG
diff --git a/src/MissionManager/RallyPoint.cc b/src/MissionManager/RallyPoint.cc
index 337f1b3f89ce..939d1fb13efe 100644
--- a/src/MissionManager/RallyPoint.cc
+++ b/src/MissionManager/RallyPoint.cc
@@ -49,7 +49,7 @@ const RallyPoint& RallyPoint::operator=(const RallyPoint& other)
 }
 
 RallyPoint::~RallyPoint()
-{    
+{
 
 }
 
diff --git a/src/MissionManager/RallyPoint.h b/src/MissionManager/RallyPoint.h
index 6553c2dfed95..bedbe49c4a08 100644
--- a/src/MissionManager/RallyPoint.h
+++ b/src/MissionManager/RallyPoint.h
@@ -19,7 +19,7 @@
 class RallyPoint : public QObject
 {
     Q_OBJECT
-    
+
 public:
     RallyPoint(const QGeoCoordinate& coordinate, QObject* parent = nullptr);
     RallyPoint(const RallyPoint& other, QObject* parent = nullptr);
@@ -27,7 +27,7 @@ class RallyPoint : public QObject
     ~RallyPoint();
 
     const RallyPoint& operator=(const RallyPoint& other);
-    
+
     Q_PROPERTY(QGeoCoordinate   coordinate      READ coordinate     WRITE setCoordinate     NOTIFY coordinateChanged)
     Q_PROPERTY(bool             dirty           READ dirty          WRITE setDirty          NOTIFY dirtyChanged)
     Q_PROPERTY(QVariantList     textFieldFacts  MEMBER _textFieldFacts                      CONSTANT)
diff --git a/src/MissionManager/RallyPointController.cc b/src/MissionManager/RallyPointController.cc
index e2d4bcd956f8..614d263647b2 100644
--- a/src/MissionManager/RallyPointController.cc
+++ b/src/MissionManager/RallyPointController.cc
@@ -20,7 +20,7 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(RallyPointControllerLog, "RallyPointControllerLog")
+QGC_LOGGING_CATEGORY(RallyPointControllerLog, "PlanManager.RallyPointController")
 
 RallyPointController::RallyPointController(PlanMasterController* masterController, QObject* parent)
     : PlanElementController (masterController, parent)
@@ -66,17 +66,11 @@ void RallyPointController::_managerVehicleChanged(Vehicle* managerVehicle)
     connect(_rallyPointManager, &RallyPointManager::removeAllComplete,  this, &RallyPointController::_managerRemoveAllComplete);
     connect(_rallyPointManager, &RallyPointManager::inProgressChanged,  this, &RallyPointController::syncInProgressChanged);
 
-    //-- RallyPointController::supported() tests both the capability bit AND the protocol version.
     (void) connect(_managerVehicle, &Vehicle::capabilityBitsChanged, this, [this](uint64_t capabilityBits) {
         Q_UNUSED(capabilityBits);
         emit supportedChanged(supported());
     });
 
-    (void) connect(_managerVehicle, &Vehicle::requestProtocolVersion, this, [this](unsigned version) {
-        Q_UNUSED(version);
-        emit supportedChanged(supported());
-    });
-
     emit supportedChanged(supported());
 }
 
@@ -261,7 +255,7 @@ void RallyPointController::addPoint(QGeoCoordinate point)
 
 bool RallyPointController::supported(void) const
 {
-    return (_managerVehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_RALLY) && (_managerVehicle->maxProtoVersion() >= 200);
+    return _managerVehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_RALLY;
 }
 
 void RallyPointController::removePoint(QObject* rallyPoint)
diff --git a/src/MissionManager/RallyPointController.h b/src/MissionManager/RallyPointController.h
index 35e51b7c1f5d..e210d6a1ff08 100644
--- a/src/MissionManager/RallyPointController.h
+++ b/src/MissionManager/RallyPointController.h
@@ -30,7 +30,7 @@ class RallyPointController : public PlanElementController
 public:
     explicit RallyPointController(PlanMasterController* masterController, QObject* parent = nullptr);
     ~RallyPointController();
-    
+
     Q_PROPERTY(QmlObjectListModel*  points                  READ points                                             CONSTANT)
     Q_PROPERTY(QString              editorQml               READ editorQml                                          CONSTANT)
     Q_PROPERTY(QObject*             currentRallyPoint       READ currentRallyPoint      WRITE setCurrentRallyPoint  NOTIFY currentRallyPointChanged)
diff --git a/src/MissionManager/RallyPointManager.cc b/src/MissionManager/RallyPointManager.cc
index 514f610b600c..2e975be6f06d 100644
--- a/src/MissionManager/RallyPointManager.cc
+++ b/src/MissionManager/RallyPointManager.cc
@@ -11,7 +11,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(RallyPointManagerLog, "RallyPointManagerLog")
+QGC_LOGGING_CATEGORY(RallyPointManagerLog, "PlanManager.RallyPointManager")
 
 RallyPointManager::RallyPointManager(Vehicle* vehicle)
     : PlanManager(vehicle, MAV_MISSION_TYPE_RALLY)
@@ -71,7 +71,7 @@ void RallyPointManager::removeAll(void)
 
 bool RallyPointManager::supported(void) const
 {
-    return (_vehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_RALLY) && (_vehicle->maxProtoVersion() >= 200);
+    return _vehicle->capabilityBits() & MAV_PROTOCOL_CAPABILITY_MISSION_RALLY;
 }
 
 void RallyPointManager::_planManagerLoadComplete(bool removeAllRequested)
diff --git a/src/MissionManager/RallyPointManager.h b/src/MissionManager/RallyPointManager.h
index 7990176cfaa3..78bc589e2562 100644
--- a/src/MissionManager/RallyPointManager.h
+++ b/src/MissionManager/RallyPointManager.h
@@ -24,11 +24,11 @@ Q_DECLARE_LOGGING_CATEGORY(RallyPointManagerLog)
 class RallyPointManager : public PlanManager
 {
     Q_OBJECT
-    
+
 public:
     RallyPointManager(Vehicle* vehicle);
     ~RallyPointManager();
-    
+
     bool                    supported       (void) const;
     void                    sendToVehicle   (const QList<QGeoCoordinate>& rgPoints);
     void                    removeAll       (void);
@@ -42,7 +42,7 @@ class RallyPointManager : public PlanManager
         TooManyPoints,          ///< Too many points for valid geofence
         InvalidCircleRadius,
     } ErrorCode_t;
-    
+
 signals:
     void loadComplete       (void);
     void inProgressChanged  (bool inProgress);
diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc
index a694a0e064f7..f53359abaafa 100644
--- a/src/MissionManager/SimpleMissionItem.cc
+++ b/src/MissionManager/SimpleMissionItem.cc
@@ -153,7 +153,7 @@ void SimpleMissionItem::_connectSignals(void)
     // For NAV_LOITER_X commands, they must emit a radiusChanged signal
     connect(&_missionItem._param2Fact,          &Fact::valueChanged,                        this, &SimpleMissionItem::_possibleRadiusChanged);
     connect(&_missionItem._param3Fact,          &Fact::valueChanged,                        this, &SimpleMissionItem::_possibleRadiusChanged);
-    
+
     // Exit coordinate is the same as entrance coordinate
     connect(this,                               &SimpleMissionItem::coordinateChanged,      this, &SimpleMissionItem::exitCoordinateChanged);
 
@@ -245,7 +245,7 @@ void SimpleMissionItem::_setupMetaData(void)
 }
 
 SimpleMissionItem::~SimpleMissionItem()
-{    
+{
 }
 
 void SimpleMissionItem::save(QJsonArray&  missionItems)
@@ -406,7 +406,7 @@ QString SimpleMissionItem::abbreviation() const
 void SimpleMissionItem::_rebuildTextFieldFacts(void)
 {
     _textFieldFacts.clear();
-    
+
     if (rawEdit()) {
         _missionItem._param1Fact.setName("Param1");
         _missionItem._param1Fact.setMetaData(_defaultParamMetaData);
diff --git a/src/MissionManager/SimpleMissionItem.h b/src/MissionManager/SimpleMissionItem.h
index 5f281b356c48..f33b9b20dfab 100644
--- a/src/MissionManager/SimpleMissionItem.h
+++ b/src/MissionManager/SimpleMissionItem.h
@@ -64,7 +64,7 @@ class SimpleMissionItem : public VisualMissionItem
     bool scanForSections(QmlObjectListModel* visualItems, int scanIndex, PlanMasterController* masterController);
 
     // Property accesors
-    
+
     QString         category            (void) const;
     int             command             (void) const { return _missionItem._commandFact.cookedValue().toInt(); }
     MAV_CMD         mavCommand          (void) const { return static_cast<MAV_CMD>(command()); }
@@ -87,7 +87,7 @@ class SimpleMissionItem : public VisualMissionItem
 
     void setRawEdit(bool rawEdit);
     void setAltitudeMode(QGroundControlQmlGlobal::AltMode altitudeMode);
-    
+
     void setCommandByIndex(int index);
 
     void setCommand(int command);
@@ -193,7 +193,7 @@ private slots:
     QmlObjectListModel  _textFieldFacts;
     QmlObjectListModel  _nanFacts;
     QmlObjectListModel  _comboboxFacts;
-    
+
     static FactMetaData*    _altitudeMetaData;
     static FactMetaData*    _commandMetaData;
     static FactMetaData*    _defaultParamMetaData;
diff --git a/src/MissionManager/StructureScanComplexItem.cc b/src/MissionManager/StructureScanComplexItem.cc
index d3e1b1c97f3a..288e847520eb 100644
--- a/src/MissionManager/StructureScanComplexItem.cc
+++ b/src/MissionManager/StructureScanComplexItem.cc
@@ -20,7 +20,7 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(StructureScanComplexItemLog, "StructureScanComplexItemLog")
+QGC_LOGGING_CATEGORY(StructureScanComplexItemLog, "Plan.StructureScanComplexItem")
 
 const QString StructureScanComplexItem::name(StructureScanComplexItem::tr("Structure Scan"));
 
@@ -29,7 +29,7 @@ StructureScanComplexItem::StructureScanComplexItem(PlanMasterController* masterC
     , _metaDataMap              (FactMetaData::createMapFromJsonFile(QStringLiteral(":/json/StructureScan.SettingsGroup.json"), this /* QObject parent */))
     , _sequenceNumber           (0)
     , _entryVertex              (0)
-    , _ignoreRecalc             (false)
+, _ignoreRecalc             (false)
     , _scanDistance             (0.0)
     , _cameraShots              (0)
     , _cameraCalc               (masterController, settingsGroup)
@@ -754,4 +754,3 @@ void StructureScanComplexItem::_segmentTerrainCollisionChanged(bool terrainColli
     ComplexMissionItem::_segmentTerrainCollisionChanged(terrainCollision);
     _structurePolygon.setShowAltColor(_cTerrainCollisionSegments != 0);
 }
-
diff --git a/src/MissionManager/StructureScanPlanCreator.h b/src/MissionManager/StructureScanPlanCreator.h
index 8c2abd2d5795..00bb5af48ffb 100644
--- a/src/MissionManager/StructureScanPlanCreator.h
+++ b/src/MissionManager/StructureScanPlanCreator.h
@@ -14,7 +14,7 @@
 class StructureScanPlanCreator : public PlanCreator
 {
     Q_OBJECT
-    
+
 public:
     StructureScanPlanCreator(PlanMasterController* planMasterController, QObject* parent = nullptr);
 
diff --git a/src/MissionManager/SurveyComplexItem.cc b/src/MissionManager/SurveyComplexItem.cc
index ca113b69e102..43416165bed7 100644
--- a/src/MissionManager/SurveyComplexItem.cc
+++ b/src/MissionManager/SurveyComplexItem.cc
@@ -24,7 +24,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QLineF>
 
-QGC_LOGGING_CATEGORY(SurveyComplexItemLog, "SurveyComplexItemLog")
+QGC_LOGGING_CATEGORY(SurveyComplexItemLog, "Plan.SurveyComplexItem")
 
 const QString SurveyComplexItem::name(SurveyComplexItem::tr("Survey"));
 
@@ -674,11 +674,11 @@ void SurveyComplexItem::_rebuildTransectsPhase1WorkerSinglePolygon(bool refly)
 
     double gridAngle = _gridAngleFact.rawValue().toDouble();
     double gridSpacing = _cameraCalc.adjustedFootprintSide()->rawValue().toDouble();
-    if (gridSpacing < 0.5) {
-        // We can't let gridSpacing get too small otherwise we will end up with too many transects.
-        // So we limit to 0.5 meter spacing as min and set to huge value which will cause a single
-        // transect to be added.
-        gridSpacing = 100000;
+    if (gridSpacing < _minimumTransectSpacingMeters) {
+        // We can't let spacing get too small otherwise we will end up with too many transects.
+        // So we limit the spacing to be above a small increment and below that value we set to huge spacing
+        // which will cause a single transect to be added instead of having things blow up.
+        gridSpacing = _forceLargeTransectSpacingMeters;
     }
 
     gridAngle = _clampGridAngle90(gridAngle);
diff --git a/src/MissionManager/SurveyPlanCreator.h b/src/MissionManager/SurveyPlanCreator.h
index 6ace13330d5c..8bc2dd9040ff 100644
--- a/src/MissionManager/SurveyPlanCreator.h
+++ b/src/MissionManager/SurveyPlanCreator.h
@@ -14,7 +14,7 @@
 class SurveyPlanCreator : public PlanCreator
 {
     Q_OBJECT
-    
+
 public:
     SurveyPlanCreator(PlanMasterController* planMasterController, QObject* parent = nullptr);
 
diff --git a/src/MissionManager/TakeoffMissionItem.h b/src/MissionManager/TakeoffMissionItem.h
index ca8af72838d2..06e8bb67c58b 100644
--- a/src/MissionManager/TakeoffMissionItem.h
+++ b/src/MissionManager/TakeoffMissionItem.h
@@ -19,7 +19,7 @@ class MissionSettingsItem;
 class TakeoffMissionItem : public SimpleMissionItem
 {
     Q_OBJECT
-    
+
 public:
     // Note: forLoad = true indicates that TakeoffMissionItem::load will be called onthe item
     TakeoffMissionItem(PlanMasterController* masterController, bool flyView, MissionSettingsItem* settingsItem, bool forLoad);
diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc
index bd7759938e6c..188c941f9e28 100644
--- a/src/MissionManager/TransectStyleComplexItem.cc
+++ b/src/MissionManager/TransectStyleComplexItem.cc
@@ -23,7 +23,7 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(TransectStyleComplexItemLog, "TransectStyleComplexItemLog")
+QGC_LOGGING_CATEGORY(TransectStyleComplexItemLog, "Plan.TransectStyleComplexItem")
 
 TransectStyleComplexItem::TransectStyleComplexItem(PlanMasterController* masterController, bool flyView, QString settingsGroup)
     : ComplexMissionItem                (masterController, flyView)
diff --git a/src/MissionManager/TransectStyleComplexItem.h b/src/MissionManager/TransectStyleComplexItem.h
index ede0c2905541..10292b8b71fa 100644
--- a/src/MissionManager/TransectStyleComplexItem.h
+++ b/src/MissionManager/TransectStyleComplexItem.h
@@ -211,6 +211,8 @@ protected slots:
 
     static constexpr int _terrainQueryTimeoutMsecs=     1000;
     static constexpr int _hoverAndCaptureDelaySeconds = 4;
+    static constexpr double _minimumTransectSpacingMeters = 0.3;
+    static constexpr double _forceLargeTransectSpacingMeters = 100000;
 
 private slots:
     void _reallyQueryTransectsPathHeightInfo        (void);
@@ -245,5 +247,5 @@ private slots:
     QTimer                      _terrainPolyPathQueryTimer;
 
     // Deprecated json keys
-    static constexpr const char* _jsonTerrainFollowKeyDeprecated       = "FollowTerrain";
+    static constexpr const char* _jsonTerrainFollowKeyDeprecated = "FollowTerrain";
 };
diff --git a/src/MissionManager/VTOLLandingComplexItem.cc b/src/MissionManager/VTOLLandingComplexItem.cc
index 0b8ccc71087b..5e5017680a27 100644
--- a/src/MissionManager/VTOLLandingComplexItem.cc
+++ b/src/MissionManager/VTOLLandingComplexItem.cc
@@ -20,7 +20,7 @@
 
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(VTOLLandingComplexItemLog, "VTOLLandingComplexItemLog")
+QGC_LOGGING_CATEGORY(VTOLLandingComplexItemLog, "Plan.VTOLLandingComplexItem")
 
 const QString VTOLLandingComplexItem::name(VTOLLandingComplexItem::tr("VTOL Landing"));
 
diff --git a/src/MissionManager/VisualMissionItem.cc b/src/MissionManager/VisualMissionItem.cc
index 2ce54df49823..a3d28e557899 100644
--- a/src/MissionManager/VisualMissionItem.cc
+++ b/src/MissionManager/VisualMissionItem.cc
@@ -69,7 +69,7 @@ const VisualMissionItem& VisualMissionItem::operator=(const VisualMissionItem& o
 }
 
 VisualMissionItem::~VisualMissionItem()
-{    
+{
 }
 
 void VisualMissionItem::setIsCurrentItem(bool isCurrentItem)
diff --git a/src/PositionManager/CMakeLists.txt b/src/PositionManager/CMakeLists.txt
index f91c277a963d..84eddc713c26 100644
--- a/src/PositionManager/CMakeLists.txt
+++ b/src/PositionManager/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Position Manager Module
+# Manages GPS/GNSS position sources and simulated position data
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         PositionManager.cpp
diff --git a/src/PositionManager/PositionManager.cpp b/src/PositionManager/PositionManager.cpp
index 0713eade4f11..e02b2dd7bd2a 100644
--- a/src/PositionManager/PositionManager.cpp
+++ b/src/PositionManager/PositionManager.cpp
@@ -20,7 +20,7 @@
 #include <QtPositioning/private/qgeopositioninfosource_p.h>
 #include <QtPositioning/QNmeaPositionInfoSource>
 
-QGC_LOGGING_CATEGORY(QGCPositionManagerLog, "qgc.positionmanager.positionmanager")
+QGC_LOGGING_CATEGORY(QGCPositionManagerLog, "PositionManager.QGCPositionManager")
 
 Q_APPLICATION_STATIC(QGCPositionManager, _positionManager);
 
diff --git a/src/PositionManager/SimulatedPosition.cc b/src/PositionManager/SimulatedPosition.cc
index 721f2d2aadd0..4741791d77f7 100644
--- a/src/PositionManager/SimulatedPosition.cc
+++ b/src/PositionManager/SimulatedPosition.cc
@@ -16,7 +16,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(SimulatedPositionLog, "qgc.positionmanager.simulatedposition")
+QGC_LOGGING_CATEGORY(SimulatedPositionLog, "PositionManager.SimulatedPosition")
 
 SimulatedPosition::SimulatedPosition(QObject* parent)
     : QGeoPositionInfoSource(parent)
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 07fd6f5d4ac8..2833583fbaeb 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -22,12 +22,12 @@
 #include <QtQuick/QQuickImageProvider>
 #include <QtQuick/QQuickWindow>
 #include <QtQuickControls2/QQuickStyle>
+#include <QtSvg/QSvgRenderer>
 
 #include <QtCore/private/qthread_p.h>
 
 #include "QGCLogging.h"
 #include "AudioOutput.h"
-#include "CmdLineOptParser.h"
 #include "FollowMe.h"
 #include "JoystickManager.h"
 #include "JsonHelper.h"
@@ -36,11 +36,13 @@
 #include "MultiVehicleManager.h"
 #include "ParameterManager.h"
 #include "PositionManager.h"
+#include "QGCCommandLineParser.h"
 #include "QGCCorePlugin.h"
 #include "QGCFileDownload.h"
 #include "QGCImageProvider.h"
 #include "QGCLoggingCategory.h"
 #include "SettingsManager.h"
+#include "MavlinkSettings.h"
 #include "AppSettings.h"
 #include "UDPLink.h"
 #include "Vehicle.h"
@@ -51,34 +53,24 @@
 #include "SerialLink.h"
 #endif
 
-QGC_LOGGING_CATEGORY(QGCApplicationLog, "qgc.qgcapplication")
+QGC_LOGGING_CATEGORY(QGCApplicationLog, "API.QGCApplication")
 
-QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting, bool simpleBootTest)
+QGCApplication::QGCApplication(int &argc, char *argv[], const QGCCommandLineParser::CommandLineParseResult &cli)
     : QApplication(argc, argv)
-    , _runningUnitTests(unitTesting)
-    , _simpleBootTest(simpleBootTest)
+    , _runningUnitTests(cli.runningUnitTests)
+    , _simpleBootTest(cli.simpleBootTest)
+    , _fakeMobile(cli.fakeMobile)
+    , _logOutput(cli.logOutput)
+    , _systemId(cli.systemId.value_or(0))
 {
     _msecsElapsedTime.start();
 
     // Setup for network proxy support
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
-    // Parse command line options
-    bool fClearSettingsOptions = false; // Clear stored settings
-    bool fClearCache = false;           // Clear parameter/airframe caches
-    bool logging = false;               // Turn on logging
-    QString loggingOptions;
-
-    CmdLineOpt_t rgCmdLineOptions[] = {
-        { "--clear-settings",   &fClearSettingsOptions, nullptr },
-        { "--clear-cache",      &fClearCache,           nullptr },
-        { "--logging",          &logging,               &loggingOptions },
-        { "--fake-mobile",      &_fakeMobile,           nullptr },
-        { "--log-output",       &_logOutput,            nullptr },
-        // Add additional command line option flags here
-    };
-
-    ParseCmdLineOptions(argc, argv, rgCmdLineOptions, std::size(rgCmdLineOptions), false);
+    bool fClearSettingsOptions = cli.clearSettingsOptions;  // Clear stored settings
+    const bool fClearCache = cli.clearCache;                // Clear parameter/airframe caches
+    const QString loggingOptions = cli.loggingOptions.value_or(QString(""));
 
     // Set up timer for delayed missing fact display
     _missingParamsDelayedDisplayTimer.setSingleShot(true);
@@ -87,7 +79,7 @@ QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting, bool s
 
     // Set application information
     QString applicationName;
-    if (_runningUnitTests || simpleBootTest) {
+    if (_runningUnitTests || _simpleBootTest) {
         // We don't want unit tests to use the same QSettings space as the normal app. So we tweak the app
         // name. Also we want to run unit tests with clean settings every time.
         applicationName = QStringLiteral("%1_unittest").arg(QGC_APP_NAME);
@@ -117,7 +109,7 @@ QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting, bool s
     // The setting will delete all settings on this boot
     fClearSettingsOptions |= settings.contains(_deleteAllSettingsKey);
 
-    if (_runningUnitTests || simpleBootTest) {
+    if (_runningUnitTests || _simpleBootTest) {
         // Unit tests run with clean settings
         fClearSettingsOptions = true;
     }
@@ -152,11 +144,14 @@ QGCApplication::QGCApplication(int &argc, char *argv[], bool unitTesting, bool s
     }
 
     // Set up our logging filters
-    QGCLoggingCategoryRegister::instance()->setFilterRulesFromSettings(loggingOptions);
+    QGCLoggingCategoryManager::instance()->setFilterRulesFromSettings(loggingOptions);
 
     // We need to set language as early as possible prior to loading on JSON files.
     setLanguage();
 
+    // Force old SVG Tiny 1.2 behavior for compatibility
+    QSvgRenderer::setDefaultOptions(QtSvg::Tiny12FeaturesOnly);
+
 #ifndef QGC_DAILY_BUILD
     _checkForNewVersion();
 #endif
@@ -219,13 +214,17 @@ QGCApplication::~QGCApplication()
 void QGCApplication::init()
 {
     SettingsManager::instance()->init();
+    if (_systemId > 0) {
+        qCDebug(QGCApplicationLog) << "Setting MAVLink System ID to:" << _systemId;
+        SettingsManager::instance()->mavlinkSettings()->gcsMavlinkSystemID()->setRawValue(_systemId);
+    }
 
     // Although this should really be in _initForNormalAppBoot putting it here allowws us to create unit tests which pop up more easily
-    if(QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) {
+    if (QFontDatabase::addApplicationFont(":/fonts/opensans") < 0) {
         qCWarning(QGCApplicationLog) << "Could not load /fonts/opensans font";
     }
 
-    if(QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) {
+    if (QFontDatabase::addApplicationFont(":/fonts/opensans-demibold") < 0) {
         qCWarning(QGCApplicationLog) << "Could not load /fonts/opensans-demibold font";
     }
 
@@ -410,7 +409,8 @@ void QGCApplication::showAppMessage(const QString &message, const QString &title
         QMetaObject::invokeMethod(rootQmlObject, "_showMessageDialog", Q_RETURN_ARG(QVariant, varReturn), Q_ARG(QVariant, dialogTitle), Q_ARG(QVariant, varMessage));
     } else if (runningUnitTests()) {
         // Unit tests can run without UI
-        qCDebug(QGCApplicationLog) << "QGCApplication::showAppMessage unittest title:message" << dialogTitle << message;
+        // We don't use a logging category to make it easier to debug unit tests
+        qDebug() << "QGCApplication::showAppMessage unittest title:message" << dialogTitle << message;
     } else {
         // UI isn't ready yet
         _delayedAppMessages.append(QPair<QString, QString>(dialogTitle, message));
diff --git a/src/QGCApplication.h b/src/QGCApplication.h
index e4cd6ddf0b33..a656d745e37a 100644
--- a/src/QGCApplication.h
+++ b/src/QGCApplication.h
@@ -9,14 +9,18 @@
 
 #pragma once
 
+#include <QtCore/QLoggingCategory>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QMap>
 #include <QtCore/QSet>
 #include <QtCore/QTimer>
 #include <QtCore/QTranslator>
-
 #include <QtWidgets/QApplication>
 
+namespace QGCCommandLineParser {
+    struct CommandLineParseResult;
+}
+
 class QQmlApplicationEngine;
 class QQuickWindow;
 class QGCImageProvider;
@@ -38,6 +42,8 @@ class QMetaObject;
 
 #define qgcApp() qApp
 
+Q_DECLARE_LOGGING_CATEGORY(QGCApplicationLog)
+
 /// The main application and management class.
 /// Needs QApplication base to support QtCharts module.
 /// TODO: Use QtGraphs to convert to QGuiApplication
@@ -48,7 +54,7 @@ class QGCApplication : public QApplication
     /// Unit Test have access to creating and destroying singletons
     friend class UnitTest;
 public:
-    QGCApplication(int &argc, char *argv[], bool unitTesting, bool simpleBootTest);
+    QGCApplication(int &argc, char *argv[], const QGCCommandLineParser::CommandLineParseResult &args);
     ~QGCApplication();
 
     /// Sets the persistent flag to delete all settings the next time QGroundControl is started.
@@ -96,7 +102,7 @@ class QGCApplication : public QApplication
     QQmlApplicationEngine *qmlAppEngine() const { return _qmlAppEngine; }
 
 signals:
-    void languageChanged(const QLocale locale);
+    void languageChanged(const QLocale &locale);
 
 public slots:
     void showVehicleConfig();
@@ -129,7 +135,7 @@ private slots:
     bool compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents) final;
 
     void _initVideo();
-    
+
     /// Initialize the application for normal application boot. Or in other words we are not going to run unit tests.
     void _initForNormalAppBoot();
 
@@ -137,14 +143,16 @@ private slots:
     void _checkForNewVersion();
 
     bool _runningUnitTests = false;
-    bool _simpleBootTest = false; 
+    bool _simpleBootTest = false;
+    bool _fakeMobile = false;    ///< true: Fake ui into displaying mobile interface
+    bool _logOutput = false;    ///< true: Log Qt debug output to file
+    quint8 _systemId = 0; ///< MAVLink system ID, 0 means not set
+
     static constexpr int _missingParamsDelayedDisplayTimerTimeout = 1000;   ///< Timeout to wait for next missing fact to come in before display
     QTimer _missingParamsDelayedDisplayTimer;                               ///< Timer use to delay missing fact display
     QList<QPair<int,QString>> _missingParams;                               ///< List of missing parameter component id:name
 
     QQmlApplicationEngine *_qmlAppEngine = nullptr;
-    bool _logOutput = false;    ///< true: Log Qt debug output to file
-    bool _fakeMobile = false;    ///< true: Fake ui into displaying mobile interface
     bool _settingsUpgraded = false;    ///< true: Settings format has been upgrade to new version
     int _majorVersion = 0;
     int _minorVersion = 0;
diff --git a/src/QmlControls/AppMessages.qml b/src/QmlControls/AppLogging.qml
similarity index 54%
rename from src/QmlControls/AppMessages.qml
rename to src/QmlControls/AppLogging.qml
index 2b21d9c1aea5..a789b562233f 100644
--- a/src/QmlControls/AppMessages.qml
+++ b/src/QmlControls/AppLogging.qml
@@ -13,15 +13,11 @@ import QtQuick.Dialogs
 import QtQuick.Layouts
 
 import QGroundControl
-
 import QGroundControl.Controls
-
 import QGroundControl.FactControls
 
-
-
 Item {
-    id:         _root
+    id: root
 
     property bool listViewLoadCompleted: false
 
@@ -62,7 +58,7 @@ Item {
                 clip:                   true
                 model:                  debugMessageModel
                 delegate:               delegateItem
- 
+
                 function scrollToEnd() {
                     if (listViewLoadCompleted) {
                         if (followTail.checked) {
@@ -156,96 +152,127 @@ Item {
         id: filtersDialogComponent
 
         QGCPopupDialog {
-            title:      qsTr("Logging categories")
+            title:      qsTr("Logging")
             buttons:    Dialog.Close
 
-            property int enabledCategoryCount: 0
+            ColumnLayout {
+                width: maxContentAvailableWidth
 
-            function clearAllLogging() {
-                var logCategories = QGroundControl.loggingCategories()
-                for (var category of logCategories) {
-                    QGroundControl.setCategoryLoggingOn(category, false)
-                }
-                QGroundControl.updateLoggingFilterRules()
-                categoryRepeater.model = undefined
-                categoryRepeater.model = QGroundControl.loggingCategories()
-                enabledCategoryCount = 0
-                enabledCategoryRepeater.model = undefined
-                enabledCategoryRepeater.model = QGroundControl.loggingCategories()
-            }
+                SettingsGroupLayout {
+                    heading:            qsTr("Search")
+                    Layout.fillWidth:   true
 
-            function updateLoggingCategory(logCategory, checked, rebuildCategoryList) {
-                QGroundControl.setCategoryLoggingOn(logCategory, checked)
-                QGroundControl.updateLoggingFilterRules()
-                enabledCategoryCount = 0
-                enabledCategoryRepeater.model = undefined
-                enabledCategoryRepeater.model = QGroundControl.loggingCategories()
-                if (rebuildCategoryList) {
-                    categoryRepeater.model = undefined
-                    categoryRepeater.model = QGroundControl.loggingCategories()
-                }
-            }
+                    RowLayout {
+                        Layout.fillWidth:   true
+                        spacing:            ScreenTools.defaultFontPixelHeight / 2
 
-            ColumnLayout {
-                RowLayout {
-                    spacing: ScreenTools.defaultFontPixelHeight / 2
-                    Layout.alignment: Qt.AlignVCenter
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
+                        QGCTextField {
+                            Layout.fillWidth:   true
+                            id:                 searchText
+                            text:               ""
+                            enabled:            true
+                        }
 
-                    QGCLabel {
-                        text: qsTr("Search:")
+                        QGCButton {
+                            text:       qsTr("Clear")
+                            onClicked:  searchText.text = ""
+                        }
                     }
+                }
 
-                    QGCTextField {
-                        id: searchText
-                        text: ""
-                        Layout.fillWidth: true
-                        enabled: true
-                    }
+                SettingsGroupLayout {
+                    heading:            qsTr("Enabled Categories")
+                    Layout.fillWidth:   true
+
+                    Flow {
+                        Layout.fillWidth:   true
+                        spacing:            ScreenTools.defaultFontPixelHeight / 2
+
+                        Repeater {
+                            model: QGroundControl.flatLoggingCategoriesModel()
+
+                            QGCCheckBoxSlider {
+                                Layout.fillWidth:       true
+                                Layout.maximumHeight:   visible ? implicitHeight : 0
+                                text:                   object.fullCategory
+                                visible:                object.enabled
+                                checked:                object.enabled
+                                onClicked:              object.enabled = checked
+                            }
+                        }
 
-                    QGCButton {
-                        text:       qsTr("Clear")
-                        onClicked:  searchText.text = ""
+                        QGCButton {
+                            text:       qsTr("Disable All")
+                            onClicked:  QGroundControl.disableAllLoggingCategories()
+                        }
                     }
                 }
 
-                ColumnLayout {
-                    spacing: ScreenTools.defaultFontPixelHeight / 2
+                // Shown when not filtered
+                Flow {
+                    Layout.fillWidth:   true
+                    spacing:            ScreenTools.defaultFontPixelHeight / 2
+                    visible:            searchText.text === ""
 
                     Repeater {
-                        id:     enabledCategoryRepeater
-                        model:  QGroundControl.loggingCategories()
-
-                        QGCCheckBox {
-                            text:       modelData
-                            visible:    QGroundControl.categoryLoggingOn(modelData)
-                            checked:    QGroundControl.categoryLoggingOn(modelData)
-                            onClicked:  updateLoggingCategory(modelData, checked, true /* rebuildCategoryList */)
-
-                            Component.onCompleted: enabledCategoryCount += checked ? 1 : 0
+                        model: QGroundControl.treeLoggingCategoriesModel()
+
+                        ColumnLayout {
+                            spacing: ScreenTools.defaultFontPixelHeight / 2
+
+                            RowLayout {
+                                spacing:                ScreenTools.defaultFontPixelWidth
+
+                                QGCLabel {
+                                    Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth
+                                    text:                   object.expanded ? qsTr("-") : qsTr("+")
+                                    horizontalAlignment:    Text.AlignLeft
+                                    visible:                object.children
+
+                                    QGCMouseArea {
+                                        anchors.fill:   parent
+                                        onClicked:      object.expanded = !object.expanded
+                                    }
+                                }
+
+                                QGCCheckBoxSlider {
+                                    Layout.fillWidth:   true
+                                    text:               object.shortCategory
+                                    checked:            object.enabled
+                                    onClicked:          object.enabled = checked
+                                }
+                            }
+
+                            Repeater {
+                                model: object.expanded ? object.children : undefined
+
+                                QGCCheckBoxSlider {
+                                    Layout.fillWidth:   true
+                                    text:               "   " + object.shortCategory
+                                    checked:            object.enabled
+                                    onClicked:          object.enabled = checked
+                                }
+                            }
                         }
                     }
-
-                    QGCButton {
-                        text:       qsTr("Clear All")
-                        visible:    enabledCategoryCount > 0
-                        onClicked:  clearAllLogging()
-                    }
                 }
 
-                ColumnLayout {
-                    spacing: ScreenTools.defaultFontPixelHeight / 2
+                // Shown when filtered
+                Flow {
+                    Layout.fillWidth:   true
+                    spacing:            ScreenTools.defaultFontPixelHeight / 2
+                    visible:            searchText.text !== ""
 
                     Repeater {
-                        id:     categoryRepeater
-                        model:  QGroundControl.loggingCategories()
-
-                        QGCCheckBox {
-                            text:       modelData
-                            visible:    searchText.text ? text.match(`(${searchText.text})`, "i") : true
-                            checked:    QGroundControl.categoryLoggingOn(modelData)
-                            onClicked:  updateLoggingCategory(modelData, checked, false /* rebuildCategoryList */)
+                        model: QGroundControl.flatLoggingCategoriesModel()
+
+                        QGCCheckBoxSlider {
+                            Layout.fillWidth:       true
+                            Layout.maximumHeight:   visible ? implicitHeight : 0
+                            text:                   object.fullCategory
+                            visible:                text.match(`(${searchText.text})`, "i")
+                            checked:                object.enabled
+                            onClicked:              object.enabled = checked
                         }
                     }
                 }
@@ -253,4 +280,3 @@ Item {
         }
     }
 }
-
diff --git a/src/QmlControls/AppSettings.qml b/src/QmlControls/AppSettings.qml
index 572a6ebe9eee..aa695912f3d4 100644
--- a/src/QmlControls/AppSettings.qml
+++ b/src/QmlControls/AppSettings.qml
@@ -43,6 +43,11 @@ Rectangle {
         }
     }
 
+    // This need to block click event leakage to underlying map.
+    DeadMouseArea {
+        anchors.fill: parent
+    }
+
     QGCPalette { id: qgcPal }
 
     Component.onCompleted: {
@@ -141,4 +146,3 @@ Rectangle {
         anchors.bottom:         parent.bottom
     }
 }
-
diff --git a/src/QmlControls/BatteryIndicator.qml b/src/QmlControls/BatteryIndicator.qml
index 9ce21cb9e06c..e1273936e833 100644
--- a/src/QmlControls/BatteryIndicator.qml
+++ b/src/QmlControls/BatteryIndicator.qml
@@ -12,10 +12,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-
-
-
-
 import QGroundControl.FactControls
 
 //-------------------------------------------------------------------------
@@ -26,8 +22,8 @@ Item {
     anchors.bottom: parent.bottom
     width:          batteryIndicatorRow.width
 
-    property bool       showIndicator:      true
-    property bool       waitForParameters:  false   // UI won't show until parameters are ready
+    property bool       showIndicator:      _activeVehicle && _activeVehicle.batteries.count > 0
+    property bool       waitForParameters:  true    // UI won't show until parameters are ready
     property Component  expandedPageComponent
 
     property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
@@ -36,33 +32,169 @@ Item {
     property bool   _showPercentage:    _indicatorDisplay.rawValue === 0
     property bool   _showVoltage:       _indicatorDisplay.rawValue === 1
     property bool   _showBoth:          _indicatorDisplay.rawValue === 2
+    property int    _lowestBatteryId:   -1      // -1: show all batteries, otherwise show only battery with this id
 
     // Properties to hold the thresholds
     property int threshold1: _batterySettings.threshold1.rawValue
-    property int threshold2: _batterySettings.threshold2.rawValue   
+    property int threshold2: _batterySettings.threshold2.rawValue
+
+    function _recalcLowestBatteryIdFromVoltage() {
+        if (_activeVehicle) {
+            // If there is only one battery then it is the lowest
+            if (_activeVehicle.batteries.count === 1) {
+                _lowestBatteryId = _activeVehicle.batteries.get(0).id.rawValue
+                return
+            }
+
+            // If we have valid voltage for all batteries we use that to determine lowest battery
+            let allHaveVoltage = true
+            for (var i = 0; i < _activeVehicle.batteries.count; i++) {
+                let battery = _activeVehicle.batteries.get(i)
+                if (isNaN(battery.voltage.rawValue)) {
+                    allHaveVoltage = false
+                    break
+                }
+            }
+            if (allHaveVoltage) {
+                let lowestBattery = _activeVehicle.batteries.get(0)
+                let lowestBatteryId = lowestBattery.id.rawValue
+                for (var i = 1; i < _activeVehicle.batteries.count; i++) {
+                    let battery = _activeVehicle.batteries.get(i)
+                    if (battery.voltage.rawValue < lowestBattery.voltage.rawValue) {
+                        lowestBattery = battery
+                        lowestBatteryId = battery.id.rawValue
+                    }
+                }
+                _lowestBatteryId = lowestBatteryId
+                return
+            }
+        }
+
+        // Couldn't determine lowest battery, show all
+        _lowestBatteryId = -1
+    }
+
+    function _recalcLowestBatteryIdFromPercentage() {
+        if (_activeVehicle) {
+            // If there is only one battery then it is the lowest
+            if (_activeVehicle.batteries.count === 1) {
+                _lowestBatteryId = _activeVehicle.batteries.get(0).id.rawValue
+                return
+            }
+
+            // If we have valid percentage for all batteries we use that to determine lowest battery
+            let allHavePercentage = true
+            for (var i = 0; i < _activeVehicle.batteries.count; i++) {
+                let battery = _activeVehicle.batteries.get(i)
+                if (isNaN(battery.percentRemaining.rawValue)) {
+                    allHavePercentage = false
+                    break
+                }
+            }
+            if (allHavePercentage) {
+                let lowestBattery = _activeVehicle.batteries.get(0)
+                let lowestBatteryId = lowestBattery.id.rawValue
+                for (var i = 1; i < _activeVehicle.batteries.count; i++) {
+                    let battery = _activeVehicle.batteries.get(i)
+                    if (battery.percentRemaining.rawValue < lowestBattery.percentRemaining.rawValue) {
+                        lowestBattery = battery
+                        lowestBatteryId = battery.id.rawValue
+                    }
+                }
+                _lowestBatteryId = lowestBatteryId
+                return
+            }
+        }
+
+        // Couldn't determine lowest battery, show all
+        _lowestBatteryId = -1
+    }
+
+    function _recalcLowestBatteryIdFromChargeState() {
+        if (_activeVehicle) {
+            // If there is only one battery then it is the lowest
+            if (_activeVehicle.batteries.count === 1) {
+                _lowestBatteryId = _activeVehicle.batteries.get(0).id.rawValue
+                return
+            }
+
+            // If we have valid chargeState for all batteries we use that to determine lowest battery
+            let allHaveChargeState = true
+            for (var i = 0; i < _activeVehicle.batteries.count; i++) {
+                let battery = _activeVehicle.batteries.get(i)
+                if (battery.chargeState.rawValue === MAVLink.MAV_BATTERY_CHARGE_STATE_UNDEFINED) {
+                    allHaveChargeState = false
+                    break
+                }
+            }
+            if (allHaveChargeState) {
+                let lowestBattery = _activeVehicle.batteries.get(0)
+                let lowestBatteryId = lowestBattery.id.rawValue
+                for (var i = 1; i < _activeVehicle.batteries.count; i++) {
+                    let battery = _activeVehicle.batteries.get(i)
+                    if (battery.chargeState.rawValue > lowestBattery.chargeState.rawValue) {
+                        lowestBattery = battery
+                        lowestBatteryId = battery.id.rawValue
+                    }
+                }
+                _lowestBatteryId = lowestBatteryId
+                return
+            }
+        }
+
+        // Couldn't determine lowest battery, show all
+        _lowestBatteryId = -1
+    }
+
+    function _recalcLowestBatteryId() {
+        if (!_activeVehicle || _activeVehicle.batteries.count === 0) {
+            _lowestBatteryId = -1
+            return
+        }
+        if (_batterySettings.valueDisplay.rawValue === 0) {
+            // User wants percentage display so use that if available
+            _recalcLowestBatteryIdFromPercentage()
+        } else if (_batterySettings.valueDisplay.rawValue === 1) {
+            // User wants voltage display so use that if available
+            _recalcLowestBatteryIdFromVoltage()
+        }
+        // If we still dont have a lowest battery id then try charge state
+        if (_lowestBatteryId === -1) {
+            _recalcLowestBatteryIdFromChargeState()
+        }
+    }
+
+    Component.onCompleted: _recalcLowestBatteryId()
 
-    Row {
+    Connections {
+        target: _activeVehicle ? _activeVehicle.batteries : null
+        function onCountChanged() {_recalcLowestBatteryId() }
+    }
+
+    QGCPalette { id: qgcPal }
+
+    RowLayout {
         id:             batteryIndicatorRow
         anchors.top:    parent.top
         anchors.bottom: parent.bottom
+        spacing:        ScreenTools.defaultFontPixelWidth / 2
 
         Repeater {
             model: _activeVehicle ? _activeVehicle.batteries : 0
 
             Loader {
-                anchors.top:        parent.top
-                anchors.bottom:     parent.bottom
+                Layout.fillHeight:  true
                 sourceComponent:    batteryVisual
+                visible:            control._lowestBatteryId === -1 || object.id.rawValue === control._lowestBatteryId || !control._batterySettings.consolidateMultipleBatteries.rawValue
 
                 property var battery: object
             }
         }
     }
+
     MouseArea {
         anchors.fill:   parent
-        onClicked: {
-            mainWindow.showIndicatorDrawer(batteryPopup, control)
-        }
+        onClicked:      mainWindow.showIndicatorDrawer(batteryPopup, control)
     }
 
     Component {
@@ -80,19 +212,19 @@ Item {
         id: batteryVisual
 
         Row {
-            anchors.top:    parent.top
-            anchors.bottom: parent.bottom
+            Layout.fillHeight:  true
+            spacing:            ScreenTools.defaultFontPixelWidth / 4
 
             function getBatteryColor() {
                 switch (battery.chargeState.rawValue) {
                     case MAVLink.MAV_BATTERY_CHARGE_STATE_OK:
                         if (!isNaN(battery.percentRemaining.rawValue)) {
                             if (battery.percentRemaining.rawValue > threshold1) {
-                                return qgcPal.colorGreen 
+                                return qgcPal.colorGreen
                             } else if (battery.percentRemaining.rawValue > threshold2) {
-                                return qgcPal.colorYellowGreen 
+                                return qgcPal.colorYellowGreen
                             } else {
-                                return qgcPal.colorYellow 
+                                return qgcPal.colorYellow
                             }
                         } else {
                             return qgcPal.text
@@ -107,7 +239,7 @@ Item {
                     default:
                         return qgcPal.text
                 }
-            }    
+            }
 
             function getBatterySvgSource() {
                 switch (battery.chargeState.rawValue) {
@@ -118,8 +250,8 @@ Item {
                             } else if (battery.percentRemaining.rawValue > threshold2) {
                                 return "/qmlimages/BatteryYellowGreen.svg"
                             } else {
-                                return "/qmlimages/BatteryYellow.svg"    
-                            } 
+                                return "/qmlimages/BatteryYellow.svg"
+                            }
                         }
                     case MAVLink.MAV_BATTERY_CHARGE_STATE_LOW:
                         return "/qmlimages/BatteryOrange.svg" // Low with orange svg
@@ -158,6 +290,34 @@ Item {
                 return qsTr("n/a")
             }
 
+            Timer {
+                id:         debounceRecalcTimer
+                interval:   50
+                running:    false
+                repeat:     false
+                onTriggered: {
+                    control._recalcLowestBatteryId()
+                }
+            }
+            Connections {
+                target: battery.percentRemaining
+                function onRawValueChanged() {
+                    debounceRecalcTimer.restart()
+                }
+            }
+            Connections {
+                target: battery.voltage
+                function onRawValueChanged() {
+                    debounceRecalcTimer.restart()
+                }
+            }
+            Connections {
+                target: battery.chargeState
+                function onRawValueChanged() {
+                    debounceRecalcTimer.restart()
+                }
+            }
+
             QGCColoredImage {
                 anchors.top:        parent.top
                 anchors.bottom:     parent.bottom
@@ -177,7 +337,7 @@ Item {
                 QGCLabel {
                     Layout.alignment:       Qt.AlignHCenter
                     verticalAlignment:      Text.AlignVCenter
-                    color:                  qgcPal.text
+                    color:                  qgcPal.windowTransparentText
                     text:                   getBatteryPercentageText()
                     font.pointSize:         _showBoth ? ScreenTools.defaultFontPointSize : ScreenTools.mediumFontPointSize
                     visible:                _showBoth || _showPercentage
@@ -186,7 +346,7 @@ Item {
                 QGCLabel {
                     Layout.alignment:       Qt.AlignHCenter
                     font.pointSize:         _showBoth ? ScreenTools.defaultFontPointSize : ScreenTools.mediumFontPointSize
-                    color:                  qgcPal.text
+                    color:                  qgcPal.windowTransparentText
                     text:                   getBatteryVoltageText()
                     visible:                _showBoth || _showVoltage
                 }
@@ -283,34 +443,40 @@ Item {
         ColumnLayout {
             spacing: ScreenTools.defaultFontPixelHeight / 2
 
+            property real batteryIconHeight: ScreenTools.defaultFontPixelWidth * 3
+
             FactPanelController { id: controller }
 
             SettingsGroupLayout {
                 heading:            qsTr("Battery Display")
                 Layout.fillWidth:   true
 
-                LabelledFactComboBox {
-                    id:             editModeCheckBox
-                    label:          qsTr("Value")
-                    fact:           _fact
-                    visible:        _fact,visible
+                FactCheckBoxSlider {
+                    Layout.fillWidth:   true
+                    fact:               _batterySettings.consolidateMultipleBatteries
+                    text:               qsTr("Only show battery with lowest charge")
+                    visible:            fact.visible
+                }
 
-                    property Fact _fact: QGroundControl.settingsManager.batteryIndicatorSettings.valueDisplay
+                LabelledFactComboBox {
+                    label:      qsTr("Value")
+                    fact:       _batterySettings.valueDisplay
+                    visible:    fact.visible
                 }
 
                 ColumnLayout {
                     QGCLabel { text: qsTr("Coloring") }
 
                     RowLayout {
-                        spacing: ScreenTools.defaultFontPixelWidth * 0.05  // Reduced spacing between elements
+                        spacing: ScreenTools.defaultFontPixelWidth
 
                         // Battery 100%
                         RowLayout {
                             spacing: ScreenTools.defaultFontPixelWidth * 0.05  // Tighter spacing for icon and label
                             QGCColoredImage {
                                 source: "/qmlimages/BatteryGreen.svg"
-                                width: ScreenTools.defaultFontPixelWidth * 6
-                                height: width
+                                width: height
+                                height: batteryIconHeight
                                 fillMode: Image.PreserveAspectFit
                                 color: qgcPal.colorGreen
                             }
@@ -322,8 +488,8 @@ Item {
                             spacing: ScreenTools.defaultFontPixelWidth * 0.05  // Tighter spacing for icon and field
                             QGCColoredImage {
                                 source: "/qmlimages/BatteryYellowGreen.svg"
-                                width: ScreenTools.defaultFontPixelWidth * 6
-                                height: width
+                                width: height
+                                height: batteryIconHeight
                                 fillMode: Image.PreserveAspectFit
                                 color: qgcPal.colorYellowGreen
                             }
@@ -345,8 +511,8 @@ Item {
                             spacing: ScreenTools.defaultFontPixelWidth * 0.05  // Tighter spacing for icon and field
                             QGCColoredImage {
                                 source: "/qmlimages/BatteryYellow.svg"
-                                width: ScreenTools.defaultFontPixelWidth * 6
-                                height: width
+                                width: height
+                                height: batteryIconHeight
                                 fillMode: Image.PreserveAspectFit
                                 color: qgcPal.colorYellow
                             }
@@ -357,7 +523,7 @@ Item {
                                 enabled: fact.visible
                                 onEditingFinished: {
                                     // Validate and set the new threshold value
-                                    _batterySettings.setThreshold2(parseInt(text));                                
+                                    _batterySettings.setThreshold2(parseInt(text));
                                 }
                             }
                         }
@@ -367,8 +533,8 @@ Item {
                             spacing: ScreenTools.defaultFontPixelWidth * 0.05  // Tighter spacing for icon and label
                             QGCColoredImage {
                                 source: "/qmlimages/BatteryOrange.svg"
-                                width: ScreenTools.defaultFontPixelWidth * 6
-                                height: width
+                                width: height
+                                height: batteryIconHeight
                                 fillMode: Image.PreserveAspectFit
                                 color: qgcPal.colorOrange
                             }
@@ -380,8 +546,8 @@ Item {
                             spacing: ScreenTools.defaultFontPixelWidth * 0.05  // Tighter spacing for icon and label
                             QGCColoredImage {
                                 source: "/qmlimages/BatteryCritical.svg"
-                                width: ScreenTools.defaultFontPixelWidth * 6
-                                height: width
+                                width: height
+                                height: batteryIconHeight
                                 fillMode: Image.PreserveAspectFit
                                 color: qgcPal.colorRed
                             }
@@ -392,8 +558,8 @@ Item {
             }
 
             Loader {
-                Layout.fillWidth: true
-                sourceComponent: expandedPageComponent
+                Layout.fillWidth:   true
+                source:             _activeVehicle.expandedToolbarIndicatorSource("Battery")
             }
 
             SettingsGroupLayout {
@@ -408,7 +574,7 @@ Item {
                         mainWindow.showKnownVehicleComponentConfigPage(AutoPilotPlugin.KnownPowerVehicleComponent)
                         mainWindow.closeIndicatorDrawer()
                     }
-                }                
+                }
             }
         }
     }
diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt
index 9d40c62ca8a7..c377e7bb5ae4 100644
--- a/src/QmlControls/CMakeLists.txt
+++ b/src/QmlControls/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# QML Controls Module
+# Reusable QML UI controls and controllers
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         EditPositionDialogController.cc
@@ -59,6 +64,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# QML Controls Module
+# ----------------------------------------------------------------------------
 qt_add_library(QGroundControlControlsModule STATIC)
 
 set_source_files_properties(ScreenTools.qml PROPERTIES
@@ -73,7 +81,7 @@ qt_add_qml_module(QGroundControlControlsModule
         AltModeDialog.qml
         AppSettings.qml
         APMSubMotorDisplay.qml
-        AppMessages.qml
+        AppLogging.qml
         AutotuneUI.qml
         AxisMonitor.qml
         ClickableColor.qml
@@ -84,7 +92,6 @@ qt_add_qml_module(QGroundControlControlsModule
         EditPositionDialog.qml
         ExclusiveGroupItem.qml
         FactSlider.qml
-        FactSliderPanel.qml
         FileButton.qml
         FlightModeMenu.qml
         HeightIndicator.qml
@@ -121,6 +128,7 @@ qt_add_qml_module(QGroundControlControlsModule
         QGCColoredImage.qml
         QGCColumnButton.qml
         QGCComboBox.qml
+        QGCDelayButton.qml
         QGCDynamicObjectManager.qml
         QGCFileDialog.qml
         QGCFlickable.qml
@@ -167,8 +175,9 @@ qt_add_qml_module(QGroundControlControlsModule
         VehicleRotationCal.qml
         VehicleSummaryRow.qml
 
-# Due to the fact t hatset_source_files_properties with QT_RESOURCE_ALIAS doesn't work in cmombination with qt_qdd_add_qml_module on Windows.
-# We had to move various qml files to this directory to get things to work. We will revisit this in the 5.1 release.
+# NOTE: Due to Windows limitations with set_source_files_properties and qt_add_qml_module,
+# various QML files from other modules are temporarily included here.
+# This will be revisited in a future release.
 
         # src/AnalyzeView/
         AnalyzePage.qml
@@ -225,6 +234,7 @@ qt_add_qml_module(QGroundControlControlsModule
         GPSIndicatorPage.qml
         MainStatusIndicator.qml
         MainStatusIndicatorOfflinePage.qml
+        ParameterDownloadProgress.qml
         PlanViewToolBar.qml
         RemoteIDIndicatorPage.qml
         SignalStrength.qml
@@ -237,7 +247,9 @@ qt_add_qml_module(QGroundControlControlsModule
     NO_PLUGIN
 )
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# Control Configuration Resources
+# ----------------------------------------------------------------------------
 file(GLOB_RECURSE JSON_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.json)
 qt_add_resources(${CMAKE_PROJECT_NAME} json_controls
     PREFIX "/json"
diff --git a/src/QmlControls/DropPanel.qml b/src/QmlControls/DropPanel.qml
index bd439e31be64..4379a1d5b3e2 100644
--- a/src/QmlControls/DropPanel.qml
+++ b/src/QmlControls/DropPanel.qml
@@ -83,7 +83,7 @@ Popup {
             y:      _arrowPointPositionY - _arrowPointWidth
             width:  _arrowPointWidth
             height: _arrowPointWidth * 2
-            
+
             onPaint: {
                 var context = getContext("2d")
                 context.reset()
diff --git a/src/QmlControls/EditPositionDialog.qml b/src/QmlControls/EditPositionDialog.qml
index ef1fd57eba04..905d7bf2f0e1 100644
--- a/src/QmlControls/EditPositionDialog.qml
+++ b/src/QmlControls/EditPositionDialog.qml
@@ -47,7 +47,7 @@ QGCPopupDialog {
             id:                 coordinateSystemCombo
             Layout.fillWidth:   true
             label:              qsTr("Coordinate System")
-            model:              showSetPositionFromVehicle && globals.activeVehicle ? 
+            model:              showSetPositionFromVehicle && globals.activeVehicle ?
                                     [ qsTr("Geographic"), qsTr("Universal Transverse Mercator"), qsTr("Military Grid Reference"), qsTr("Vehicle Position") ] :
                                     [ qsTr("Geographic"), qsTr("Universal Transverse Mercator"), qsTr("Military Grid Reference") ]
         }
diff --git a/src/QmlControls/EditPositionDialogController.cc b/src/QmlControls/EditPositionDialogController.cc
index 44d78de7e0b1..0729122f4c83 100644
--- a/src/QmlControls/EditPositionDialogController.cc
+++ b/src/QmlControls/EditPositionDialogController.cc
@@ -13,7 +13,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(EditPositionDialogControllerLog, "qgc.qmlcontrols.editpositiondialogcontroller")
+QGC_LOGGING_CATEGORY(EditPositionDialogControllerLog, "QMLControls.EditPositionDialogController")
 
 QMap<QString, FactMetaData*> EditPositionDialogController::_metaDataMap;
 
@@ -106,4 +106,3 @@ void EditPositionDialogController::setFromVehicle()
 {
     setCoordinate(MultiVehicleManager::instance()->activeVehicle()->coordinate());
 }
-
diff --git a/src/QmlControls/FWLandingPatternMapVisual.qml b/src/QmlControls/FWLandingPatternMapVisual.qml
index f1d3ff0bd601..a8ccc868f3fd 100644
--- a/src/QmlControls/FWLandingPatternMapVisual.qml
+++ b/src/QmlControls/FWLandingPatternMapVisual.qml
@@ -246,7 +246,7 @@ Item {
             itemCoordinate: _missionItem.landingCoordinate
             visible:        _root.interactive
 
-            onItemCoordinateChanged: _missionItem.moveLandingPosition(itemCoordinate)
+            onItemCoordinateChanged: _missionItem.coordinate = itemCoordinate
         }
     }
 
diff --git a/src/QmlControls/FactSlider.qml b/src/QmlControls/FactSlider.qml
index ab5d24295ad5..7bbd563e0e10 100644
--- a/src/QmlControls/FactSlider.qml
+++ b/src/QmlControls/FactSlider.qml
@@ -32,7 +32,7 @@ ValueSlider {
     property Fact _fact:                    fact ? fact : _nullFact
 
     property bool _loadComplete: false
-    
+
     Component.onCompleted: {
         _loadComplete = true
         if (fact && fact.minIsDefaultForType && fact.min == from) {
diff --git a/src/QmlControls/FactSliderPanel.qml b/src/QmlControls/FactSliderPanel.qml
deleted file mode 100644
index 98d4bf07ec25..000000000000
--- a/src/QmlControls/FactSliderPanel.qml
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import QGroundControl
-
-import QGroundControl.FactControls
-
-import QGroundControl.Controls
-
-
-Column {
-    /// ListModel must contains elements which look like this:
-    ///     ListElement {
-    ///         title:          "Roll sensitivity"
-    ///         description:    "Slide to the left to make roll control faster and more accurate. Slide to the right if roll oscillates or is too twitchy."
-    ///         param:          "MC_ROLL_TC"
-    ///         min:            0
-    ///         max:            100
-    ///         step:           1
-    ///     }
-    property ListModel sliderModel
-
-    property real _margins:         ScreenTools.defaultFontPixelHeight
-    property bool _loadComplete:    false
-
-    Component.onCompleted: _loadComplete = true
-
-    FactPanelController {
-        id: controller
-    }
-
-    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
-
-    Column {
-        id:                 sliderOuterColumn
-        anchors.left:       parent.left
-        anchors.right:      parent.right
-        spacing:            _margins
-
-        Repeater {
-            id:     sliderRepeater
-            model:  sliderModel
-
-            Rectangle {
-                id:                 sliderRect
-                anchors.left:       parent.left
-                anchors.right:      parent.right
-                height:             sliderColumn.y + sliderColumn.height + _margins
-                color:              qgcPal.windowShade
-
-                Column {
-                    id:                 sliderColumn
-                    anchors.margins:    _margins
-                    anchors.left:       parent.left
-                    anchors.right:      parent.right
-                    anchors.top:        sliderRect.top
-
-                    QGCLabel {
-                        text:           title
-                        font.bold:      true
-                    }
-                    Item {
-                        width: 1
-                        height: _margins
-                    }
-
-                    Slider {
-                        anchors.left:       parent.left
-                        anchors.right:      parent.right
-                        from:       min
-                        to:       max
-                        stepSize:           step
-                        //tickmarksEnabled:   true  // FIXME_QT6
-                        value:              _fact.value
-                        id:                 slider
-                        property int handleWidth: 0
-
-                        property Fact _fact: controller.getParameterFact(-1, param)
-
-                        onValueChanged: {
-                            if (_loadComplete && enabled) {
-                                _fact.value = value
-                            }
-                        }
-
-                        // FIXME-QT6 - Controls 2 doesn't do styling this way
-                        /*
-                        style: SliderStyle {
-                            tickmarks: Repeater {
-                                id: repeater
-                                model: control.stepSize > 0 ? 1 + (control.to - control.from) / control.stepSize : 0
-                                property int unused: get()
-                                function get() {
-                                    slider.handleWidth = styleData.handleWidth
-                                    return 0
-                                }
-
-                                Rectangle {
-                                    color: Qt.hsla(qgcPal.text.hslHue, qgcPal.text.hslSaturation, qgcPal.text.hslLightness, 0.5)
-                                    width: 2
-                                    height: 4
-                                    y: repeater.height
-                                    x: styleData.handleWidth / 2 + index * ((repeater.width - styleData.handleWidth) / (repeater.count-1))
-                                }
-                            }
-                        }
-                        */
-                    }
-
-                    Item { // spacing
-                        width: 1
-                        height: 4
-                    }
-
-                    RowLayout {
-                        anchors.left:       parent.left
-                        anchors.right:      parent.right
-                        QGCLabel {
-                            id: leftValueLabel
-                            text: slider.from
-                            horizontalAlignment: Text.AlignLeft
-                        }
-                        Item {
-                            QGCLabel {
-                                visible: slider.value != slider.from && slider.value != slider.to
-                                text: Math.round(slider._fact.value*100000)/100000
-                                x: getX()
-                                function getX() {
-                                    var span = slider.to - slider.from
-                                    var x = slider.handleWidth / 2 + (slider.value-slider.from)/span * (slider.width-slider.handleWidth) - width / 2
-                                    // avoid overlapping text
-                                    var minX = leftValueLabel.x + leftValueLabel.width + _margins/2
-                                    if (x < minX) x = minX
-                                    var maxX = rightValueLabel.x - _margins/2 - width
-                                    if (x > maxX) x = maxX
-                                    return x
-                                }
-                            }
-                        }
-                        QGCLabel {
-                            id: rightValueLabel
-                            text: slider.to
-                            Layout.alignment: Qt.AlignRight
-                        }
-                    }
-
-                    QGCLabel {
-                        text:           description
-                        anchors.left:   parent.left
-                        anchors.right:  parent.right
-                        wrapMode:       Text.WordWrap
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/QmlControls/FactValueGrid.cc b/src/QmlControls/FactValueGrid.cc
index d1cbfba7ceed..4d98054ca597 100644
--- a/src/QmlControls/FactValueGrid.cc
+++ b/src/QmlControls/FactValueGrid.cc
@@ -94,12 +94,12 @@ void FactValueGrid::_activeVehicleChanged(Vehicle* activeVehicle)
     _initForNewVehicle(activeVehicle);
 }
 
-FactValueGrid::~FactValueGrid() 
+FactValueGrid::~FactValueGrid()
 {
     _vehicleCardInstanceList.removeAll(this);
 }
 
-QGCMAVLink::VehicleClass_t FactValueGrid::vehicleClass(void) const 
+QGCMAVLink::VehicleClass_t FactValueGrid::vehicleClass(void) const
 {
     return QGCMAVLink::vehicleClass(currentVehicle()->vehicleType());
 }
@@ -334,7 +334,7 @@ void FactValueGrid::_resetFromSettings(void)
             QGCCorePlugin::instance()->factValueGridCreateDefaultSettings(this);
         }
         _fontSize = settings.value(_fontSizeKey, DefaultFontSize).value<FontSize>();
-    
+
         // Initial setup of empty items
         int cRows       = settings.value(_rowCountKey).toInt();
         int cModelLists = settings.beginReadArray(_columnsKey);
@@ -347,7 +347,7 @@ void FactValueGrid::_resetFromSettings(void)
                 appendColumn();
             }
         }
-    
+
         // Fill in the items from settings
         for (int colIndex=0; colIndex<cModelLists; colIndex++) {
             settings.setArrayIndex(colIndex);
diff --git a/src/QmlControls/FlightModeIndicator.qml b/src/QmlControls/FlightModeIndicator.qml
index 87777de71def..cc07f0047ddf 100644
--- a/src/QmlControls/FlightModeIndicator.qml
+++ b/src/QmlControls/FlightModeIndicator.qml
@@ -13,50 +13,65 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-
-
-
-
 import QGroundControl.FactControls
 
-RowLayout {
-    id:         control
-    spacing:    0
+Item {
+    id:                     control
+    Layout.preferredWidth:  mainLayout.width
 
     property bool   showIndicator:          true
-    property var    expandedPageComponent
-    property bool   waitForParameters:      false
+    property bool   waitForParameters:      true   // UI won't show until parameters are ready
 
     property real fontPointSize:    ScreenTools.largeFontPointSize
     property var  activeVehicle:    QGroundControl.multiVehicleManager.activeVehicle
     property bool allowEditMode:    true
     property bool editMode:         false
 
+    property bool _isVTOL:          activeVehicle ? activeVehicle.vtol : false
+    property bool _vtolInFWDFlight: activeVehicle ? activeVehicle.vtolInFwdFlight : false
+    property var  _vehicleInAir:    activeVehicle ? activeVehicle.flying || activeVehicle.landing : false
+
+    QGCPalette { id: qgcPal }
+
     RowLayout {
-        Layout.fillWidth: true
+        id:                     mainLayout
+        anchors.verticalCenter: parent.verticalCenter
+        spacing:                ScreenTools.defaultFontPixelWidth / 2
 
         QGCColoredImage {
-            id:         flightModeIcon
-            width:      ScreenTools.defaultFontPixelWidth * 3
-            height:     ScreenTools.defaultFontPixelHeight
-            fillMode:   Image.PreserveAspectFit
-            mipmap:     true
-            color:      qgcPal.text
-            source:     "/qmlimages/FlightModesComponentIcon.png"
+            id:                     flightModeIcon
+            Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 3
+            Layout.preferredHeight: ScreenTools.defaultFontPixelHeight
+            fillMode:               Image.PreserveAspectFit
+            mipmap:                 true
+            color:                  qgcPal.windowTransparentText
+            source:                 "/qmlimages/FlightModesComponentIcon.png"
         }
 
         QGCLabel {
+            id:                 flightModeLabel
             text:               activeVehicle ? activeVehicle.flightMode : qsTr("N/A", "No data to display")
+            color:              qgcPal.windowTransparentText
             font.pointSize:     fontPointSize
-            Layout.alignment:   Qt.AlignCenter
 
-            MouseArea {
-                anchors.fill:   parent
-                onClicked:      mainWindow.showIndicatorDrawer(drawerComponent, control)
-            }
+        }
+
+        QGCLabel {
+            id:                     vtolModeLabel
+            Layout.alignment:       Qt.AlignVCenter
+            horizontalAlignment:    Text.AlignHCenter
+            text:                   _vtolInFWDFlight ? qsTr("FW\nVTOL") : qsTr("MR\nVTOL")
+            font.pointSize:         ScreenTools.smallFontPointSize
+            wrapMode:               Text.WordWrap
+            visible:                _isVTOL
         }
     }
 
+    MouseArea {
+        anchors.fill:   mainLayout
+        onClicked:      mainWindow.showIndicatorDrawer(drawerComponent, control)
+    }
+
     Component {
         id: drawerComponent
 
@@ -85,7 +100,7 @@ RowLayout {
             property var    activeVehicle:            QGroundControl.multiVehicleManager.activeVehicle
             property var    flightModeSettings:       QGroundControl.settingsManager.flightModeSettings
             property var    hiddenFlightModesFact:    null
-            property var    hiddenFlightModesList:    [] 
+            property var    hiddenFlightModesList:    []
 
             Component.onCompleted: {
                 // Hidden flight modes are classified by firmware and vehicle class
@@ -126,6 +141,18 @@ RowLayout {
                 }
             }
 
+            QGCDelayButton {
+                id:                 vtolTransitionButton
+                Layout.fillWidth:   true
+                text:               _vtolInFWDFlight ? qsTr("Transition to Multi-Rotor") : qsTr("Transition to Fixed Wing")
+                visible:            _isVTOL && _vehicleInAir
+
+                onActivated: {
+                    _activeVehicle.vtolInFwdFlight = !_vtolInFWDFlight
+                    mainWindow.closeIndicatorDrawer()
+                }
+            }
+
             Repeater {
                 id:     modeRepeater
                 model:  activeVehicle ? activeVehicle.flightModes : []
@@ -134,12 +161,13 @@ RowLayout {
                     spacing: ScreenTools.defaultFontPixelWidth
                     visible: editMode || !hiddenFlightModesList.find(item => { return item === modelData } )
 
-                    QGCButton {
+                    QGCDelayButton {
                         id:                 modeButton
                         text:               modelData
+                        delay:              flightModeSettings.requireModeChangeConfirmation.rawValue ? defaultDelay : 0
                         Layout.fillWidth:   true
 
-                        onClicked: {
+                        onActivated: {
                             if (editMode) {
                                 parent.children[1].toggle()
                                 parent.children[1].clicked()
@@ -192,16 +220,24 @@ RowLayout {
             Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 60
             spacing:                margins / 2
 
-            property var  qgcPal:   QGroundControl.globalPalette
-            property real margins:  ScreenTools.defaultFontPixelHeight
+            property var  qgcPal:               QGroundControl.globalPalette
+            property real margins:              ScreenTools.defaultFontPixelHeight
+            property var  flightModeSettings:   QGroundControl.settingsManager.flightModeSettings
 
             Loader {
-                sourceComponent: expandedPageComponent
+                Layout.fillWidth:   true
+                source:             _activeVehicle.expandedToolbarIndicatorSource("FlightMode")
             }
 
             SettingsGroupLayout {
                 Layout.fillWidth:  true
 
+                FactCheckBoxSlider {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Click and Hold to Confirm Mode Change")
+                    fact:               flightModeSettings.requireModeChangeConfirmation
+                }
+
                 RowLayout {
                     Layout.fillWidth:   true
                     enabled:            control.allowEditMode
diff --git a/src/QmlControls/FlightModeMenuIndicator.qml b/src/QmlControls/FlightModeMenuIndicator.qml
index 9fbb53658ce9..0a7af7e3409e 100644
--- a/src/QmlControls/FlightModeMenuIndicator.qml
+++ b/src/QmlControls/FlightModeMenuIndicator.qml
@@ -135,7 +135,7 @@ RowLayout {
 
                 RowLayout {
                     Layout.fillWidth:   true
-                    visible:            _mpcLandSpeedFact && controller.vehicle && !controller.vehicle.fixedWing 
+                    visible:            _mpcLandSpeedFact && controller.vehicle && !controller.vehicle.fixedWing
 
                     QGCLabel { Layout.fillWidth: true; text: qsTr("Land Descent Rate:") }
                     FactTextField {
diff --git a/src/QmlControls/FlightPathSegment.cc b/src/QmlControls/FlightPathSegment.cc
index 96b7af1b3e95..43ea069541fb 100644
--- a/src/QmlControls/FlightPathSegment.cc
+++ b/src/QmlControls/FlightPathSegment.cc
@@ -11,7 +11,7 @@
 #include "QGC.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(FlightPathSegmentLog, "FlightPathSegmentLog")
+QGC_LOGGING_CATEGORY(FlightPathSegmentLog, "Plan.FlightPathSegment")
 
 FlightPathSegment::FlightPathSegment(SegmentType segmentType, const QGeoCoordinate& coord1, double amslCoord1Alt, const QGeoCoordinate& coord2, double amslCoord2Alt, bool queryTerrainData, QObject* parent)
     : QObject           (parent)
diff --git a/src/QmlControls/FlyViewToolBar.qml b/src/QmlControls/FlyViewToolBar.qml
index e938d9429f41..97b016486c11 100644
--- a/src/QmlControls/FlyViewToolBar.qml
+++ b/src/QmlControls/FlyViewToolBar.qml
@@ -15,19 +15,16 @@ import QtQuick.Dialogs
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
-
 Rectangle {
-    id:     _root
+    id:     control
     width:  parent.width
     height: ScreenTools.toolbarHeight
-    color:  qgcPal.toolbarBackground
+    color:  "transparent"
 
     property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
     property bool   _communicationLost: _activeVehicle ? _activeVehicle.vehicleLinkManager.communicationLost : false
     property color  _mainStatusBGColor: qgcPal.brandingPurple
+    property real   _leftRightMargin:   ScreenTools.defaultFontPixelWidth * 0.75
 
     function dropMainStatusIndicatorTool() {
         mainStatusIndicator.dropMainStatusIndicator();
@@ -41,171 +38,96 @@ Rectangle {
         anchors.right:  parent.right
         anchors.bottom: parent.bottom
         height:         1
-        color:          "black"
-        visible:        qgcPal.globalTheme === QGCPalette.Light
+        color:          qgcPal.toolbarDivider
     }
 
     Rectangle {
-        anchors.fill: viewButtonRow
-        
+        id:             gradientBackground
+        anchors.top:    parent.top
+        anchors.bottom: parent.bottom
+        anchors.left:   parent.left
+        width:          mainStatusLayout.width
+        opacity:        qgcPal.windowTransparent.a
+
         gradient: Gradient {
             orientation: Gradient.Horizontal
-            GradientStop { position: 0;                                     color: _mainStatusBGColor }
-            GradientStop { position: currentButton.x + currentButton.width; color: _mainStatusBGColor }
-            GradientStop { position: 1;                                     color: _root.color }
+            GradientStop { position: 0; color: _mainStatusBGColor }
+            //GradientStop { position: qgcButton.x + qgcButton.width; color: _mainStatusBGColor }
+            GradientStop { position: 1; color: qgcPal.window }
         }
     }
 
-    RowLayout {
-        id:                     viewButtonRow
-        anchors.bottomMargin:   1
-        anchors.top:            parent.top
-        anchors.bottom:         parent.bottom
-        spacing:                ScreenTools.defaultFontPixelWidth / 2
-
-        QGCToolBarButton {
-            id:                     currentButton
-            Layout.preferredHeight: viewButtonRow.height
-            icon.source:            "/res/QGCLogoFull.svg"
-            logo:                   true
-            onClicked:              mainWindow.showToolSelectDialog()
-        }
-
-        MainStatusIndicator {
-            id: mainStatusIndicator
-            Layout.preferredHeight: viewButtonRow.height
-        }
-
-        QGCButton {
-            id:                 disconnectButton
-            text:               qsTr("Disconnect")
-            onClicked:          _activeVehicle.closeVehicle()
-            visible:            _activeVehicle && _communicationLost
-        }
+    Rectangle {
+        anchors.top:    parent.top
+        anchors.bottom: parent.bottom
+        anchors.left:   gradientBackground.right
+        anchors.right:  parent.right
+        color:          qgcPal.windowTransparent
     }
 
-    QGCFlickable {
-        id:                     toolsFlickable
-        anchors.leftMargin:     ScreenTools.defaultFontPixelWidth * ScreenTools.largeFontPointRatio * 1.5
-        anchors.rightMargin:    ScreenTools.defaultFontPixelWidth / 2
-        anchors.left:           viewButtonRow.right
+    RowLayout {
+        id:                     mainLayout
         anchors.bottomMargin:   1
+        anchors.rightMargin:    control._leftRightMargin
         anchors.top:            parent.top
         anchors.bottom:         parent.bottom
+        anchors.left:           parent.left
         anchors.right:          parent.right
-        contentWidth:           toolIndicators.width
-        flickableDirection:     Flickable.HorizontalFlick
-
-        FlyViewToolBarIndicators { id: toolIndicators }
-    }
-
-    //-------------------------------------------------------------------------
-    //-- Branding Logo
-    Image {
-        anchors.right:          parent.right
-        anchors.top:            parent.top
-        anchors.bottom:         parent.bottom
-        anchors.margins:        ScreenTools.defaultFontPixelHeight * 0.66
-        visible:                _activeVehicle && !_communicationLost && x > (toolsFlickable.x + toolsFlickable.contentWidth + ScreenTools.defaultFontPixelWidth)
-        fillMode:               Image.PreserveAspectFit
-        source:                 _outdoorPalette ? _brandImageOutdoor : _brandImageIndoor
-        mipmap:                 true
-
-        property bool   _outdoorPalette:        qgcPal.globalTheme === QGCPalette.Light
-        property bool   _corePluginBranding:    QGroundControl.corePlugin.brandImageIndoor.length != 0
-        property string _userBrandImageIndoor:  QGroundControl.settingsManager.brandImageSettings.userBrandImageIndoor.value
-        property string _userBrandImageOutdoor: QGroundControl.settingsManager.brandImageSettings.userBrandImageOutdoor.value
-        property bool   _userBrandingIndoor:    QGroundControl.settingsManager.brandImageSettings.visible && _userBrandImageIndoor.length != 0
-        property bool   _userBrandingOutdoor:   QGroundControl.settingsManager.brandImageSettings.visible && _userBrandImageOutdoor.length != 0
-        property string _brandImageIndoor:      brandImageIndoor()
-        property string _brandImageOutdoor:     brandImageOutdoor()
-
-        function brandImageIndoor() {
-            if (_userBrandingIndoor) {
-                return _userBrandImageIndoor
-            } else {
-                if (_userBrandingOutdoor) {
-                    return _userBrandImageOutdoor
-                } else {
-                    if (_corePluginBranding) {
-                        return QGroundControl.corePlugin.brandImageIndoor
-                    } else {
-                        return _activeVehicle ? _activeVehicle.brandImageIndoor : ""
-                    }
+        spacing:                ScreenTools.defaultFontPixelWidth
+
+        RowLayout {
+            id:                 leftStatusLayout
+            Layout.fillHeight:  true
+            Layout.alignment:   Qt.AlignLeft
+            spacing:            ScreenTools.defaultFontPixelWidth * 2
+
+            RowLayout {
+                id:                 mainStatusLayout
+                Layout.fillHeight:  true
+                spacing:            0
+
+                QGCToolBarButton {
+                    id:                 qgcButton
+                    Layout.fillHeight:  true
+                    icon.source:        "/res/QGCLogoFull.svg"
+                    logo:               true
+                    onClicked:          mainWindow.showToolSelectDialog()
                 }
-            }
-        }
 
-        function brandImageOutdoor() {
-            if (_userBrandingOutdoor) {
-                return _userBrandImageOutdoor
-            } else {
-                if (_userBrandingIndoor) {
-                    return _userBrandImageIndoor
-                } else {
-                    if (_corePluginBranding) {
-                        return QGroundControl.corePlugin.brandImageOutdoor
-                    } else {
-                        return _activeVehicle ? _activeVehicle.brandImageOutdoor : ""
-                    }
+                MainStatusIndicator {
+                    id:                 mainStatusIndicator
+                    Layout.fillHeight:  true
                 }
             }
-        }
-    }
-
-    // Small parameter download progress bar
-    Rectangle {
-        anchors.bottom: parent.bottom
-        height:         _root.height * 0.05
-        width:          _activeVehicle ? _activeVehicle.loadProgress * parent.width : 0
-        color:          qgcPal.colorGreen
-        visible:        !largeProgressBar.visible
-    }
 
-    // Large parameter download progress bar
-    Rectangle {
-        id:             largeProgressBar
-        anchors.bottom: parent.bottom
-        anchors.left:   parent.left
-        anchors.right:  parent.right
-        height:         parent.height
-        color:          qgcPal.window
-        visible:        _showLargeProgress
-
-        property bool _initialDownloadComplete: _activeVehicle ? _activeVehicle.initialConnectComplete : true
-        property bool _userHide:                false
-        property bool _showLargeProgress:       !_initialDownloadComplete && !_userHide && qgcPal.globalTheme === QGCPalette.Light
-
-        Connections {
-            target:                 QGroundControl.multiVehicleManager
-            function onActiveVehicleChanged(activeVehicle) { largeProgressBar._userHide = false }
-        }
+            QGCButton {
+                id:         disconnectButton
+                text:       qsTr("Disconnect")
+                onClicked:  _activeVehicle.closeVehicle()
+                visible:    _activeVehicle && _communicationLost
+            }
 
-        Rectangle {
-            anchors.top:    parent.top
-            anchors.bottom: parent.bottom
-            width:          _activeVehicle ? _activeVehicle.loadProgress * parent.width : 0
-            color:          qgcPal.colorGreen
+            FlightModeIndicator {
+                Layout.fillHeight:  true
+                visible:            _activeVehicle
+            }
         }
 
-        QGCLabel {
-            anchors.centerIn:   parent
-            text:               qsTr("Downloading")
-            font.pointSize:     ScreenTools.largeFontPointSize
-        }
+        QGCFlickable {
+            id:                     indicatorsFlickable
+            Layout.alignment:       Qt.AlignRight
+            Layout.fillHeight:      true
+            Layout.preferredWidth:  Math.min(contentWidth, availableWidth)
+            contentWidth:           toolIndicators.width
+            flickableDirection:     Flickable.HorizontalFlick
 
-        QGCLabel {
-            anchors.margins:    _margin
-            anchors.right:      parent.right
-            anchors.bottom:     parent.bottom
-            text:               qsTr("Click anywhere to hide")
+            property real availableWidth: mainLayout.width - leftStatusLayout.width
 
-            property real _margin: ScreenTools.defaultFontPixelWidth / 2
+            FlyViewToolBarIndicators { id: toolIndicators }
         }
+    }
 
-        MouseArea {
-            anchors.fill:   parent
-            onClicked:      largeProgressBar._userHide = true
-        }
+    ParameterDownloadProgress {
+        anchors.fill: parent
     }
 }
diff --git a/src/QmlControls/FlyViewToolBarIndicators.qml b/src/QmlControls/FlyViewToolBarIndicators.qml
index da9fbb7b2b5b..afa00d6d749e 100644
--- a/src/QmlControls/FlyViewToolBarIndicators.qml
+++ b/src/QmlControls/FlyViewToolBarIndicators.qml
@@ -13,48 +13,44 @@ import QGroundControl
 import QGroundControl.Controls
 import QGroundControl.Toolbar
 
-//-------------------------------------------------------------------------
-//-- Toolbar Indicators
-Row {
-    id:                 indicatorRow
-    anchors.top:        parent.top
-    anchors.bottom:     parent.bottom
-    anchors.margins:    _toolIndicatorMargins
-    spacing:            ScreenTools.defaultFontPixelWidth * 1.75
+Item {
+    anchors.top:    parent.top
+    anchors.bottom: parent.bottom
+    width:          mainLayout.width + _widthMargin
 
     property var  _activeVehicle:           QGroundControl.multiVehicleManager.activeVehicle
     property real _toolIndicatorMargins:    ScreenTools.defaultFontPixelHeight * 0.66
-
-    Repeater {
-        id:     appRepeater
-        model:  QGroundControl.corePlugin.toolBarIndicators
-        Loader {
-            anchors.top:        parent.top
-            anchors.bottom:     parent.bottom
-            source:             modelData
-            visible:            item.showIndicator
+    property real _widthMargin:             _toolIndicatorMargins * 2
+
+    Row {
+        id:                 mainLayout
+        anchors.margins:    _toolIndicatorMargins
+        anchors.left:       parent.left
+        anchors.top:        parent.top
+        anchors.bottom:     parent.bottom
+        spacing:            ScreenTools.defaultFontPixelWidth * 1.75
+
+        Repeater {
+            id:     appRepeater
+            model:  QGroundControl.corePlugin.toolBarIndicators
+            Loader {
+                anchors.top:        parent.top
+                anchors.bottom:     parent.bottom
+                source:             modelData
+                visible:            item.showIndicator
+            }
         }
-    }
-
-    Repeater {
-        id:     toolIndicatorsRepeater
-        model:  _activeVehicle ? _activeVehicle.toolIndicators : []
 
-        Loader {
-            anchors.top:        parent.top
-            anchors.bottom:     parent.bottom
-            source:             modelData
-            visible:            item.showIndicator
-        }
-    }
+        Repeater {
+            id:     toolIndicatorsRepeater
+            model:  _activeVehicle ? _activeVehicle.toolIndicators : []
 
-    Repeater {
-        model: _activeVehicle ? _activeVehicle.modeIndicators : []
-        Loader {
-            anchors.top:        parent.top
-            anchors.bottom:     parent.bottom
-            source:             modelData
-            visible:            item.showIndicator
+            Loader {
+                anchors.top:        parent.top
+                anchors.bottom:     parent.bottom
+                source:             modelData
+                visible:            item.showIndicator
+            }
         }
     }
 }
diff --git a/src/QmlControls/GPSIndicator.qml b/src/QmlControls/GPSIndicator.qml
index d698c3c33646..e6f3b3c5bed7 100644
--- a/src/QmlControls/GPSIndicator.qml
+++ b/src/QmlControls/GPSIndicator.qml
@@ -13,9 +13,6 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
 // Used as the base class control for nboth VehicleGPSIndicator and RTKGPSIndicator
 
 Item {
@@ -27,6 +24,8 @@ Item {
     property var    _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
     property bool   _rtkConnected:  QGroundControl.gpsRtk.connected.value
 
+    QGCPalette { id: qgcPal }
+
     Row {
         id:             gpsIndicatorRow
         anchors.top:    parent.top
@@ -42,7 +41,7 @@ Item {
                 id:                     gpsLabel
                 rotation:               90
                 text:                   qsTr("RTK")
-                color:                  qgcPal.buttonText
+                color:                  qgcPal.windowTransparentText
                 anchors.verticalCenter: parent.verticalCenter
                 visible:                _rtkConnected
             }
@@ -56,7 +55,7 @@ Item {
                 fillMode:           Image.PreserveAspectFit
                 sourceSize.height:  height
                 opacity:            (_activeVehicle && _activeVehicle.gps.count.value >= 0) ? 1 : 0.5
-                color:              qgcPal.buttonText
+                color:              qgcPal.windowTransparentText
             }
         }
 
@@ -68,13 +67,13 @@ Item {
 
             QGCLabel {
                 anchors.horizontalCenter:   hdopValue.horizontalCenter
-                color:              qgcPal.buttonText
+                color:              qgcPal.windowTransparentText
                 text:               _activeVehicle ? _activeVehicle.gps.count.valueString : ""
             }
 
             QGCLabel {
                 id:     hdopValue
-                color:  qgcPal.buttonText
+                color:  qgcPal.windowTransparentText
                 text:   _activeVehicle ? _activeVehicle.gps.hdop.value.toFixed(1) : ""
             }
         }
diff --git a/src/QmlControls/HorizontalFactValueGrid.qml b/src/QmlControls/HorizontalFactValueGrid.qml
index d25234cdd0d5..379f29d4104a 100644
--- a/src/QmlControls/HorizontalFactValueGrid.qml
+++ b/src/QmlControls/HorizontalFactValueGrid.qml
@@ -116,7 +116,7 @@ HorizontalFactValueGridTemplate {
                 QGCButton {
                     Layout.preferredWidth:  ScreenTools.minTouchPixels
                     Layout.fillHeight:      true
-                    topPadding:             0                
+                    topPadding:             0
                     bottomPadding:          0
                     leftPadding:            0
                     rightPadding:           0
@@ -128,7 +128,7 @@ HorizontalFactValueGridTemplate {
                 QGCButton {
                     Layout.preferredWidth:  ScreenTools.minTouchPixels
                     Layout.fillHeight:      true
-                    topPadding:             0                
+                    topPadding:             0
                     bottomPadding:          0
                     leftPadding:            0
                     rightPadding:           0
@@ -147,7 +147,7 @@ HorizontalFactValueGridTemplate {
             QGCButton {
                 Layout.fillWidth:       true
                 Layout.preferredHeight: ScreenTools.minTouchPixels
-                topPadding:             0                
+                topPadding:             0
                 bottomPadding:          0
                 leftPadding:            0
                 rightPadding:           0
@@ -159,7 +159,7 @@ HorizontalFactValueGridTemplate {
             QGCButton {
                 Layout.fillWidth:       true
                 Layout.preferredHeight: parent.height
-                topPadding:             0                
+                topPadding:             0
                 bottomPadding:          0
                 leftPadding:            0
                 rightPadding:           0
diff --git a/src/QmlControls/InstrumentValueEditDialog.qml b/src/QmlControls/InstrumentValueEditDialog.qml
index b870e2b0d50d..0ecc527c6990 100644
--- a/src/QmlControls/InstrumentValueEditDialog.qml
+++ b/src/QmlControls/InstrumentValueEditDialog.qml
@@ -161,16 +161,16 @@ QGCPopupDialog {
                             QGCTextField {
                                 enabled:                textRadio.checked
                                 Layout.minimumWidth:    iconOptionInputs.width
-                                text:                   textRadio.checked 
+                                text:                   textRadio.checked
                                                             ? instrumentValueData.text
                                                             : instrumentValueData.fact ? instrumentValueData.fact.shortDescription : qsTr("Label")
-                                onEditingFinished:      instrumentValueData.text = text 
+                                onEditingFinished:      instrumentValueData.text = text
                             }
                         }
                     }
 
                     LabelledComboBox {
-                        label:          qsTr("Size") 
+                        label:          qsTr("Size")
                         model:          instrumentValueData.factValueGrid.fontSizeNames
                         currentIndex:   instrumentValueData.factValueGrid.fontSize
                         onActivated:    (index) => { instrumentValueData.factValueGrid.fontSize = index }
@@ -178,7 +178,7 @@ QGCPopupDialog {
 
                     QGCCheckBoxSlider {
                         Layout.fillWidth: true
-                        text:       qsTr("Show Units") 
+                        text:       qsTr("Show Units")
                         checked:    instrumentValueData.showUnits
                         onClicked:  instrumentValueData.showUnits = checked
                     }
@@ -198,7 +198,7 @@ QGCPopupDialog {
 
                         QGCLabel {
                             Layout.fillWidth:       true
-                            text:                   qsTr("Type") 
+                            text:                   qsTr("Type")
                         }
 
                         QGCComboBox {
diff --git a/src/QmlControls/InstrumentValueValue.qml b/src/QmlControls/InstrumentValueValue.qml
index 1bf3e199cfeb..c8ef3b4fbbb1 100644
--- a/src/QmlControls/InstrumentValueValue.qml
+++ b/src/QmlControls/InstrumentValueValue.qml
@@ -43,7 +43,7 @@ ColumnLayout {
             if (instrumentValueData.fact) {
                 return instrumentValueData.fact.enumOrValueString + (instrumentValueData.showUnits ? " " + instrumentValueData.fact.units : "")
             } else {
-                return qsTr("--.--")
+                return qsTr("--")
             }
         }
     }
diff --git a/src/QmlControls/JoystickThumbPad.qml b/src/QmlControls/JoystickThumbPad.qml
index 41b258972c31..fcf430c0a793 100644
--- a/src/QmlControls/JoystickThumbPad.qml
+++ b/src/QmlControls/JoystickThumbPad.qml
@@ -26,14 +26,14 @@ Item {
     property real   stickPositionX:         _centerXY
     property real   stickPositionY:         !yAxisReCenter ? height : height / 2
     property bool   alredyCreated:          false
-    
+
     QGCMapPalette { id: mapPal }
 
     onStickPositionXChanged:            calculateXAxis()
     onStickPositionYChanged:            calculateYAxis()
     onYAxisPositiveRangeOnlyChanged:    calculateYAxis()
-    onYAxisReCenterChanged:             yAxisReCentered()     
-    
+    onYAxisReCenterChanged:             yAxisReCentered()
+
     function yAxisReCentered() {
         if( yAxisReCenter ) {
             yAxis = yAxisPositiveRangeOnly ? 0.5 : 0
@@ -41,7 +41,7 @@ Item {
         }
         if( !alredyCreated && !yAxisReCenter ) {
             yAxis = yAxisPositiveRangeOnly ? 0 : -1
-            stickPositionY = _joyRoot.height            
+            stickPositionY = _joyRoot.height
         }
         if ( alredyCreated && !yAxisReCenter ){
             yAxis = yAxisPositiveRangeOnly ? 0.5 : 0
@@ -51,7 +51,7 @@ Item {
         return yAxis
     }
 
-    //We prevent Joystick to move while the screen is resizing 
+    //We prevent Joystick to move while the screen is resizing
     function resize( yPositionAfterResize ) {
         if(_joyRoot.height <= 0) {
             return;
diff --git a/src/QmlControls/LabelledButton.qml b/src/QmlControls/LabelledButton.qml
index c4ab1cb52065..15e95f20b7b8 100644
--- a/src/QmlControls/LabelledButton.qml
+++ b/src/QmlControls/LabelledButton.qml
@@ -24,9 +24,9 @@ RowLayout {
     id:         _root
     spacing:    ScreenTools.defaultFontPixelWidth * 2
 
-    QGCLabel { 
+    QGCLabel {
         id:                 _label
-        Layout.fillWidth:   true 
+        Layout.fillWidth:   true
     }
 
     QGCButton {
@@ -35,4 +35,3 @@ RowLayout {
         onClicked:              _root.clicked()
     }
 }
-
diff --git a/src/QmlControls/LabelledComboBox.qml b/src/QmlControls/LabelledComboBox.qml
index 4cd8698ba258..460655f956dd 100644
--- a/src/QmlControls/LabelledComboBox.qml
+++ b/src/QmlControls/LabelledComboBox.qml
@@ -19,15 +19,16 @@ RowLayout {
     property alias model:                   _comboBox.model
     property alias currentIndex:            _comboBox.currentIndex
     property alias currentText:             _comboBox.currentText
+    property alias alternateText:           _comboBox.alternateText
     property var   comboBox:                _comboBox
     property real  comboBoxPreferredWidth:  -1
 
-    spacing: ScreenTools.defaultFontPixelWidth * 2
+    spacing: ScreenTools.defaultFontPixelWidth
 
     signal activated(int index)
 
     QGCLabel {
-        id:                 label  
+        id:                 label
         Layout.fillWidth:   true
     }
 
diff --git a/src/QmlControls/LabelledLabel.qml b/src/QmlControls/LabelledLabel.qml
index fdfb6f5cd02a..826f75c1318c 100644
--- a/src/QmlControls/LabelledLabel.qml
+++ b/src/QmlControls/LabelledLabel.qml
@@ -21,9 +21,9 @@ RowLayout {
 
     spacing: ScreenTools.defaultFontPixelWidth * 2
 
-    QGCLabel { 
+    QGCLabel {
         id:                 _labelLabel
-        Layout.fillWidth:   true 
+        Layout.fillWidth:   true
     }
 
     QGCLabel {
@@ -31,4 +31,3 @@ RowLayout {
         Layout.preferredWidth:  labelPreferredWidth
     }
 }
-
diff --git a/src/QmlControls/LabelledSlider.qml b/src/QmlControls/LabelledSlider.qml
index a8a4f95cbad7..3407eb5afde0 100644
--- a/src/QmlControls/LabelledSlider.qml
+++ b/src/QmlControls/LabelledSlider.qml
@@ -23,7 +23,7 @@ RowLayout {
     spacing: ScreenTools.defaultFontPixelWidth * 2
 
     QGCLabel {
-        id:                 label  
+        id:                 label
         Layout.fillWidth:   true
     }
 
@@ -32,4 +32,3 @@ RowLayout {
         Layout.preferredWidth:  sliderPreferredWidth
     }
 }
-
diff --git a/src/QmlControls/MAVLinkChart.qml b/src/QmlControls/MAVLinkChart.qml
index 2fd29b63722a..d07c5110ee69 100644
--- a/src/QmlControls/MAVLinkChart.qml
+++ b/src/QmlControls/MAVLinkChart.qml
@@ -7,8 +7,6 @@ import QGroundControl
 
 import QGroundControl.Controls
 
-
-
 ChartView {
     id:                 chartView
     theme:              ChartView.ChartThemeDark
@@ -19,15 +17,15 @@ ChartView {
     backgroundRoundness: 0
     margins.bottom:     ScreenTools.defaultFontPixelHeight * 1.5
     margins.top:        chartHeader.height + (ScreenTools.defaultFontPixelHeight * 2)
+    visible:            chartController.chartFields.length > 0
 
-    property var chartController:   null
-    property var seriesColors:      ["#00E04B","#DE8500","#F32836","#BFBFBF","#536DFF","#EECC44"]
+    required property var inspectorController
+    required property int chartIndex
+
+    property var _seriesColors: ["#00E04B","#DE8500","#F32836","#BFBFBF","#536DFF","#EECC44"]
 
     function addDimension(field) {
-        if(!chartController) {
-            chartController = controller.createChart()
-        }
-        var color   = chartView.seriesColors[chartView.count]
+        var color   = _seriesColors[chartView.count]
         var serie   = createSeries(ChartView.SeriesTypeLine, field.label)
         serie.axisX = axisX
         serie.axisY = axisY
@@ -41,21 +39,17 @@ ChartView {
         if(chartController) {
             chartView.removeSeries(field.series)
             chartController.delSeries(field)
-            if(chartView.count === 0) {
-                controller.deleteChart(chartController)
-                chartController = null
-            }
         }
     }
 
-    Connections {
-        target: QGroundControl.multiVehicleManager
+    function roomForNewDimension() {
+        return chartController.chartFields.length < _seriesColors.length
+    }
 
-        function onVehicleRemoved(vehicle) {
-            // Hack to prevent references to deleted QGCMavlinkSystem fields. https://github.com/mavlink/qgroundcontrol/issues/13077
-            controller.deleteChart(chartController);
-            chartController = null;
-        }
+    MAVLinkChartController {
+        id:                     chartController
+        inspectorController:    chartView.inspectorController
+        chartIndex:             chartView.chartIndex
     }
 
     DateTimeAxis {
diff --git a/src/QmlControls/MainStatusIndicator.qml b/src/QmlControls/MainStatusIndicator.qml
index 9ed6b14b1b14..07b3bee1585d 100644
--- a/src/QmlControls/MainStatusIndicator.qml
+++ b/src/QmlControls/MainStatusIndicator.qml
@@ -13,37 +13,38 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
-
 RowLayout {
     id:         control
     spacing:    ScreenTools.defaultFontPixelWidth
 
     property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
-    property var    _vehicleInAir:      _activeVehicle ? _activeVehicle.flying || _activeVehicle.landing : false
-    property bool   _vtolInFWDFlight:   _activeVehicle ? _activeVehicle.vtolInFwdFlight : false
     property bool   _armed:             _activeVehicle ? _activeVehicle.armed : false
     property real   _margins:           ScreenTools.defaultFontPixelWidth
     property real   _spacing:           ScreenTools.defaultFontPixelWidth / 2
+    property bool   _allowForceArm:      false
     property bool   _healthAndArmingChecksSupported: _activeVehicle ? _activeVehicle.healthAndArmingCheckReport.supported : false
+    property bool   _vehicleFlies:      _activeVehicle ? _activeVehicle.airShip || _activeVehicle.fixedWing || _activeVehicle.vtol || _activeVehicle.multiRotor : false
+    property var    _vehicleInAir:      _activeVehicle ? _activeVehicle.flying || _activeVehicle.landing : false
+    property bool   _vtolInFWDFlight:   _activeVehicle ? _activeVehicle.vtolInFwdFlight : false
 
     function dropMainStatusIndicator() {
         let overallStatusComponent = _activeVehicle ? overallStatusIndicatorPage : overallStatusOfflineIndicatorPage
         mainWindow.showIndicatorDrawer(overallStatusComponent, control)
     }
 
+    QGCPalette { id: qgcPal }
+
     QGCLabel {
         id:                 mainStatusLabel
         Layout.fillHeight:  true
-        Layout.preferredWidth: contentWidth + vehicleMessagesIcon.width + control.spacing
+        Layout.preferredWidth: contentWidth + (vehicleMessagesIcon.visible ? vehicleMessagesIcon.width + control.spacing : 0)
         verticalAlignment:  Text.AlignVCenter
         text:               mainStatusText()
+        color:              qgcPal.windowTransparentText
         font.pointSize:     ScreenTools.largeFontPointSize
 
         property string _commLostText:      qsTr("Comms Lost")
-        property string _readyToFlyText:    qsTr("Ready To Fly")
+        property string _readyToFlyText:    control._vehicleFlies ? qsTr("Ready To Fly") : qsTr("Ready")
         property string _notReadyToFlyText: qsTr("Not Ready")
         property string _disconnectedText:  qsTr("Disconnected - Click to manually connect")
         property string _armedText:         qsTr("Armed")
@@ -125,10 +126,10 @@ RowLayout {
             color:                  getIconColor()
             sourceSize.width:       width
             fillMode:               Image.PreserveAspectFit
-            //visible:                _activeVehicle && _activeVehicle.messageCount > 0// FIXME: Is messageCount check needed?
+            visible:                _activeVehicle && _activeVehicle.messageCount > 0
 
             function getIconColor() {
-                let iconColor = qgcPal.text
+                let iconColor = qgcPal.windowTransparentText
                 if (_activeVehicle) {
                     if (_activeVehicle.messageTypeWarning) {
                         iconColor = qgcPal.colorOrange
@@ -151,6 +152,7 @@ RowLayout {
         Layout.fillHeight:  true
         verticalAlignment:  Text.AlignVCenter
         text:               _vtolInFWDFlight ? qsTr("FW(vtol)") : qsTr("MR(vtol)")
+        color:              qgcPal.windowTransparentText
         font.pointSize:     _vehicleInAir ? ScreenTools.largeFontPointSize : ScreenTools.defaultFontPointSize
         visible:            _activeVehicle && _activeVehicle.vtol
 
@@ -174,8 +176,8 @@ RowLayout {
         id: overallStatusIndicatorPage
 
         ToolIndicatorPage {
-            showExpand:         _activeVehicle.mainStatusIndicatorContentItem ? true : false
-            waitForParameters:  _activeVehicle.mainStatusIndicatorContentItem ? true : false
+            showExpand:         true
+            waitForParameters:  true
             contentComponent:   mainStatusContentComponent
             expandedComponent:  mainStatusExpandedComponent
         }
@@ -188,28 +190,57 @@ RowLayout {
             id:         mainLayout
             spacing:    _spacing
 
-            QGCButton {
-                // FIXME: forceArm is not possible anymore if _healthAndArmingChecksSupported == true
-                enabled:            _armed || !_healthAndArmingChecksSupported || _activeVehicle.healthAndArmingCheckReport.canArm
-                text:               _armed ?  qsTr("Disarm") : (forceArm ? qsTr("Force Arm") : qsTr("Arm"))
-                Layout.alignment:   Qt.AlignLeft
-
-                property bool forceArm: false
+            RowLayout {
+                spacing: ScreenTools.defaultFontPixelWidth
 
-                onPressAndHold: forceArm = true
+                QGCDelayButton {
+                    enabled:    _armed || !_healthAndArmingChecksSupported || _activeVehicle.healthAndArmingCheckReport.canArm
+                    text:       _armed ? qsTr("Disarm") : (control._allowForceArm ? qsTr("Force Arm") : qsTr("Arm"))
 
-                onClicked: {
-                    if (_armed) {
-                        mainWindow.disarmVehicleRequest()
-                    } else {
-                        if (forceArm) {
-                            mainWindow.forceArmVehicleRequest()
+                    onActivated: {
+                        if (_armed) {
+                            _activeVehicle.armed = false
                         } else {
-                            mainWindow.armVehicleRequest()
+                            if (_allowForceArm) {
+                                _allowForceArm = false
+                                _activeVehicle.forceArm()
+                            } else {
+                                _activeVehicle.armed = true
+                            }
                         }
+                        mainWindow.closeIndicatorDrawer()
+                    }
+                }
+
+                LabelledComboBox {
+                    id:                 primaryLinkCombo
+                    Layout.alignment:   Qt.AlignTop
+                    label:              qsTr("Primary Link")
+                    alternateText:      _primaryLinkName
+                    visible:            _activeVehicle && _activeVehicle.vehicleLinkManager.linkNames.length > 1
+
+                    property var    _rgLinkNames:       _activeVehicle ? _activeVehicle.vehicleLinkManager.linkNames : [ ]
+                    property var    _rgLinkStatus:      _activeVehicle ? _activeVehicle.vehicleLinkManager.linkStatuses : [ ]
+                    property string _primaryLinkName:   _activeVehicle ? _activeVehicle.vehicleLinkManager.primaryLinkName : ""
+
+                    function updateComboModel() {
+                        let linkModel = []
+                        for (let i = 0; i < _rgLinkNames.length; i++) {
+                            let linkStatus = _rgLinkStatus[i]
+                            linkModel.push(_rgLinkNames[i] + (linkStatus === "" ? "" : " " + _rgLinkStatus[i]))
+                        }
+                        primaryLinkCombo.model = linkModel
+                        primaryLinkCombo.currentIndex = -1
+                    }
+
+                    Component.onCompleted:  updateComboModel()
+                    on_RgLinkNamesChanged:  updateComboModel()
+                    on_RgLinkStatusChanged: updateComboModel()
+
+                    onActivated:    (index) => {
+                        _activeVehicle.vehicleLinkManager.primaryLinkName = _rgLinkNames[index]; currentIndex = -1
+                        mainWindow.closeIndicatorDrawer()
                     }
-                    forceArm = false
-                    mainWindow.closeIndicatorDrawer()
                 }
             }
 
@@ -218,7 +249,7 @@ RowLayout {
                 heading:            qsTr("Vehicle Messages")
                 visible:            !vehicleMessageList.noMessages
 
-                VehicleMessageList { 
+                VehicleMessageList {
                     id: vehicleMessageList
                 }
             }
@@ -258,10 +289,6 @@ RowLayout {
                 }
             }
 
-            FactPanelController {
-                id: controller
-            }
-
             Component {
                 id: listdelegate
 
@@ -304,7 +331,7 @@ RowLayout {
                         textFormat:         TextEdit.RichText
                         clip:               true
                         visible:            object.expanded
-                        
+
                         property var fact:  null
 
                         onLinkActivated: (link) => {
@@ -319,6 +346,10 @@ RowLayout {
                             }
                         }
 
+                        FactPanelController {
+                            id: controller
+                        }
+
                         Component {
                             id: paramEditorDialogComponent
 
@@ -344,7 +375,22 @@ RowLayout {
             property real margins: ScreenTools.defaultFontPixelHeight
 
             Loader {
-                source: _activeVehicle.mainStatusIndicatorContentItem
+                Layout.fillWidth:   true
+                source:             _activeVehicle.expandedToolbarIndicatorSource("MainStatus")
+            }
+
+            SettingsGroupLayout {
+                Layout.fillWidth:   true
+                heading:            qsTr("Force Arm")
+                headingDescription: qsTr("Force arming bypasses pre-arm checks. Use with caution.")
+                visible:            _activeVehicle && !_armed
+
+                QGCCheckBoxSlider {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Allow Force Arm")
+                    checked:            false
+                    onClicked:          _allowForceArm = true
+                }
             }
 
             SettingsGroupLayout {
@@ -360,7 +406,7 @@ RowLayout {
                     QGCLabel { Layout.fillWidth: true; text: qsTr("Vehicle Parameters") }
                     QGCButton {
                         text: qsTr("Configure")
-                        onClicked: {                            
+                        onClicked: {
                             mainWindow.showVehicleConfigParametersPage()
                             mainWindow.closeIndicatorDrawer()
                         }
@@ -369,7 +415,7 @@ RowLayout {
                     QGCLabel { Layout.fillWidth: true; text: qsTr("Vehicle Configuration") }
                     QGCButton {
                         text: qsTr("Configure")
-                        onClicked: {                            
+                        onClicked: {
                             mainWindow.showVehicleConfig()
                             mainWindow.closeIndicatorDrawer()
                         }
@@ -378,26 +424,4 @@ RowLayout {
             }
         }
     }
-
-    Component {
-        id: vtolTransitionIndicatorPage
-
-        ToolIndicatorPage {
-            contentComponent: Component {
-                QGCButton {
-                    text: _vtolInFWDFlight ? qsTr("Transition to Multi-Rotor") : qsTr("Transition to Fixed Wing")
-
-                    onClicked: {
-                        if (_vtolInFWDFlight) {
-                            mainWindow.vtolTransitionToMRFlightRequest()
-                        } else {
-                            mainWindow.vtolTransitionToFwdFlightRequest()
-                        }
-                        mainWindow.closeIndicatorDrawer()
-                    }
-                }
-            }
-        }
-    }
 }
-
diff --git a/src/QmlControls/MainStatusIndicatorOfflinePage.qml b/src/QmlControls/MainStatusIndicatorOfflinePage.qml
index a3d79a006053..1635a9ee0140 100644
--- a/src/QmlControls/MainStatusIndicatorOfflinePage.qml
+++ b/src/QmlControls/MainStatusIndicatorOfflinePage.qml
@@ -39,14 +39,14 @@ ToolIndicatorPage {
     }
 
     contentComponent: Component {
-        SettingsGroupLayout { 
+        SettingsGroupLayout {
             heading: qsTr("Select Link to Connect")
 
             QGCLabel {
                 text:       qsTr("No Links Configured")
                 visible:    noLinks
             }
-        
+
             Repeater {
                 model: linkConfigs
 
diff --git a/src/QmlControls/MavlinkAction.cc b/src/QmlControls/MavlinkAction.cc
index 8d19dfa34788..c773d0902cfd 100644
--- a/src/QmlControls/MavlinkAction.cc
+++ b/src/QmlControls/MavlinkAction.cc
@@ -11,7 +11,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(MavlinkActionLog, "qgc.qmlcontrols.mavlinkaction")
+QGC_LOGGING_CATEGORY(MavlinkActionLog, "QMLControls.MavlinkAction")
 
 MavlinkAction::MavlinkAction(QObject *parent)
     : QObject(parent)
diff --git a/src/QmlControls/MavlinkActionManager.cc b/src/QmlControls/MavlinkActionManager.cc
index 082e0dc785ec..8c1f2e9d56d0 100644
--- a/src/QmlControls/MavlinkActionManager.cc
+++ b/src/QmlControls/MavlinkActionManager.cc
@@ -21,7 +21,7 @@
 #include <QtCore/QJsonArray>
 #include <QtQml/QQmlEngine>
 
-QGC_LOGGING_CATEGORY(MavlinkActionManagerLog, "qgc.qmlcontrols.mavlinkactionmanager")
+QGC_LOGGING_CATEGORY(MavlinkActionManagerLog, "QMLControls.MavlinkActionManager")
 
 MavlinkActionManager::MavlinkActionManager(QObject *parent)
     : QObject(parent)
diff --git a/src/QmlControls/MissionItemEditor.qml b/src/QmlControls/MissionItemEditor.qml
index 6dc2a7dc8314..78681106d1d5 100644
--- a/src/QmlControls/MissionItemEditor.qml
+++ b/src/QmlControls/MissionItemEditor.qml
@@ -254,8 +254,8 @@ Rectangle {
                         color:                  qgcPal.groupBorder
                     }
 
-                    QGCLabel { 
-                        text:       qsTr("Item #%1").arg(missionItem.sequenceNumber) 
+                    QGCLabel {
+                        text:       qsTr("Item #%1").arg(missionItem.sequenceNumber)
                         enabled:    false
                     }
                 }
diff --git a/src/QmlControls/OfflineMapEditor.qml b/src/QmlControls/OfflineMapEditor.qml
index ff6c6dda907a..7a72c0932d38 100644
--- a/src/QmlControls/OfflineMapEditor.qml
+++ b/src/QmlControls/OfflineMapEditor.qml
@@ -37,6 +37,7 @@ FlightMap {
     property var    _settings:          _settingsManager ? _settingsManager.offlineMapsSettings : null
     property var    _fmSettings:        _settingsManager ? _settingsManager.flightMapSettings : null
     property var    _appSettings:       _settingsManager.appSettings
+    property Fact   _tiandituFact:      _settingsManager ? _settingsManager.appSettings.tiandituToken : null
     property Fact   _mapboxFact:        _settingsManager ? _settingsManager.appSettings.mapboxToken : null
     property Fact   _mapboxAccountFact: _settingsManager ? _settingsManager.appSettings.mapboxAccount : null
     property Fact   _mapboxStyleFact:   _settingsManager ? _settingsManager.appSettings.mapboxStyle : null
@@ -721,7 +722,7 @@ FlightMap {
                         }
                     }
                 }
-            } 
+            }
         }
     }
 
@@ -764,4 +765,3 @@ FlightMap {
         }
     }
 }
-
diff --git a/src/QmlControls/OfflineMapInfo.qml b/src/QmlControls/OfflineMapInfo.qml
index 961cbf086c95..5deaa17beddc 100644
--- a/src/QmlControls/OfflineMapInfo.qml
+++ b/src/QmlControls/OfflineMapInfo.qml
@@ -28,7 +28,7 @@ RowLayout {
 
     QGCLabel {
         Layout.fillWidth:   true
-        text:               tileSet.name 
+        text:               tileSet.name
     }
 
     QGCLabel {
diff --git a/src/QmlControls/PIDTuning.qml b/src/QmlControls/PIDTuning.qml
index eba944c60364..954643f1c416 100644
--- a/src/QmlControls/PIDTuning.qml
+++ b/src/QmlControls/PIDTuning.qml
@@ -77,8 +77,7 @@ RowLayout {
     function saveTuningParamValues() {
         _savedTuningParamValues = [ ]
         for (var i=0; i<axis[_currentAxis].params.count; i++) {
-            var currentTuneParam = controller.getParameterFact(-1,
-                axis[_currentAxis].params.get(i).param)
+            var currentTuneParam = controller.getParameterFact(-1, axis[_currentAxis].params.get(i).param)
             _savedTuningParamValues.push(currentTuneParam.valueString)
         }
         savedRepeater.model = _savedTuningParamValues
@@ -188,18 +187,14 @@ RowLayout {
 
         ChartView {
             id:                     chart
-            width:                  Math.max(_minChartWidth, availableWidth - rightPanel.width - parent.spacing)
-            height:                 Math.max(_minChartHeight, availableHeight - leftPanelBottomColumn.height - parent.spacing)
+            width:                  Math.max(_minChartWidth, availableWidth - rightPanel.width - parent.spacing - _margins)
+            height:                 Math.max(_minChartHeight, availableHeight - leftPanelBottomColumn.height - parent.spacing - _margins)
             antialiasing:           true
             legend.alignment:       Qt.AlignBottom
             legend.font.pointSize:  ScreenTools.defaultFontPointSize
             legend.font.family:     ScreenTools.normalFontFamily
             titleFont.pointSize:    ScreenTools.defaultFontPointSize
             titleFont.family:       ScreenTools.normalFontFamily
-            margins.top:            _chartMargin
-            margins.bottom:         _chartMargin
-            margins.left:           _chartMargin
-            margins.right:          _chartMargin
 
             property real _chartMargin: 0
             property real _minChartWidth:   ScreenTools.defaultFontPixelWidth * 40
@@ -345,14 +340,28 @@ RowLayout {
             }
 
             // Instantiate all sliders (instead of switching the model), so that
-            // values are not changed unexpectedly if they do not match with a tick
-            // value
+            // values are not changed unexpectedly if they do not match with a tick value.
             Repeater {
                 model: axis
-                FactSliderPanel {
-                    Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 40
-                    visible:                _currentAxis === index
-                    sliderModel:            axis[index].params
+
+                Repeater {
+                    model: axis[index].params
+
+                    SettingsGroupLayout {
+                        id:                     tuningGroup
+                        heading:                title
+                        headingDescription:     description
+                        visible:                _currentAxis === index
+                        Layout.preferredWidth:  ScreenTools.defaultFontPixelWidth * 40
+
+                        FactSlider {
+                            fact:                   controller.getParameterFact(-1, param)
+                            from:                   min
+                            to:                     max
+                            majorTickStepSize:      step
+                            Layout.fillWidth:       true
+                        }
+                    }
                 }
             }
 
diff --git a/src/QmlControls/ParameterDownloadProgress.qml b/src/QmlControls/ParameterDownloadProgress.qml
new file mode 100644
index 000000000000..d07f92298d81
--- /dev/null
+++ b/src/QmlControls/ParameterDownloadProgress.qml
@@ -0,0 +1,78 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+
+import QGroundControl
+import QGroundControl.Controls
+
+/// Provides UI for parameter download progress. This is overlayed on top of the FlyViewToolBar.
+
+Item {
+    id: control
+
+    property var    _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+
+    // Small parameter download progress bar
+    Rectangle {
+        anchors.bottom: parent.bottom
+        height:         control.height * 0.05
+        width:          _activeVehicle ? _activeVehicle.loadProgress * parent.width : 0
+        color:          QGroundControl.globalPalette.colorGreen
+        visible:        !largeProgressBar.visible
+    }
+
+    // Large parameter download progress bar
+    Rectangle {
+        id:             largeProgressBar
+        anchors.bottom: parent.bottom
+        anchors.left:   parent.left
+        anchors.right:  parent.right
+        height:         parent.height
+        color:          QGroundControl.globalPalette.window
+        visible:        _showLargeProgress
+
+        property bool _initialDownloadComplete: _activeVehicle ? _activeVehicle.initialConnectComplete : true
+        property bool _userHide:                false
+        property bool _showLargeProgress:       !_initialDownloadComplete && !_userHide && QGroundControl.globalPalette.globalTheme === QGCPalette.Light
+
+        Connections {
+            target: QGroundControl.multiVehicleManager
+            function onActiveVehicleChanged(activeVehicle) { largeProgressBar._userHide = false }
+        }
+
+        Rectangle {
+            anchors.top:    parent.top
+            anchors.bottom: parent.bottom
+            width:          _activeVehicle ? _activeVehicle.loadProgress * parent.width : 0
+            color:          QGroundControl.globalPalette.colorGreen
+        }
+
+        QGCLabel {
+            anchors.centerIn:   parent
+            text:               qsTr("Downloading")
+            font.pointSize:     ScreenTools.largeFontPointSize
+        }
+
+        QGCLabel {
+            anchors.margins:    _margin
+            anchors.right:      parent.right
+            anchors.bottom:     parent.bottom
+            text:               qsTr("Click anywhere to hide")
+
+            property real _margin: ScreenTools.defaultFontPixelWidth / 2
+        }
+
+        MouseArea {
+            anchors.fill:   parent
+            onClicked:      parent._userHide = true
+        }
+    }
+}
diff --git a/src/QmlControls/ParameterEditorController.cc b/src/QmlControls/ParameterEditorController.cc
index 13d9a9ce8ca8..3b8cdfefc987 100644
--- a/src/QmlControls/ParameterEditorController.cc
+++ b/src/QmlControls/ParameterEditorController.cc
@@ -14,7 +14,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(ParameterEditorControllerLog, "qgc.qmlcontrols.parametereditorcontroller")
+QGC_LOGGING_CATEGORY(ParameterEditorControllerLog, "QMLControls.ParameterEditorController")
 
 ParameterTableModel::ParameterTableModel(QObject* parent)
     : QAbstractTableModel(parent)
@@ -24,7 +24,7 @@ ParameterTableModel::ParameterTableModel(QObject* parent)
 
 ParameterTableModel::~ParameterTableModel()
 {
-    
+
 }
 
 int ParameterTableModel::rowCount(const QModelIndex& /*parent*/) const
@@ -42,14 +42,14 @@ QVariant ParameterTableModel::data(const QModelIndex &index, int role) const
     if (!index.isValid()) {
         return QVariant();
     }
-    
+
     if (index.row() < 0 || index.row() >= _tableData.count()) {
         return QVariant();
     }
     if (index.column() < 0 || index.column() >= _tableViewColCount) {
         return QVariant();
     }
-    
+
     switch (role) {
         case Qt::DisplayRole:
             return QVariant::fromValue(_tableData[index.row()][index.column()]);
@@ -62,7 +62,7 @@ QVariant ParameterTableModel::data(const QModelIndex &index, int role) const
 
 QHash<int, QByteArray> ParameterTableModel::roleNames() const
 {
-    return { 
+    return {
         {Qt::DisplayRole, "display"},
         {FactRole, "fact"}
     };
@@ -129,13 +129,13 @@ Fact* ParameterTableModel::factAt(int row) const
         return nullptr;
     }
 
-    return _tableData[row][0].value<Fact*>();
+    return _tableData[row][ValueColumn].value<Fact*>();
 }
 
 
-ParameterEditorGroup::ParameterEditorGroup(QObject* parent) 
-    : QObject(parent) 
-{ 
+ParameterEditorGroup::ParameterEditorGroup(QObject* parent)
+    : QObject(parent)
+{
 
 }
 
@@ -345,7 +345,7 @@ void ParameterEditorController::sendDiff(void)
 
         if (paramDiff->load) {
             if (paramDiff->noVehicleValue) {
-                _parameterMgr->_factRawValueUpdateWorker(paramDiff->componentId, paramDiff->name, paramDiff->valueType, paramDiff->fileValueVar);
+                _parameterMgr->_mavlinkParamSet(paramDiff->componentId, paramDiff->name, paramDiff->valueType, paramDiff->fileValueVar);
             } else {
                 Fact* fact = _parameterMgr->getParameter(paramDiff->componentId, paramDiff->name);
                 fact->setRawValue(paramDiff->fileValueVar);
@@ -514,7 +514,7 @@ void ParameterEditorController::_performSearch(void)
                                 !fact->shortDescription().contains(searchItem, Qt::CaseInsensitive) &&
                                 !fact->longDescription().contains(searchItem, Qt::CaseInsensitive)) {
                             matched = false;
-                        }                    
+                        }
                     }
                 }
             }
diff --git a/src/QmlControls/ParameterEditorController.h b/src/QmlControls/ParameterEditorController.h
index 5b5f515557cd..9ceeafa18da2 100644
--- a/src/QmlControls/ParameterEditorController.h
+++ b/src/QmlControls/ParameterEditorController.h
@@ -24,13 +24,13 @@ class ParameterManager;
 class ParameterTableModel : public QAbstractTableModel
 {
     Q_OBJECT
-    
+
 public:
     explicit ParameterTableModel(QObject* parent = nullptr);
     ~ParameterTableModel() override;
 
     typedef QVector<QVariant> ColumnData;
-    
+
     enum {
         FactRole = Qt::UserRole + 1
     };
@@ -42,7 +42,7 @@ class ParameterTableModel : public QAbstractTableModel
     };
 
     Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged)
-    
+
     void append      (Fact* fact);
     void insert      (int row, Fact* fact);
     void clear       ();
diff --git a/src/QmlControls/PlanToolBarIndicators.qml b/src/QmlControls/PlanToolBarIndicators.qml
index 7b3c7bc1a951..d6338a78e9bb 100644
--- a/src/QmlControls/PlanToolBarIndicators.qml
+++ b/src/QmlControls/PlanToolBarIndicators.qml
@@ -232,4 +232,3 @@ Item {
         }
     }
 }
-
diff --git a/src/QmlControls/PlanView.qml b/src/QmlControls/PlanView.qml
index 00a807f66212..e7b8d2adc015 100644
--- a/src/QmlControls/PlanView.qml
+++ b/src/QmlControls/PlanView.qml
@@ -380,7 +380,7 @@ Item {
 				if(_utmspEnabled){
                 	QGroundControl.utmspManager.utmspVehicle.updateLastCoordinates(coordinate.latitude, coordinate.longitude)
                 }
-                
+
                 switch (_editingLayer) {
                 case _layerMission:
                     if (addWaypointRallyPointAction.checked) {
diff --git a/src/QmlControls/PlanViewToolBar.qml b/src/QmlControls/PlanViewToolBar.qml
index 0d3fdb8d7830..0ed93f0616a6 100644
--- a/src/QmlControls/PlanViewToolBar.qml
+++ b/src/QmlControls/PlanViewToolBar.qml
@@ -29,7 +29,7 @@ Rectangle {
 
     property var    _activeVehicle:         QGroundControl.multiVehicleManager.activeVehicle
     property real   _controllerProgressPct: planMasterController.missionController.progressPct
-    
+
     QGCPalette { id: qgcPal }
 
     /// Bottom single pixel divider
@@ -62,7 +62,11 @@ Rectangle {
 
     QGCMouseArea {
         anchors.fill:   viewButtonRow
-        onClicked:      mainWindow.showFlyView()
+        onClicked:      {
+            if (mainWindow.allowViewSwitch()) {
+                mainWindow.showFlyView()
+            }
+        }
     }
 
     QGCFlickable {
diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml
index b8f1d403fc7a..b0eb9e71c861 100644
--- a/src/QmlControls/QGCButton.qml
+++ b/src/QmlControls/QGCButton.qml
@@ -80,7 +80,7 @@ Button {
                 font.family:            control.font.family
                 font.weight:            fontWeight
                 color:                  _showHighlight ? qgcPal.buttonHighlightText : (primary ? qgcPal.primaryButtonText : qgcPal.buttonText)
-                visible:                control.text !== "" 
+                visible:                control.text !== ""
             }
     }
 }
diff --git a/src/QmlControls/QGCCheckBoxSlider.qml b/src/QmlControls/QGCCheckBoxSlider.qml
index 95ca2a4a2a41..0bd7a5a733a9 100644
--- a/src/QmlControls/QGCCheckBoxSlider.qml
+++ b/src/QmlControls/QGCCheckBoxSlider.qml
@@ -25,16 +25,16 @@ AbstractButton   {
     QGCPalette { id: qgcPal; colorGroupEnabled: control.enabled }
 
     contentItem: Item {
-        implicitWidth:  (label.visible ? label.contentWidth + ScreenTools.defaultFontPixelWidth : 0) + indicator.width 
+        implicitWidth:  (label.visible ? label.contentWidth + ScreenTools.defaultFontPixelWidth : 0) + indicator.width
         implicitHeight: label.contentHeight
 
-        QGCLabel { 
+        QGCLabel {
             id:             label
             anchors.left:   parent.left
             text:           visible ? control.text : "X"
             visible:        control.text !== ""
         }
-    
+
         Rectangle {
             id:                     indicator
             anchors.right:          parent.right
diff --git a/src/QmlControls/QGCColumnButton.qml b/src/QmlControls/QGCColumnButton.qml
index b5abb36b2dad..3748d69e6ac4 100644
--- a/src/QmlControls/QGCColumnButton.qml
+++ b/src/QmlControls/QGCColumnButton.qml
@@ -24,7 +24,7 @@ QGCButton {
     contentItem: Item {
         id: contItem
         implicitWidth:  Math.max(textLabel.implicitWidth , icon.implicitWidth ) * 1.1
-        implicitHeight: iconSource === "" ? textLabel.implicitHeight : textLabel.implicitHeight * 2.5 
+        implicitHeight: iconSource === "" ? textLabel.implicitHeight : textLabel.implicitHeight * 2.5
         ColumnLayout {
             anchors.fill: parent
             QGCColoredImage {
@@ -39,7 +39,7 @@ QGCButton {
                 sourceSize.height:      height
                 sourceSize.width:       width
                 visible:                control.iconSource !== "" ? true : false
-            }   
+            }
 
             Item {
                 id:                     textLabelContainer
@@ -54,7 +54,7 @@ QGCButton {
                     font.pointSize:             control.font.pointSize
                     color:                      _showHighlight ? qgcPal.buttonHighlightText : (primary ? qgcPal.primaryButtonText : qgcPal.buttonText)
                     anchors.baseline:           iconSource !== "" ? parent.bottom : undefined
-                    anchors.centerIn:           iconSource === "" ? parent : undefined   
+                    anchors.centerIn:           iconSource === "" ? parent : undefined
                     anchors.horizontalCenter:   parent.horizontalCenter
                 }
             }
diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index acb4aac05213..e784ba3b8d66 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -77,7 +77,7 @@ T.ComboBox {
         width:  _popupWidth
         height: Math.round(popupItemMetrics.height * 1.75)
 
-        property string _text: control.textRole ? 
+        property string _text: control.textRole ?
                                     (model.hasOwnProperty(control.textRole) ? model[control.textRole] : modelData[control.textRole]) :
                                     modelData
 
diff --git a/src/QmlControls/QGCDelayButton.qml b/src/QmlControls/QGCDelayButton.qml
new file mode 100644
index 000000000000..4ca6e89f2254
--- /dev/null
+++ b/src/QmlControls/QGCDelayButton.qml
@@ -0,0 +1,106 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import QGroundControl
+import QGroundControl.Controls
+
+
+DelayButton {
+    id:             control
+    hoverEnabled:   !ScreenTools.isMobile
+    topPadding:     _verticalPadding
+    bottomPadding:  _verticalPadding
+    leftPadding:    _horizontalPadding
+    rightPadding:   _horizontalPadding
+    focusPolicy:    Qt.ClickFocus
+    font.family:    ScreenTools.normalFontFamily
+    delay:          defaultDelay
+
+    property bool   showBorder:     qgcPal.globalTheme === QGCPalette.Light
+    property real   backRadius:     ScreenTools.buttonBorderRadius
+    property real   heightFactor:   0.5
+    property real   fontWeight:     Font.Normal // default for qml Text
+    property real   pointSize:      ScreenTools.defaultFontPointSize
+    property int    defaultDelay:   500
+
+    property alias wrapMode:            text.wrapMode
+    property alias horizontalAlignment: text.horizontalAlignment
+    property alias backgroundColor:     backRect.color
+    property alias textColor:           text.color
+
+    property bool   _showHighlight:     enabled && pressed
+    property int    _horizontalPadding: ScreenTools.defaultFontPixelWidth * 2
+    property int    _verticalPadding:   Math.round(ScreenTools.defaultFontPixelHeight * heightFactor)
+    property bool   _showHelp:          false
+    property bool   _activated:         false
+
+    QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
+
+    Timer {
+        id:         helpTimeout
+        interval:   3000
+        repeat:     false
+        onTriggered: control._showHelp = false
+    }
+
+    onActivated: {
+        _activated = true
+        _showHelp = false
+    }
+    onPressed: {
+        _activated = false
+    }
+    onReleased: {
+        _showHelp = !_activated
+        _activated = false
+        if (_showHelp) {
+            helpTimeout.start()
+        } else {
+            helpTimeout.stop()
+        }
+    }
+
+    background: Rectangle {
+        id:             backRect
+        radius:         backRadius
+        implicitWidth:  Math.max(control._showHelp ? helpText.contentWidth : 0, ScreenTools.implicitButtonWidth)
+        implicitHeight: ScreenTools.implicitButtonHeight
+        border.width:   showBorder ? 1 : 0
+        border.color:   qgcPal.buttonBorder
+
+        gradient: Gradient {
+            orientation: Gradient.Horizontal
+
+            GradientStop { position: 0.0; color: qgcPal.buttonHighlight }
+            GradientStop { position: 0.15; color: qgcPal.button }
+        }
+
+        Rectangle {
+            anchors.fill:           parent
+            anchors.rightMargin:    control.pressed ? parent.width * (1.0 - control.progress) : 0
+            color:                  qgcPal.buttonHighlight
+            opacity:                _showHighlight ? 1 : control.enabled && control.hovered ? .2 : 0
+            radius:                 parent.radius
+        }
+
+        QGCLabel {
+            id:                         helpText
+            text:                       qsTr("Hold to Confirm")
+            anchors.bottom:             parent.bottom
+            anchors.horizontalCenter:   parent.horizontalCenter
+            font.pointSize:             ScreenTools.smallFontPointSize
+            visible:                    control._showHelp
+        }
+    }
+
+    contentItem: QGCLabel {
+        id:                     text
+        horizontalAlignment:    Text.AlignHCenter
+        text:                   control.text
+        font.pointSize:         control.pointSize
+        font.family:            control.font.family
+        font.weight:            control.fontWeight
+        color:                  qgcPal.buttonText
+    }
+}
diff --git a/src/QmlControls/QGCFileDialogController.cc b/src/QmlControls/QGCFileDialogController.cc
index 4362eb09384e..a39843f5075e 100644
--- a/src/QmlControls/QGCFileDialogController.cc
+++ b/src/QmlControls/QGCFileDialogController.cc
@@ -15,7 +15,7 @@
 
 #include <QtCore/QDir>
 
-QGC_LOGGING_CATEGORY(QGCFileDialogControllerLog, "qgc.qmlcontrols.qgcfiledialogcontroller")
+QGC_LOGGING_CATEGORY(QGCFileDialogControllerLog, "QMLControls.QGCFileDialogController")
 
 QGCFileDialogController::QGCFileDialogController(QObject *parent)
     : QObject(parent)
diff --git a/src/QmlControls/QGCFlickableScrollIndicator.qml b/src/QmlControls/QGCFlickableScrollIndicator.qml
index 4b642fb135e3..b236741c1d15 100644
--- a/src/QmlControls/QGCFlickableScrollIndicator.qml
+++ b/src/QmlControls/QGCFlickableScrollIndicator.qml
@@ -12,7 +12,7 @@ Rectangle {
     state:      orientation == QGCFlickableScrollIndicator.Vertical ? "vertical" : "horizontal"
 
     property bool showIndicator: false
-    property int  orientation:   QGCFlickableScrollIndicator.Vertical   
+    property int  orientation:   QGCFlickableScrollIndicator.Vertical
 
     enum Orientation {
         Vertical,
@@ -25,7 +25,7 @@ Rectangle {
     states: [
             State {
                 name: "vertical"
-                AnchorChanges { 
+                AnchorChanges {
                     target:         control
                     anchors.right: _flickable.right
                 }
@@ -44,7 +44,7 @@ Rectangle {
 
             State {
                 name: "horizontal"
-                AnchorChanges { 
+                AnchorChanges {
                     target:         control
                     anchors.bottom: _flickable.bottom
                 }
diff --git a/src/QmlControls/QGCImageProvider.h b/src/QmlControls/QGCImageProvider.h
index f5feb75dbb17..d31d202b7273 100644
--- a/src/QmlControls/QGCImageProvider.h
+++ b/src/QmlControls/QGCImageProvider.h
@@ -21,7 +21,7 @@ class QGCImageProvider : public QQuickImageProvider
     ~QGCImageProvider();
 
     QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) final;
-    void setImage(const QImage &image, uint8_t vehicleId = 0) { _images[vehicleId] = image.mirrored(); }
+    void setImage(const QImage &image, uint8_t vehicleId = 0) { _images[vehicleId] = image.flipped(Qt::Vertical); }
 
 private:
     QMap<uint8_t, QImage> _images;
diff --git a/src/QmlControls/QGCMapPalette.h b/src/QmlControls/QGCMapPalette.h
index fc7d06b19fd7..b00c5ef7b14c 100644
--- a/src/QmlControls/QGCMapPalette.h
+++ b/src/QmlControls/QGCMapPalette.h
@@ -40,26 +40,26 @@ class QGCMapPalette : public QObject
 {
     Q_OBJECT
     QML_ELEMENT
-    
+
     Q_PROPERTY(bool lightColors READ lightColors WRITE setLightColors NOTIFY paletteChanged)
 
     Q_PROPERTY(QColor text          READ text          NOTIFY paletteChanged)
     Q_PROPERTY(QColor textOutline   READ textOutline   NOTIFY paletteChanged)
 
-public:    
+public:
     QGCMapPalette(QObject* parent = nullptr);
-    
+
     /// Text color
     QColor text(void)           const { return _text[_lightColors ? 0 : 1]; }
     QColor textOutline(void)    const { return _textOutline[_lightColors ? 0 : 1]; }
 
     bool lightColors(void) const { return _lightColors; }
-    void setLightColors(bool lightColors);    
+    void setLightColors(bool lightColors);
 
 signals:
     void paletteChanged(void);
     void lightColorsChanged(bool lightColors);
-    
+
 private:
     bool _lightColors = false;
 
diff --git a/src/QmlControls/QGCMapPolygon.cc b/src/QmlControls/QGCMapPolygon.cc
index 817cba218e8e..c86157d02c83 100644
--- a/src/QmlControls/QGCMapPolygon.cc
+++ b/src/QmlControls/QGCMapPolygon.cc
@@ -104,7 +104,7 @@ void QGCMapPolygon::adjustVertex(int vertexIndex, const QGeoCoordinate coordinat
     if (!_centerDrag) {
         // When dragging center we don't signal path changed until all vertices are updated
         if (!_deferredPathChanged) {
-            // Only update the path once per event loop, to prevent lag-spikes 
+            // Only update the path once per event loop, to prevent lag-spikes
             _deferredPathChanged = true;
             QTimer::singleShot(0, this, [this]() {
                 emit pathChanged();
@@ -397,7 +397,7 @@ void QGCMapPolygon::setCenter(QGeoCoordinate newCenter)
 
         _center = newCenter;
         if (!_deferredPathChanged) {
-            // Only update the center once per event loop, to prevent lag-spikes 
+            // Only update the center once per event loop, to prevent lag-spikes
             _deferredPathChanged = true;
             QTimer::singleShot(0, this, [this, newCenter]() {
                 emit centerChanged(newCenter);
diff --git a/src/QmlControls/QGCPalette.cc b/src/QmlControls/QGCPalette.cc
index 9adda85a7f98..0cff6f1542d8 100644
--- a/src/QmlControls/QGCPalette.cc
+++ b/src/QmlControls/QGCPalette.cc
@@ -49,10 +49,12 @@ void QGCPalette::_buildMap()
     //                                      Light                 Dark
     //                                      Disabled   Enabled    Disabled   Enabled
     DECLARE_QGC_COLOR(window,               "#ffffff", "#ffffff", "#222222", "#222222")
+    DECLARE_QGC_COLOR(windowTransparent,    "#ccffffff", "#ccffffff", "#cc222222", "#cc222222")
     DECLARE_QGC_COLOR(windowShadeLight,     "#909090", "#828282", "#707070", "#626262")
     DECLARE_QGC_COLOR(windowShade,          "#d9d9d9", "#d9d9d9", "#333333", "#333333")
     DECLARE_QGC_COLOR(windowShadeDark,      "#bdbdbd", "#bdbdbd", "#282828", "#282828")
     DECLARE_QGC_COLOR(text,                 "#9d9d9d", "#000000", "#707070", "#ffffff")
+    DECLARE_QGC_COLOR(windowTransparentText,"#9d9d9d", "#000000", "#707070", "#ffffff")
     DECLARE_QGC_COLOR(warningText,          "#cc0808", "#cc0808", "#f85761", "#f85761")
     DECLARE_QGC_COLOR(button,               "#ffffff", "#ffffff", "#707070", "#626270")
     DECLARE_QGC_COLOR(buttonBorder,         "#ffffff", "#d9d9d9", "#707070", "#adadb8")
@@ -67,10 +69,10 @@ void QGCPalette::_buildMap()
     DECLARE_QGC_COLOR(mapButtonHighlight,   "#585858", "#be781c", "#585858", "#be781c")
     DECLARE_QGC_COLOR(mapIndicator,         "#585858", "#be781c", "#585858", "#be781c")
     DECLARE_QGC_COLOR(mapIndicatorChild,    "#585858", "#766043", "#585858", "#766043")
-    DECLARE_QGC_COLOR(colorGreen,           "#008f2d", "#008f2d", "#00e04b", "#00e04b") 
-    DECLARE_QGC_COLOR(colorYellow,          "#a2a200", "#a2a200", "#ffff00", "#ffff00")  
-    DECLARE_QGC_COLOR(colorYellowGreen,     "#799f26", "#799f26", "#9dbe2f", "#9dbe2f")  
-    DECLARE_QGC_COLOR(colorOrange,          "#bf7539", "#bf7539", "#de8500", "#de8500")  
+    DECLARE_QGC_COLOR(colorGreen,           "#008f2d", "#008f2d", "#00e04b", "#00e04b")
+    DECLARE_QGC_COLOR(colorYellow,          "#a2a200", "#a2a200", "#ffff00", "#ffff00")
+    DECLARE_QGC_COLOR(colorYellowGreen,     "#799f26", "#799f26", "#9dbe2f", "#9dbe2f")
+    DECLARE_QGC_COLOR(colorOrange,          "#bf7539", "#bf7539", "#de8500", "#de8500")
     DECLARE_QGC_COLOR(colorRed,             "#b52b2b", "#b52b2b", "#f32836", "#f32836")
     DECLARE_QGC_COLOR(colorGrey,            "#808080", "#808080", "#bfbfbf", "#bfbfbf")
     DECLARE_QGC_COLOR(colorBlue,            "#1a72ff", "#1a72ff", "#536dff", "#536dff")
@@ -82,14 +84,17 @@ void QGCPalette::_buildMap()
     DECLARE_QGC_COLOR(statusFailedText,     "#9d9d9d", "#000000", "#707070", "#ffffff")
     DECLARE_QGC_COLOR(statusPassedText,     "#9d9d9d", "#000000", "#707070", "#ffffff")
     DECLARE_QGC_COLOR(statusPendingText,    "#9d9d9d", "#000000", "#707070", "#ffffff")
-    DECLARE_QGC_COLOR(toolbarBackground,    "#ffffff", "#ffffff", "#222222", "#222222")
+    DECLARE_QGC_COLOR(toolbarBackground,    "#00ffffff", "#00ffffff", "#00222222", "#00222222")
+    DECLARE_QGC_COLOR(toolbarDivider,       "#00000000", "#00000000", "#00000000", "#00000000")
     DECLARE_QGC_COLOR(groupBorder,          "#bbbbbb", "#bbbbbb", "#707070", "#707070")
 
     // Colors not affecting by theming
-    //                                              Disabled    Enabled
-    DECLARE_QGC_NONTHEMED_COLOR(brandingPurple,     "#4A2C6D", "#4A2C6D")
-    DECLARE_QGC_NONTHEMED_COLOR(brandingBlue,       "#48D6FF", "#6045c5")
-    DECLARE_QGC_NONTHEMED_COLOR(toolStripFGColor,   "#707070", "#ffffff")
+    //                                                      Disabled     Enabled
+    DECLARE_QGC_NONTHEMED_COLOR(brandingPurple,             "#4A2C6D", "#4A2C6D")
+    DECLARE_QGC_NONTHEMED_COLOR(brandingBlue,               "#48D6FF", "#6045c5")
+    DECLARE_QGC_NONTHEMED_COLOR(toolStripFGColor,           "#707070", "#ffffff")
+    DECLARE_QGC_NONTHEMED_COLOR(photoCaptureButtonColor,    "#ffffff", "#ffffff")
+    DECLARE_QGC_NONTHEMED_COLOR(videoCaptureButtonColor,    "#f32836", "#f32836")
 
     // Colors not affecting by theming or enable/disable
     DECLARE_QGC_SINGLE_COLOR(mapWidgetBorderLight,          "#ffffff")
diff --git a/src/QmlControls/QGCPalette.h b/src/QmlControls/QGCPalette.h
index 465a43bbf3ea..924bf406e69c 100644
--- a/src/QmlControls/QGCPalette.h
+++ b/src/QmlControls/QGCPalette.h
@@ -114,10 +114,12 @@ class QGCPalette : public QObject
     Q_PROPERTY(QStringList  colors              READ colors             CONSTANT)
 
     DEFINE_QGC_COLOR(window,                        setWindow)
+    DEFINE_QGC_COLOR(windowTransparent,             setWindowTransparent)
     DEFINE_QGC_COLOR(windowShadeLight,              setWindowShadeLight)
     DEFINE_QGC_COLOR(windowShade,                   setWindowShade)
     DEFINE_QGC_COLOR(windowShadeDark,               setWindowShadeDark)
     DEFINE_QGC_COLOR(text,                          setText)
+    DEFINE_QGC_COLOR(windowTransparentText,         setWindowTransparentText)
     DEFINE_QGC_COLOR(warningText,                   setWarningText)
     DEFINE_QGC_COLOR(button,                        setButton)
     DEFINE_QGC_COLOR(buttonBorder,                  setButtonBorder)
@@ -154,9 +156,12 @@ class QGCPalette : public QObject
     DEFINE_QGC_COLOR(surveyPolygonInterior,         setSurveyPolygonInterior)
     DEFINE_QGC_COLOR(surveyPolygonTerrainCollision, setSurveyPolygonTerrainCollision)
     DEFINE_QGC_COLOR(toolbarBackground,             setToolbarBackground)
+    DEFINE_QGC_COLOR(toolbarDivider,                setToolbarDivider)
     DEFINE_QGC_COLOR(toolStripFGColor,              setToolStripFGColor)
     DEFINE_QGC_COLOR(toolStripHoverColor,           setToolStripHoverColor)
     DEFINE_QGC_COLOR(groupBorder,                   setGroupBorder)
+    DEFINE_QGC_COLOR(photoCaptureButtonColor,       setPhotoCaptureButtonColor)
+    DEFINE_QGC_COLOR(videoCaptureButtonColor,       setVideoCaptureButtonColor)
 
 #ifdef QGC_UTM_ADAPTER
     DEFINE_QGC_COLOR(switchUTMSP,                    setSwitchUTMSP)
diff --git a/src/QmlControls/QGCPopupDialog.qml b/src/QmlControls/QGCPopupDialog.qml
index ddcdca543108..7d26957bf31a 100644
--- a/src/QmlControls/QGCPopupDialog.qml
+++ b/src/QmlControls/QGCPopupDialog.qml
@@ -55,8 +55,11 @@ Popup {
     property var    dialogProperties
     property bool   destroyOnClose:         true
     property bool   preventClose:           false
-    
-    readonly property real headerMinWidth: titleLable.implicitWidth + rejectButton.width + acceptButton.width + titleRowLayout.spacing * 2
+
+    property real maxContentAvailableWidth:    mainWindow.width - _contentMargin * 6
+    property real maxContentAvailableHeight:   mainWindow.height - titleRowLayout.height - _contentMargin * 7
+
+    readonly property real headerMinWidth: titleLabel.implicitWidth + rejectButton.width + acceptButton.width + titleRowLayout.spacing * 2
 
     signal accepted
     signal rejected
@@ -207,9 +210,9 @@ Popup {
     ColumnLayout {
         id:                 mainLayout
         anchors.centerIn:   parent
-        x:          _contentMargin
-        y:          _contentMargin
-        spacing:    _contentMargin
+        x:                  _contentMargin
+        y:                  _contentMargin
+        spacing:            _contentMargin
 
         RowLayout {
             id:                     titleRowLayout
@@ -217,7 +220,7 @@ Popup {
             spacing:                _contentMargin
 
             QGCLabel {
-                id: titleLable
+                id:                 titleLabel
                 Layout.fillWidth:   true
                 text:               root.title
                 font.pointSize:     ScreenTools.mediumFontPointSize
@@ -244,10 +247,10 @@ Popup {
             Layout.preferredHeight: Math.min(maxAvailableHeight, totalContentHeight)
             color:                  _qgcPal.window
 
-            property real maxAvailableWidth:    mainWindow.width - _contentMargin * 4
-            property real maxAvailableHeight:   mainWindow.height - titleRowLayout.height - _contentMargin * 5
             property real totalContentWidth:    dialogContentParent.childrenRect.width + _contentMargin * 2
             property real totalContentHeight:   dialogContentParent.childrenRect.height + _contentMargin * 2
+            property real maxAvailableWidth:    mainWindow.width - _contentMargin * 4
+            property real maxAvailableHeight:   mainWindow.height - titleRowLayout.height - _contentMargin * 5
 
             QGCFlickable {
                 anchors.margins:    _contentMargin
diff --git a/src/QmlControls/QGCSlider.qml b/src/QmlControls/QGCSlider.qml
index 8d2ea89ec237..536567752bec 100644
--- a/src/QmlControls/QGCSlider.qml
+++ b/src/QmlControls/QGCSlider.qml
@@ -25,7 +25,7 @@ Slider {
     // FIXME-QT6 - This property used to be available in Control 1. Now we will need to implement the visuals ourselves
     property bool tickmarksEnabled: false
 
-    
+
     property bool zeroCentered:         false   // Value indicator starts display from zero instead of min value
     property bool displayValue:         false
     property bool indicatorBarVisible:  true
@@ -34,10 +34,10 @@ Slider {
     property real _barHeight:           Math.round(ScreenTools.defaultFontPixelHeight / 3)
 
     background: Rectangle {
-        x:              control.horizontal ? 
-                            control.leftPadding : 
+        x:              control.horizontal ?
+                            control.leftPadding :
                             control.leftPadding + control.availableWidth / 2 - width / 2
-        y:              control.horizontal ? 
+        y:              control.horizontal ?
                             control.topPadding + control.availableHeight / 2 - height / 2 :
                             control.topPadding
         implicitWidth:  control.horizontal ? control._implicitBarLength : control._barHeight
@@ -75,10 +75,10 @@ Slider {
     }*/
 
     handle: Rectangle {
-        x:              control.horizontal ? 
+        x:              control.horizontal ?
                             control.leftPadding + control.visualPosition * (control.availableWidth - width) :
                             control.leftPadding + control.availableWidth / 2 - width / 2
-        y:              control.horizontal ? 
+        y:              control.horizontal ?
                             control.topPadding + control.availableHeight / 2 - height / 2 :
                             control.topPadding + control.visualPosition * (control.availableHeight - height)
         implicitWidth:  _radius * 2
diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/src/QmlControls/QGroundControlQmlGlobal.cc
index d4f3a8c399ea..e024f02d5d12 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.cc
+++ b/src/QmlControls/QGroundControlQmlGlobal.cc
@@ -41,7 +41,7 @@
 #include <QtCore/QSettings>
 #include <QtCore/QLineF>
 
-QGC_LOGGING_CATEGORY(GuidedActionsControllerLog, "GuidedActionsControllerLog")
+QGC_LOGGING_CATEGORY(GuidedActionsControllerLog, "QMLControls.GuidedActionsController")
 
 QGeoCoordinate QGroundControlQmlGlobal::_coord = QGeoCoordinate(0.0,0.0);
 double QGroundControlQmlGlobal::_zoom = 2;
@@ -350,22 +350,27 @@ void QGroundControlQmlGlobal::clearDeleteAllSettingsNextBoot()
     QGCApplication::clearDeleteAllSettingsNextBoot();
 }
 
-QStringList QGroundControlQmlGlobal::loggingCategories()
+QmlObjectListModel *QGroundControlQmlGlobal::treeLoggingCategoriesModel()
 {
-    return QGCLoggingCategoryRegister::instance()->registeredCategories();
+    return QGCLoggingCategoryManager::instance()->treeCategoryModel();
+}
+
+QmlObjectListModel *QGroundControlQmlGlobal::flatLoggingCategoriesModel()
+{
+    return QGCLoggingCategoryManager::instance()->flatCategoryModel();
 }
 
 void QGroundControlQmlGlobal::setCategoryLoggingOn(const QString &category, bool enable)
 {
-    QGCLoggingCategoryRegister::setCategoryLoggingOn(category, enable);
+    QGCLoggingCategoryManager::instance()->setCategoryLoggingOn(category, enable);
 }
 
 bool QGroundControlQmlGlobal::categoryLoggingOn(const QString &category)
 {
-    return QGCLoggingCategoryRegister::categoryLoggingOn(category);
+    return QGCLoggingCategoryManager::categoryLoggingOn(category);
 }
 
-void QGroundControlQmlGlobal::updateLoggingFilterRules()
+void QGroundControlQmlGlobal::disableAllLoggingCategories()
 {
-    QGCLoggingCategoryRegister::instance()->setFilterRulesFromSettings(QString());
+    QGCLoggingCategoryManager::instance()->disableAllCategories();
 }
diff --git a/src/QmlControls/QGroundControlQmlGlobal.h b/src/QmlControls/QGroundControlQmlGlobal.h
index 19e59e916bb8..3f5345c03f4a 100644
--- a/src/QmlControls/QGroundControlQmlGlobal.h
+++ b/src/QmlControls/QGroundControlQmlGlobal.h
@@ -32,6 +32,7 @@ class SettingsManager;
 class VideoManager;
 class UTMSPManager;
 class AirLinkManager;
+class QmlObjectListModel;
 
 Q_MOC_INCLUDE("ADSBVehicleManager.h")
 Q_MOC_INCLUDE("FactGroup.h")
@@ -103,6 +104,8 @@ class QGroundControlQmlGlobal : public QObject
     Q_PROPERTY(QString  telemetryFileExtension  READ telemetryFileExtension CONSTANT)
 
     Q_PROPERTY(QString qgcVersion       READ qgcVersion         CONSTANT)
+    Q_PROPERTY(QString qgcAppDate       READ qgcAppDate         CONSTANT)
+    Q_PROPERTY(bool    qgcDailyBuild    READ qgcDailyBuild      CONSTANT)
 
     Q_PROPERTY(qreal zOrderTopMost              READ zOrderTopMost              CONSTANT) ///< z order for top most items, toolbar, main window sub view
     Q_PROPERTY(qreal zOrderWidgets              READ zOrderWidgets              CONSTANT) ///< z order value to widgets, for example: zoom controls, hud widgetss
@@ -142,8 +145,11 @@ class QGroundControlQmlGlobal : public QObject
     Q_INVOKABLE void    startAPMArduRoverMockLink   (bool sendStatusText);
     Q_INVOKABLE void    stopOneMockLink             (void);
 
-    /// Returns the list of available logging category names.
-    Q_INVOKABLE static QStringList loggingCategories();
+    /// Returns the hierarchical list of available logging category names.
+    Q_INVOKABLE static QmlObjectListModel *treeLoggingCategoriesModel();
+
+    /// Returns the flat list of available logging category names.
+    Q_INVOKABLE static QmlObjectListModel *flatLoggingCategoriesModel();
 
     /// Turns on/off logging for the specified category. State is saved in app settings.
     Q_INVOKABLE static void setCategoryLoggingOn(const QString &category, bool enable);
@@ -151,8 +157,7 @@ class QGroundControlQmlGlobal : public QObject
     /// Returns true if logging is turned on for the specified category.
     Q_INVOKABLE static bool categoryLoggingOn(const QString &category);
 
-    /// Updates the logging filter rules after settings have changed
-    Q_INVOKABLE static void updateLoggingFilterRules();
+    Q_INVOKABLE static void disableAllLoggingCategories();
 
     Q_INVOKABLE bool linesIntersect(QPointF xLine1, QPointF yLine1, QPointF xLine2, QPointF yLine2);
 
@@ -221,6 +226,12 @@ class QGroundControlQmlGlobal : public QObject
     QString telemetryFileExtension  (void) const;
 
     static QString qgcVersion();
+    static QString qgcAppDate() { return QGC_APP_DATE; }
+#ifdef QGC_DAILY_BUILD
+    static bool qgcDailyBuild() { return true; }
+#else
+    static bool qgcDailyBuild() { return false; }
+#endif
 
 #ifdef QGC_UTM_ADAPTER
     UTMSPManager* utmspManager() {return _utmspManager;}
diff --git a/src/QmlControls/QmlObjectListModel.cc b/src/QmlControls/QmlObjectListModel.cc
index 3e87124afa9b..dca394c668a6 100644
--- a/src/QmlControls/QmlObjectListModel.cc
+++ b/src/QmlControls/QmlObjectListModel.cc
@@ -13,14 +13,14 @@
 #include <QtCore/QDebug>
 #include <QtQml/QQmlEngine>
 
-QGC_LOGGING_CATEGORY(QmlObjectListModelLog, "QmlObjectListModelLog")
+QGC_LOGGING_CATEGORY(QmlObjectListModelLog, "API.QmlObjectListModel")
 
 QmlObjectListModel::QmlObjectListModel(QObject* parent)
     : QAbstractListModel        (parent)
     , _dirty                    (false)
     , _skipDirtyFirstItem       (false)
 {
-
+    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
 }
 
 QmlObjectListModel::~QmlObjectListModel()
@@ -41,7 +41,7 @@ QObject* QmlObjectListModel::get(int index)
 int QmlObjectListModel::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
-    
+
     return _objectList.count();
 }
 
@@ -50,11 +50,11 @@ QVariant QmlObjectListModel::data(const QModelIndex &index, int role) const
     if (!index.isValid()) {
         return QVariant();
     }
-    
+
     if (index.row() < 0 || index.row() >= _objectList.count()) {
         return QVariant();
     }
-    
+
     if (role == ObjectRole) {
         return QVariant::fromValue(_objectList[index.row()]);
     } else if (role == TextRole) {
@@ -67,10 +67,10 @@ QVariant QmlObjectListModel::data(const QModelIndex &index, int role) const
 QHash<int, QByteArray> QmlObjectListModel::roleNames(void) const
 {
     QHash<int, QByteArray> hash;
-    
+
     hash[ObjectRole] = "object";
     hash[TextRole] = "text";
-    
+
     return hash;
 }
 
@@ -81,44 +81,44 @@ bool QmlObjectListModel::setData(const QModelIndex& index, const QVariant& value
         emit dataChanged(index, index);
         return true;
     }
-    
+
     return false;
 }
 
 bool QmlObjectListModel::insertRows(int position, int rows, const QModelIndex& parent)
 {
     Q_UNUSED(parent);
-    
+
     if (position < 0 || position > _objectList.count() + 1) {
         qCWarning(QmlObjectListModelLog) << "Invalid position - position:count" << position << _objectList.count() << this;
     }
-    
+
     beginInsertRows(QModelIndex(), position, position + rows - 1);
     endInsertRows();
 
     _signalCountChangedIfNotNested();
-    
+
     return true;
 }
 
 bool QmlObjectListModel::removeRows(int position, int rows, const QModelIndex& parent)
 {
     Q_UNUSED(parent);
-    
+
     if (position < 0 || position >= _objectList.count()) {
         qCWarning(QmlObjectListModelLog) << "Invalid position - position:count" << position << _objectList.count() << this;
     } else if (position + rows > _objectList.count()) {
         qCWarning(QmlObjectListModelLog) << "Invalid rows - position:rows:count" << position << rows << _objectList.count() << this;
     }
-    
+
     beginRemoveRows(QModelIndex(), position, position + rows - 1);
     for (int row=0; row<rows; row++) {
         _objectList.removeAt(position);
     }
     endRemoveRows();
-    
+
     _signalCountChangedIfNotNested();
-    
+
     return true;
 }
 
diff --git a/src/QmlControls/QmlObjectListModel.h b/src/QmlControls/QmlObjectListModel.h
index 44495aa5205d..a46d183ccc46 100644
--- a/src/QmlControls/QmlObjectListModel.h
+++ b/src/QmlControls/QmlObjectListModel.h
@@ -24,9 +24,9 @@ class QmlObjectListModel : public QAbstractListModel
 public:
     QmlObjectListModel(QObject* parent = nullptr);
     ~QmlObjectListModel() override;
-    
+
     Q_PROPERTY(int count READ count NOTIFY countChanged)
-    
+
     /// Returns true if any of the items in the list are dirty. Requires each object to have
     /// a dirty property and dirtyChanged signal.
     Q_PROPERTY(bool dirty READ dirty WRITE setDirty NOTIFY dirtyChanged)
@@ -35,8 +35,9 @@ class QmlObjectListModel : public QAbstractListModel
     const QObject *get(int index) const;
 
     // Property accessors
-    
+
     int         count               () const;
+    bool        isEmpty             () const { return (count() == 0); }
     bool        dirty               () const { return _dirty; }
 
     void        setDirty            (bool dirty);
@@ -73,13 +74,13 @@ class QmlObjectListModel : public QAbstractListModel
 signals:
     void countChanged               (int count);
     void dirtyChanged               (bool dirtyChanged);
-    
+
 private slots:
     void _childDirtyChanged         (bool dirty);
-    
+
 private:
     void _signalCountChangedIfNotNested();
-    
+
     // Overrides from QAbstractListModel
     int         rowCount    (const QModelIndex & parent = QModelIndex()) const override;
     QVariant    data        (const QModelIndex & index, int role = Qt::DisplayRole) const override;
@@ -90,11 +91,11 @@ private slots:
 
 private:
     QList<QObject*> _objectList;
-    
+
     bool _dirty;
     bool _skipDirtyFirstItem;
     uint _resetModelNestingCount = 0;
-        
+
     static constexpr int ObjectRole = Qt::UserRole;
     static constexpr int TextRole = Qt::UserRole + 1;
 };
diff --git a/src/QmlControls/RCChannelMonitorController.cc b/src/QmlControls/RCChannelMonitorController.cc
index 7ed3402f32e6..dc83fe8e9259 100644
--- a/src/QmlControls/RCChannelMonitorController.cc
+++ b/src/QmlControls/RCChannelMonitorController.cc
@@ -12,7 +12,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(RCChannelMonitorControllerLog, "qgc.qmlcontrols.rcchannelmonitorcontroller")
+QGC_LOGGING_CATEGORY(RCChannelMonitorControllerLog, "QMLControls.RCChannelMonitorController")
 
 RCChannelMonitorController::RCChannelMonitorController(QObject *parent)
     : FactPanelController(parent)
diff --git a/src/QmlControls/RCToParamDialogController.cc b/src/QmlControls/RCToParamDialogController.cc
index 2bfdeea6adee..03f85302bff6 100644
--- a/src/QmlControls/RCToParamDialogController.cc
+++ b/src/QmlControls/RCToParamDialogController.cc
@@ -14,7 +14,7 @@
 #include "QGCLoggingCategory.h"
 #include "Fact.h"
 
-QGC_LOGGING_CATEGORY(RCToParamDialogControllerLog, "qgc.qmlcontrols.rctoparamdialogcontroller")
+QGC_LOGGING_CATEGORY(RCToParamDialogControllerLog, "QMLControls.RCToParamDialogController")
 
 QMap<QString, FactMetaData*> RCToParamDialogController::_metaDataMap;
 
diff --git a/src/QmlControls/RemoteIDIndicatorPage.qml b/src/QmlControls/RemoteIDIndicatorPage.qml
index 4a3e82c623fd..aeec178db889 100644
--- a/src/QmlControls/RemoteIDIndicatorPage.qml
+++ b/src/QmlControls/RemoteIDIndicatorPage.qml
@@ -29,7 +29,7 @@ ToolIndicatorPage {
     property bool   commsFlag:          _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager.commsGood          : false
     property bool   emergencyDeclared:  _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager.emergencyDeclared  : false
     property bool   operatorIDFlag:     _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager.operatorIDGood     : false
-    
+
     property int    _regionOperation:   QGroundControl.settingsManager.remoteIDSettings.region.value
 
     // Flags visual properties
@@ -58,6 +58,7 @@ ToolIndicatorPage {
 
     function goToSettings() {
         if (mainWindow.allowViewSwitch()) {
+            mainWindow.closeIndicatorDrawer()
             globals.commingFromRIDIndicator = true
             mainWindow.showSettingsTool()
         }
@@ -141,7 +142,7 @@ ToolIndicatorPage {
                             onClicked:      goToSettings()
                         }
                     }
-                    
+
                     Image {
                         id:                 gpsFlagImage
                         width:              flagsWidth
@@ -339,19 +340,30 @@ ToolIndicatorPage {
                 }
 
                 SettingsGroupLayout {
-                    heading:                qsTr("Self ID")
-                    headingDescription:     qsTr("If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.")
+                    heading:            qsTr("Self ID")
                     Layout.fillWidth:       true
-                    Layout.preferredWidth:  textLabelWidth + textFieldWidth
 
-                    FactCheckBoxSlider {
-                        id:                 sendSelfIDSlider
-                        text:               qsTr("Broadcast")
-                        fact:               _fact
-                        visible:            _fact.visible
+                    ColumnLayout {
                         Layout.fillWidth:   true
+                        spacing:            ScreenTools.defaultFontPixelHeight / 2
+
+                        FactCheckBoxSlider {
+                            id:                 sendSelfIDSlider
+                            text:               qsTr("Broadcast")
+                            fact:               _fact
+                            visible:            _fact.visible
+                            Layout.fillWidth:   true
 
-                        property Fact _fact: remoteIDSettings.sendSelfID
+                            property Fact _fact: remoteIDSettings.sendSelfID
+                        }
+
+                        QGCLabel {
+                            text:                   qsTr("If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.")
+                            font.pointSize:         ScreenTools.smallFontPointSize
+                            wrapMode:               Text.WordWrap
+                            Layout.preferredWidth:  sendSelfIDSlider.width
+                            visible:                !sendSelfIDSlider._fact.rawValue
+                        }
                     }
 
                     LabelledFactComboBox {
diff --git a/src/QmlControls/ScreenToolsController.cc b/src/QmlControls/ScreenToolsController.cc
index f3e0b24209e8..21c47f7512e3 100644
--- a/src/QmlControls/ScreenToolsController.cc
+++ b/src/QmlControls/ScreenToolsController.cc
@@ -26,7 +26,7 @@
 #include <sys/utsname.h>
 #endif
 
-QGC_LOGGING_CATEGORY(ScreenToolsControllerLog, "qgc.qmlcontrols.screentoolscontroller")
+QGC_LOGGING_CATEGORY(ScreenToolsControllerLog, "QMLControls.ScreenToolsController")
 
 ScreenToolsController::ScreenToolsController(QObject *parent)
     : QObject(parent)
diff --git a/src/QmlControls/SelectableControl.qml b/src/QmlControls/SelectableControl.qml
index 7020ba22f838..d2a575a04766 100644
--- a/src/QmlControls/SelectableControl.qml
+++ b/src/QmlControls/SelectableControl.qml
@@ -29,7 +29,7 @@ Control {
     bottomPadding:  0
     leftPadding:    0
     rightPadding:   0
-    
+
     property Fact selectedControl               ///< Fact which has enumStrings/Values where values are the qml file for the control
     property bool selectionUIRightAnchor: false
     property var  innerControl:           loader.item
diff --git a/src/QmlControls/SettingsGroupLayout.qml b/src/QmlControls/SettingsGroupLayout.qml
index 0638943d028f..642f481b0938 100644
--- a/src/QmlControls/SettingsGroupLayout.qml
+++ b/src/QmlControls/SettingsGroupLayout.qml
@@ -6,7 +6,7 @@ import QGroundControl.Controls
 
 
 ColumnLayout {
-    id:                 control    
+    id:                 control
     spacing:            _margins / 2
     implicitWidth:      _contentLayout.implicitWidth + (_margins * 2)
     implicitHeight:     _contentLayout.implicitHeight + (_margins * 2)
@@ -27,17 +27,6 @@ ColumnLayout {
     property bool   showBorder:         true
 
     property real _margins: ScreenTools.defaultFontPixelHeight / 2
-    property int _visibleItemCount: _countVisibleItems()
-
-    function _countVisibleItems() {
-        var count = 0
-        for (var i = 0; i < _contentLayout.children.length; i++) {
-            if (_contentLayout.children[i].visible) {
-                count++
-            }
-        }
-        return count
-    }
 
     ColumnLayout {
         Layout.leftMargin:  _margins
@@ -45,13 +34,13 @@ ColumnLayout {
         spacing:            0
         visible:            heading !== ""
 
-        QGCLabel { 
+        QGCLabel {
             text:           heading
             font.pointSize: headingPointSize
             font.bold:      true
         }
 
-        QGCLabel { 
+        QGCLabel {
             Layout.fillWidth:   true
             text:               headingDescription
             wrapMode:           Text.WordWrap
@@ -71,7 +60,7 @@ ColumnLayout {
         radius:             ScreenTools.defaultFontPixelHeight / 2
 
         Repeater {
-            model: showDividers ? _contentLayout.children.length : 0
+            model: showDividers ? Math.max(0, _contentLayout.visibleChildren.length - 1) : 0
 
             Rectangle {
                 x:                  showBorder ? _margins : 0
@@ -79,20 +68,17 @@ ColumnLayout {
                 width:              parent.width - (showBorder ? _margins * 2 : 0)
                 height:             1
                 color:              QGroundControl.globalPalette.groupBorder
-                visible:            _contentItem.visible && _contentItem.width > 0 && _contentItem.height > 0 &&
-                                    _visibleItemCount > 1 && (index < _contentLayout.children.length - 1) &&
-                                    _contentLayout.children[index + 1].visible
 
-                property var _contentItem: _contentLayout.children[index]
+                property var _contentItem: _contentLayout.visibleChildren[index]
             }
         }
- 
+
         ColumnLayout {
             id:                 _contentLayout
             x:                  showBorder ? _margins : 0
             y:                  showBorder ? _margins : 0
             width:              parent.width - (showBorder ? _margins * 2 : 0)
-            spacing:            _margins * 2
+            spacing:            _margins * (showDividers ? 2 : 1)
         }
     }
 }
diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml
index 51d29abf17d7..a39dd8878e92 100644
--- a/src/QmlControls/SliderSwitch.qml
+++ b/src/QmlControls/SliderSwitch.qml
@@ -19,7 +19,7 @@ Rectangle {
     property string confirmText                         ///< Text for slider
     property alias  fontPointSize: label.font.pointSize ///< Point size for text
 
-    property real _border:                      4   
+    property real _border:                      4
     property real _diameter:                    height - (_border * 2)
     property real _dragStartX:                  _border
     property real _dragStopX:                   _root.width - (_diameter + _border)
diff --git a/src/QmlControls/TerrainProfile.cc b/src/QmlControls/TerrainProfile.cc
index 275ccf2308a0..54d263223818 100644
--- a/src/QmlControls/TerrainProfile.cc
+++ b/src/QmlControls/TerrainProfile.cc
@@ -17,7 +17,7 @@
 
 #include <QtQuick/QSGFlatColorMaterial>
 
-QGC_LOGGING_CATEGORY(TerrainProfileLog, "TerrainProfileLog")
+QGC_LOGGING_CATEGORY(TerrainProfileLog, "Terrain.TerrainProfile")
 
 TerrainProfile::TerrainProfile(QQuickItem* parent)
     : QQuickItem(parent)
diff --git a/src/QmlControls/TimedProgressTracker.qml b/src/QmlControls/TimedProgressTracker.qml
index b98c7311b987..47f5039175dc 100644
--- a/src/QmlControls/TimedProgressTracker.qml
+++ b/src/QmlControls/TimedProgressTracker.qml
@@ -6,14 +6,14 @@ Item {
     property real   timeoutSeconds:     0
     property string progressLabel:      ""
     property bool   running:            false
-    
+
     // Do not set these properties
     property real   progress:           0
-    
+
     signal timeout()
-    
+
     property double _lastUpdateTime:    0
-    
+
     Timer {
         id:             timeoutTimer
         interval:       timeoutSeconds * 1000
@@ -27,43 +27,43 @@ Item {
             root.timeout()
         }
     }
-    
-    SequentialAnimation on progress { 
+
+    SequentialAnimation on progress {
         id:             progressAnimation
         running:        root.running
         loops:          1
 
-        NumberAnimation { 
+        NumberAnimation {
             target: root
             property: "progress"
             to: 1
-            duration: timeoutSeconds * 1000 
+            duration: timeoutSeconds * 1000
         }
     }
-    
+
     onProgressChanged: {
         const currentTime = Date.now() * 0.001
         if (currentTime - _lastUpdateTime < 0.1) {
             return
         }
-        
+
         if (running) {
             var currentCount = (progress * timeoutSeconds)
             progressLabel = (timeoutSeconds - currentCount).toFixed(1)
         } else {
             progressLabel = ""
         }
-        
+
         _lastUpdateTime = currentTime
     }
-    
+
     function start() {
         running = true
         progress = 0
         timeoutTimer.restart()
         progressAnimation.restart()
     }
-    
+
     function stop() {
         running = false
         progress = 0
diff --git a/src/QmlControls/ToolIndicatorPage.qml b/src/QmlControls/ToolIndicatorPage.qml
index 07cb0e6eeb53..7fc043bf8f8e 100644
--- a/src/QmlControls/ToolIndicatorPage.qml
+++ b/src/QmlControls/ToolIndicatorPage.qml
@@ -55,7 +55,7 @@ RowLayout {
         color:                  QGroundControl.globalPalette.groupBorder
         visible:                expanded
     }
-    
+
     Loader {
         id:                     expandedItemLoader
         Layout.alignment:       Qt.AlignTop
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index dd309094efcd..d6f673a54b5f 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -17,20 +17,18 @@ import QGroundControl.Controls
 
 Rectangle {
     id:         _root
-    color:      qgcPal.toolbarBackground
-    width:      ScreenTools.defaultFontPixelWidth * 8
+    color:      qgcPal.windowTransparent
+    width:      ScreenTools.defaultFontPixelWidth * 7
     height:     Math.min(maxHeight, toolStripColumn.height + (flickable.anchors.margins * 2))
     radius:     ScreenTools.defaultFontPixelWidth / 2
 
     property alias  model:              repeater.model
     property real   maxHeight           ///< Maximum height for control, determines whether text is hidden to make control shorter
-    property alias  title:              titleLabel.text
     property var    fontSize:           ScreenTools.smallFontPointSize
 
     property var _dropPanel: dropPanel
 
     function simulateClick(buttonIndex) {
-        buttonIndex = buttonIndex + 1 // skip over title label
         var button = toolStripColumn.children[buttonIndex]
         if (button.checkable) {
             button.checked = !button.checked
@@ -61,15 +59,6 @@ Rectangle {
             anchors.right:  parent.right
             spacing:        ScreenTools.defaultFontPixelWidth * 0.25
 
-            QGCLabel {
-                id:                     titleLabel
-                anchors.left:           parent.left
-                anchors.right:          parent.right
-                horizontalAlignment:    Text.AlignHCenter
-                font.pointSize:         ScreenTools.smallFontPointSize
-                visible:                title != ""
-            }
-
             Repeater {
                 id: repeater
 
diff --git a/src/QmlControls/ToolStripAction.h b/src/QmlControls/ToolStripAction.h
index 67f882c79c6a..000b39104e53 100644
--- a/src/QmlControls/ToolStripAction.h
+++ b/src/QmlControls/ToolStripAction.h
@@ -17,18 +17,18 @@ class ToolStripAction : public QObject
 {
     Q_OBJECT
     QML_ELEMENT
-    
+
 public:
     ToolStripAction(QObject* parent = nullptr);
-    
+
     Q_PROPERTY(bool             enabled             READ enabled                WRITE setEnabled                NOTIFY enabledChanged)
     Q_PROPERTY(bool             visible             READ visible                WRITE setVisible                NOTIFY visibleChanged)
     Q_PROPERTY(bool             checkable           READ checkable              WRITE setCheckable              NOTIFY checkableChanged)
     Q_PROPERTY(bool             checked             READ checked                WRITE setChecked                NOTIFY checkedChanged)
     Q_PROPERTY(bool             showAlternateIcon   READ showAlternateIcon      WRITE setShowAlternateIcon      NOTIFY showAlternateIconChanged)
     Q_PROPERTY(bool             biColorIcon         READ biColorIcon            WRITE setbiColorIcon            NOTIFY biColorIconChanged)
-    Q_PROPERTY(bool             fullColorIcon       READ fullColorIcon          WRITE setfullColorIcon          NOTIFY fullColorIconChanged)   
-    Q_PROPERTY(bool             nonExclusive        READ nonExclusive           WRITE setNonExclusive           NOTIFY nonExclusiveChanged)   
+    Q_PROPERTY(bool             fullColorIcon       READ fullColorIcon          WRITE setfullColorIcon          NOTIFY fullColorIconChanged)
+    Q_PROPERTY(bool             nonExclusive        READ nonExclusive           WRITE setNonExclusive           NOTIFY nonExclusiveChanged)
     Q_PROPERTY(int              toolStripIndex      READ toolStripIndex         WRITE setToolStripIndex         NOTIFY toolStripIndexChanged)
     Q_PROPERTY(QString          text                READ text                   WRITE setText                   NOTIFY textChanged)
     Q_PROPERTY(QString          iconSource          READ iconSource             WRITE setIconSource             NOTIFY iconSourceChanged)
diff --git a/src/QmlControls/ToolStripActionList.h b/src/QmlControls/ToolStripActionList.h
index 52244996a369..b4622c6e700f 100644
--- a/src/QmlControls/ToolStripActionList.h
+++ b/src/QmlControls/ToolStripActionList.h
@@ -19,7 +19,7 @@ class ToolStripActionList : public QObject
     QML_ELEMENT
 public:
     explicit ToolStripActionList(QObject* parent = nullptr);
-    
+
     Q_PROPERTY(QQmlListProperty<QObject> model READ model NOTIFY modelChanged)
 
     QQmlListProperty<QObject> model();
diff --git a/src/QmlControls/ToolStripHoverButton.qml b/src/QmlControls/ToolStripHoverButton.qml
index 80b93106e0d0..ef4898982668 100644
--- a/src/QmlControls/ToolStripHoverButton.qml
+++ b/src/QmlControls/ToolStripHoverButton.qml
@@ -13,7 +13,6 @@ import QtQuick.Controls
 import QGroundControl
 import QGroundControl.Controls
 
-
 Button {
     id:             control
     width:          contentLayoutItem.contentWidth + (contentMargins * 2)
@@ -37,8 +36,8 @@ Button {
     property real imageScale:        forceImageScale11 && (text == "") ? 0.8 : 0.6
     property real contentMargins:    innerText.height * 0.1
 
-    property color _currentContentColor:  (checked || pressed) ? qgcPal.buttonHighlightText : qgcPal.buttonText
-    property color _currentContentColorSecondary:  (checked || pressed) ? qgcPal.buttonText : qgcPal.buttonHighlight
+    property color _currentContentColor:  (checked || pressed) ? qgcPal.buttonHighlightText : qgcPal.windowTransparentText
+    property color _currentContentColorSecondary:  (checked || pressed) ? qgcPal.windowTransparentText : qgcPal.buttonHighlight
 
     signal dropped(int index)
 
@@ -69,7 +68,7 @@ Button {
 
         Column {
             anchors.centerIn:   parent
-            spacing:        contentMargins * 2
+            spacing:            0
 
             Image {
                 id:                         innerImageColorful
@@ -99,7 +98,7 @@ Button {
                 sourceSize.width:           width
                 anchors.horizontalCenter:   parent.horizontalCenter
                 visible:                    source != "" && !modelData.fullColorIcon
-                
+
                 QGCColoredImage {
                     id:                         innerImageSecondColor
                     source:                     modelData.alternateIconSource
@@ -129,10 +128,9 @@ Button {
     }
 
     background: Rectangle {
-        id:             buttonBkRect
-        color:          (control.checked || control.pressed) ?
-                            qgcPal.buttonHighlight :
-                            ((control.enabled && control.hovered) ? qgcPal.toolStripHoverColor : qgcPal.toolbarBackground)
-        anchors.fill:   parent
+        id:     buttonBkRect
+        color:  (control.checked || control.pressed) ?
+                    qgcPal.buttonHighlight :
+                    ((control.enabled && control.hovered) ? qgcPal.toolStripHoverColor : "transparent")
     }
 }
diff --git a/src/QmlControls/ValueSlider.qml b/src/QmlControls/ValueSlider.qml
index 6ed2bec2bb77..2d1af33d2105 100644
--- a/src/QmlControls/ValueSlider.qml
+++ b/src/QmlControls/ValueSlider.qml
@@ -52,11 +52,11 @@ Control {
 
     // Add additional major ticks above/below min/max to ensure we can display the full visual range of the slider
     property int    _majorTicksVisibleBeyondIndicator:  Math.ceil(_indicatorCenterPos / _majorTickSpacing)
-    property int    _majorTicksExtentsAdjustment:       _majorTicksVisibleBeyondIndicator * majorTickStepSize
+    property real   _majorTicksExtentsAdjustment:       _majorTicksVisibleBeyondIndicator * majorTickStepSize
 
     // Calculate the min/max for the full slider range
-    property int    _majorTickMinValue: Math.floor((from - _majorTicksExtentsAdjustment) / majorTickStepSize) * majorTickStepSize
-    property int    _majorTickMaxValue: Math.floor((to + _majorTicksExtentsAdjustment) / majorTickStepSize) * majorTickStepSize
+    property real   _majorTickMinValue: Math.floor((from - _majorTicksExtentsAdjustment) / majorTickStepSize) * majorTickStepSize
+    property real   _majorTickMaxValue: Math.floor((to + _majorTicksExtentsAdjustment) / majorTickStepSize) * majorTickStepSize
 
     // Now calculate the position we draw the first tick mark such that we are not allowed to flick above the max value
     property real   _firstTickPixelOffset:  _indicatorCenterPos - ((from - _majorTickMinValue) / _sliderValuePerPixel)
@@ -77,16 +77,36 @@ Control {
             control.value = value
             _recalcSliderPos(false)
         }
-    }    
+    }
+
+    function _outputInternalValues() {
+        console.log("ValueSlider: width", width)
+        console.log("ValueSlider: _indicatorCenterPos", _indicatorCenterPos)
+        console.log("ValueSlider: _firstPixelValue", _firstPixelValue)
+        console.log("ValueSlider: _firstTickPixelOffset", _firstTickPixelOffset)
+        console.log("ValueSlider: _sliderValuePerPixel", _sliderValuePerPixel)
+        console.log("ValueSlider: _indicatorCenterPos", _indicatorCenterPos)
+        console.log("ValueSlider: _majorTickSpacing", _majorTickSpacing)
+        console.log("ValueSlider: _majorTickSize", _majorTickSize)
+        console.log("ValueSlider: _minorTickSize", _minorTickSize)
+        console.log("ValueSlider: _majorTicksVisibleBeyondIndicator", _majorTicksVisibleBeyondIndicator)
+        console.log("ValueSlider: _majorTicksExtentsAdjustment", _majorTicksExtentsAdjustment)
+        console.log("ValueSlider: _majorTickMinValue", _majorTickMinValue)
+        console.log("ValueSlider: _majorTickMaxValue", _majorTickMaxValue)
+        console.log("ValueSlider: _cMajorTicks", _cMajorTicks)
+        console.log("ValueSlider: _sliderContentSize", _sliderContentSize)
+    }
 
     Component.onCompleted: {
         _recalcSliderPos(false)
+        //_outputInternalValues()
         _loadComplete = true
     }
 
     onWidthChanged: {
         if (_loadComplete) {
             _recalcSliderPos()
+            //_outputInternalValues()
         }
     }
 
diff --git a/src/QtLocationPlugin/CMakeLists.txt b/src/QtLocationPlugin/CMakeLists.txt
index 15d4a7c29a88..3f71fd0627b8 100644
--- a/src/QtLocationPlugin/CMakeLists.txt
+++ b/src/QtLocationPlugin/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Qt Location Plugin Module
+# Custom map tile providers and caching engine
+# ============================================================================
+
 qt_add_plugin(QGCLocation
     STATIC
     CLASS_NAME QGeoServiceProviderFactoryQGC
@@ -16,6 +21,8 @@ qt_add_plugin(QGCLocation
     Providers/MapboxMapProvider.h
     Providers/MapProvider.cpp
     Providers/MapProvider.h
+    Providers/TianDiTuProvider.cpp
+    Providers/TianDiTuProvider.h
     QGCCachedTileSet.cpp
     QGCCachedTileSet.h
     QGCCacheTile.h
@@ -44,10 +51,17 @@ qt_add_plugin(QGCLocation
     QGeoTileFetcherQGC.h
 )
 
+# ----------------------------------------------------------------------------
+# Platform-Specific Configuration
+# ----------------------------------------------------------------------------
+# Google Maps not available on iOS
 if(IOS)
     target_compile_definitions(QGCLocation PRIVATE QGC_NO_GOOGLE_MAPS)
 endif()
 
+# ----------------------------------------------------------------------------
+# Dependencies
+# ----------------------------------------------------------------------------
 target_link_libraries(QGCLocation
     PRIVATE
         Qt6::Positioning
diff --git a/src/QtLocationPlugin/Providers/EsriMapProvider.h b/src/QtLocationPlugin/Providers/EsriMapProvider.h
index ef423ce2eb33..5ebe5c9ee656 100644
--- a/src/QtLocationPlugin/Providers/EsriMapProvider.h
+++ b/src/QtLocationPlugin/Providers/EsriMapProvider.h
@@ -40,7 +40,7 @@ class EsriWorldStreetMapProvider : public EsriMapProvider
         : EsriMapProvider(
             QStringLiteral("Esri World Street"),
             QStringLiteral("World_Street_Map"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap) {}
 };
 
@@ -51,7 +51,7 @@ class EsriWorldSatelliteMapProvider : public EsriMapProvider
         : EsriMapProvider(
             QStringLiteral("Esri World Satellite"),
             QStringLiteral("World_Imagery"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::SatelliteMapDay) {}
 };
 
@@ -62,6 +62,6 @@ class EsriTerrainMapProvider : public EsriMapProvider
         : EsriMapProvider(
             QStringLiteral("Esri Terrain"),
             QStringLiteral("World_Terrain_Base"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::TerrainMap) {}
 };
diff --git a/src/QtLocationPlugin/Providers/GenericMapProvider.cpp b/src/QtLocationPlugin/Providers/GenericMapProvider.cpp
index b753317ae83f..d379c2a3fad8 100644
--- a/src/QtLocationPlugin/Providers/GenericMapProvider.cpp
+++ b/src/QtLocationPlugin/Providers/GenericMapProvider.cpp
@@ -31,6 +31,19 @@ QString LINZBasemapMapProvider::_getURL(int x, int y, int zoom) const
     return _mapUrl.arg(zoom).arg(x).arg(y).arg(_imageFormat);
 }
 
+QString OpenAIPMapProvider::_getURL(int x, int y, int zoom) const
+{
+    const QString apiKey = SettingsManager::instance()->appSettings()->openaipToken()->rawValue().toString();
+
+    QString url = _mapUrl.arg(zoom).arg(x).arg(y);
+
+    if (!apiKey.isEmpty()) {
+        url += QStringLiteral("?apiKey=%1").arg(apiKey);
+    }
+
+    return url;
+}
+
 QString OpenStreetMapProvider::_getURL(int x, int y, int zoom) const
 {
     return _mapUrl.arg(zoom).arg(x).arg(y);
diff --git a/src/QtLocationPlugin/Providers/GenericMapProvider.h b/src/QtLocationPlugin/Providers/GenericMapProvider.h
index 5952e87ba38e..8d094d958b07 100644
--- a/src/QtLocationPlugin/Providers/GenericMapProvider.h
+++ b/src/QtLocationPlugin/Providers/GenericMapProvider.h
@@ -18,7 +18,7 @@ class CustomURLMapProvider : public MapProvider
             QStringLiteral("CustomURL Custom"),
             QStringLiteral(""),
             QStringLiteral(""),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 
 private:
@@ -33,7 +33,7 @@ class CyberJapanMapProvider : public MapProvider
             mapName,
             QStringLiteral("https://cyberjapandata.gsi.go.jp/xyz/std"),
             imageFormat,
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap)
         , _mapTypeId(mapName) {}
 
@@ -102,7 +102,7 @@ class LINZBasemapMapProvider : public MapProvider
             QStringLiteral("LINZ Basemap"),
             QStringLiteral("https://basemaps.linz.govt.nz/v1/tiles/aerial"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::SatelliteMapDay) {}
 
 private:
@@ -111,6 +111,23 @@ class LINZBasemapMapProvider : public MapProvider
     const QString _mapUrl = QStringLiteral("https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/%1/%2/%3.%4?api=d01ev80nqcjxddfvc6amyvkk1ka");
 };
 
+class OpenAIPMapProvider : public MapProvider
+{
+public:
+    OpenAIPMapProvider()
+        : MapProvider(
+            QStringLiteral("OpenAIP"),
+            QStringLiteral("https://www.openaip.net"),
+            QStringLiteral("png"),
+            QGC_AVERAGE_TILE_SIZE,
+            QGeoMapType::CustomMap) {}
+
+private:
+    QString _getURL(int x, int y, int zoom) const final;
+
+    const QString _mapUrl = QStringLiteral("https://api.tiles.openaip.net/api/data/openaip/%1/%2/%3.png");
+};
+
 class OpenStreetMapProvider : public MapProvider
 {
 public:
@@ -119,7 +136,7 @@ class OpenStreetMapProvider : public MapProvider
             QStringLiteral("Street Map"),
             QStringLiteral("https://www.openstreetmap.org"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap) {}
 
 private:
@@ -136,7 +153,7 @@ class StatkartMapProvider : public MapProvider
             mapName,
             QStringLiteral("https://norgeskart.no/"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap)
         , _mapTypeId(mapName) {}
 
@@ -144,7 +161,7 @@ class StatkartMapProvider : public MapProvider
     QString _getURL(int x, int y, int zoom) const final;
 
     const QString _mapTypeId;
-    const QString _mapUrl = QStringLiteral("https://cache.kartverket.no/v1/wmts/1.0.0/topo/default/webmercator/%1/%2/%3");
+    const QString _mapUrl = QStringLiteral("https://cache.kartverket.no/v1/wmts/1.0.0/topo/default/webmercator/%1/%2/%3.png");
 };
 
 class StatkartTopoMapProvider : public StatkartMapProvider
@@ -173,7 +190,7 @@ class SvalbardMapProvider : public MapProvider
             QStringLiteral("Svalbard Topo"),
             QStringLiteral("https://www.npolar.no/"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap) {}
 
 private:
@@ -191,7 +208,7 @@ class EniroMapProvider : public MapProvider
             QStringLiteral("Eniro Topo"),
             QStringLiteral("https://www.eniro.se/"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap) {}
 
 private:
@@ -208,7 +225,7 @@ class MapQuestMapProvider : public MapProvider
             mapName,
             QStringLiteral("https://mapquest.com"),
             QStringLiteral("jpg"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             mapType)
         , _mapTypeId(mapName) {}
 
@@ -266,7 +283,7 @@ class VWorldStreetMapProvider : public VWorldMapProvider
             QStringLiteral("VWorld Street Map"),
             QStringLiteral("Base"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap) {}
 };
 
@@ -278,6 +295,6 @@ class VWorldSatMapProvider : public VWorldMapProvider
             QStringLiteral("VWorld Satellite Map"),
             QStringLiteral("Satellite"),
             QStringLiteral("jpeg"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::SatelliteMapDay) {}
 };
diff --git a/src/QtLocationPlugin/Providers/GoogleMapProvider.h b/src/QtLocationPlugin/Providers/GoogleMapProvider.h
index c3c69c71fb03..5e79bd48c800 100644
--- a/src/QtLocationPlugin/Providers/GoogleMapProvider.h
+++ b/src/QtLocationPlugin/Providers/GoogleMapProvider.h
@@ -89,7 +89,7 @@ class GoogleLabelsMapProvider : public GoogleMapProvider
             QStringLiteral("lyrs"),
             QStringLiteral("h"),
             QStringLiteral("png"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 };
 
diff --git a/src/QtLocationPlugin/Providers/MapProvider.cpp b/src/QtLocationPlugin/Providers/MapProvider.cpp
index 721afa878270..43c0fdcc085b 100644
--- a/src/QtLocationPlugin/Providers/MapProvider.cpp
+++ b/src/QtLocationPlugin/Providers/MapProvider.cpp
@@ -12,7 +12,7 @@
 
 #include <QtCore/QLocale>
 
-QGC_LOGGING_CATEGORY(MapProviderLog, "qgc.qtlocationplugin.mapprovider")
+QGC_LOGGING_CATEGORY(MapProviderLog, "QtLocationPlugin.MapProvider")
 
 // QtLocation expects MapIds to start at 1 and be sequential.
 int MapProvider::_mapIdIndex = 1;
diff --git a/src/QtLocationPlugin/Providers/MapProvider.h b/src/QtLocationPlugin/Providers/MapProvider.h
index a47fd6e586f1..d1974a91480a 100644
--- a/src/QtLocationPlugin/Providers/MapProvider.h
+++ b/src/QtLocationPlugin/Providers/MapProvider.h
@@ -34,14 +34,14 @@ Q_DECLARE_LOGGING_CATEGORY(MapProviderLog)
     CustomMap = 100
 };*/
 
-#define MAX_MAP_ZOOM 23.0
-static constexpr const quint32 AVERAGE_TILE_SIZE = 13652;
+#define QGC_MAX_MAP_ZOOM 23
+static constexpr const quint32 QGC_AVERAGE_TILE_SIZE = 13652;
 
 // TODO: Inherit from QGeoMapType
 class MapProvider
 {
 public:
-    MapProvider(const QString &mapName, const QString &referrer, const QString &imageFormat, quint32 averageSize = AVERAGE_TILE_SIZE,
+    MapProvider(const QString &mapName, const QString &referrer, const QString &imageFormat, quint32 averageSize = QGC_AVERAGE_TILE_SIZE,
                 QGeoMapType::MapStyle mapStyle = QGeoMapType::CustomMap);
     virtual ~MapProvider();
 
diff --git a/src/QtLocationPlugin/Providers/MapboxMapProvider.h b/src/QtLocationPlugin/Providers/MapboxMapProvider.h
index dd9801bf8e29..e6c1baaf5dff 100644
--- a/src/QtLocationPlugin/Providers/MapboxMapProvider.h
+++ b/src/QtLocationPlugin/Providers/MapboxMapProvider.h
@@ -50,7 +50,7 @@ class MapboxLightMapProvider : public MapboxMapProvider
         : MapboxMapProvider(
             QStringLiteral("Mapbox Light"),
             QStringLiteral("light-v9"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 };
 
@@ -61,7 +61,7 @@ class MapboxDarkMapProvider : public MapboxMapProvider
         : MapboxMapProvider(
             QStringLiteral("Mapbox Dark"),
             QStringLiteral("dark-v9"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 };
 
@@ -94,7 +94,7 @@ class MapboxBrightMapProvider : public MapboxMapProvider
         : MapboxMapProvider(
             QStringLiteral("Mapbox Bright"),
             QStringLiteral("bright-v9"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 };
 
@@ -105,7 +105,7 @@ class MapboxStreetsBasicMapProvider : public MapboxMapProvider
         : MapboxMapProvider(
             QStringLiteral("Mapbox StreetsBasic"),
             QStringLiteral("basic-v9"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::StreetMap) {}
 };
 
@@ -116,7 +116,7 @@ class MapboxOutdoorsMapProvider : public MapboxMapProvider
         : MapboxMapProvider(
             QStringLiteral("Mapbox Outdoors"),
             QStringLiteral("outdoors-v10"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 };
 
@@ -127,6 +127,6 @@ class MapboxCustomMapProvider : public MapboxMapProvider
         : MapboxMapProvider(
             QStringLiteral("Mapbox Custom"),
             QStringLiteral("mapbox.custom"),
-            AVERAGE_TILE_SIZE,
+            QGC_AVERAGE_TILE_SIZE,
             QGeoMapType::CustomMap) {}
 };
diff --git a/src/QtLocationPlugin/Providers/TianDiTuProvider.cpp b/src/QtLocationPlugin/Providers/TianDiTuProvider.cpp
new file mode 100644
index 000000000000..fbd222c8daf0
--- /dev/null
+++ b/src/QtLocationPlugin/Providers/TianDiTuProvider.cpp
@@ -0,0 +1,29 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "TianDiTuProvider.h"
+#include "SettingsManager.h"
+#include "AppSettings.h"
+
+QString TianDiTuProvider::_getURL(int x, int y, int zoom) const
+{
+    //"https://t%1.tianditu.gov.cn/DataServer?tk=%2&T=%3&x=%4&y=%5&l=%6"
+    const QString tiandituToken = SettingsManager::instance()->appSettings()->tiandituToken()->rawValue().toString();
+    if (!tiandituToken.isEmpty()) {
+        return _mapUrl
+            .arg(_getServerNum(x, y, 8))
+            .arg(tiandituToken)
+            .arg(_mapType)
+            .arg(x)
+            .arg(y)
+            .arg(zoom)
+            ;
+    }
+    return QString();
+}
diff --git a/src/QtLocationPlugin/Providers/TianDiTuProvider.h b/src/QtLocationPlugin/Providers/TianDiTuProvider.h
new file mode 100644
index 000000000000..9026f37caacf
--- /dev/null
+++ b/src/QtLocationPlugin/Providers/TianDiTuProvider.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "MapProvider.h"
+
+static constexpr const quint32 AVERAGE_TIANDITU_STREET_MAP = 1297;
+static constexpr const quint32 AVERAGE_TIANDITU_SAT_MAP    = 19597;
+
+class TianDiTuProvider : public MapProvider
+{
+protected:
+    TianDiTuProvider(const QString &mapName, const QString &mapTypeCode, const QString &imageFormat, quint32 averageSize,
+                    QGeoMapType::MapStyle mapType)
+        : MapProvider(mapName, QStringLiteral("https://map.tianditu.gov.cn/"), imageFormat, averageSize, mapType)
+        , _mapType(mapTypeCode) {}
+
+private:
+    QString _getURL(int x, int y, int zoom) const final;
+
+    const QString _mapType;
+    const QString _mapUrl = QStringLiteral("https://t%1.tianditu.gov.cn/DataServer?tk=%2&T=%3&x=%4&y=%5&l=%6");
+};
+
+class TianDiTuRoadProvider : public TianDiTuProvider
+{
+public:
+    TianDiTuRoadProvider()
+        : TianDiTuProvider(
+            QObject::tr("TianDiTu Road"),
+            QStringLiteral("cia_w"),
+            QStringLiteral("png"),
+            AVERAGE_TIANDITU_STREET_MAP,
+            QGeoMapType::StreetMap) {}
+};
+
+class TianDiTuSatelliteProvider : public TianDiTuProvider
+{
+public:
+    TianDiTuSatelliteProvider()
+        : TianDiTuProvider(
+            QObject::tr("TianDiTu Satellite"),
+            QStringLiteral("img_w"),
+            QStringLiteral("jpg"),
+            AVERAGE_TIANDITU_SAT_MAP,
+            QGeoMapType::SatelliteMapDay) {}
+};
diff --git a/src/QtLocationPlugin/QGCCacheTile.h b/src/QtLocationPlugin/QGCCacheTile.h
index 056c562c35f6..c6111e4ed1bd 100644
--- a/src/QtLocationPlugin/QGCCacheTile.h
+++ b/src/QtLocationPlugin/QGCCacheTile.h
@@ -9,37 +9,29 @@
 
 #pragma once
 
-#include <QtCore/QString>
 #include <QtCore/QByteArray>
 #include <QtCore/QMetaType>
+#include <QtCore/QString>
 
-class QGCCacheTile
+struct QGCCacheTile
 {
-public:
-    QGCCacheTile(const QString &hash, const QByteArray &img, const QString &format, const QString &type, quint64 tileSet = UINT64_MAX)
-        : m_tileSet(tileSet)
-        , m_hash(hash)
-        , m_img(img)
-        , m_format(format)
-        , m_type(type)
+    QGCCacheTile(const QString &hash_, const QByteArray &img_, const QString &format_, const QString &type_, quint64 tileSet_ = UINT64_MAX)
+        : tileSet(tileSet_)
+        , hash(hash_)
+        , img(img_)
+        , format(format_)
+        , type(type_)
     {}
-    QGCCacheTile(const QString &hash, quint64 tileSet)
-        : m_tileSet(tileSet)
-        , m_hash(hash)
+    QGCCacheTile(const QString &hash_, quint64 tileSet_)
+        : tileSet(tileSet_)
+        , hash(hash_)
     {}
-    ~QGCCacheTile() = default;
-
-    quint64 tileSet() const { return m_tileSet; }
-    const QString &hash() const { return m_hash; }
-    const QByteArray &img() const { return m_img; }
-    const QString &format() const { return m_format; }
-    const QString &type() const { return m_type; }
 
-private:
-    const quint64 m_tileSet = 0;
-    const QString m_hash;
-    const QByteArray m_img;
-    const QString m_format;
-    const QString m_type;
+    const quint64 tileSet = 0;
+    const QString hash;
+    const QByteArray img;
+    const QString format;
+    const QString type;
 };
 Q_DECLARE_METATYPE(QGCCacheTile)
+Q_DECLARE_METATYPE(QGCCacheTile*)
diff --git a/src/QtLocationPlugin/QGCCachedTileSet.cpp b/src/QtLocationPlugin/QGCCachedTileSet.cpp
index a4bba4b09a1c..b6dc2e442cf4 100644
--- a/src/QtLocationPlugin/QGCCachedTileSet.cpp
+++ b/src/QtLocationPlugin/QGCCachedTileSet.cpp
@@ -7,17 +7,14 @@
  *
  ****************************************************************************/
 
-/**
- * @file
- *   @brief Map Tile Set
- *
- *   @author Gus Grubba <gus@auterion.com>
- *
- */
-
 #include "QGCCachedTileSet.h"
 
+#include <QtNetwork/QNetworkProxy>
+
 #include "ElevationMapProvider.h"
+#include "QGCApplication.h"
+#include "QGCFileDownload.h"
+#include "QGCLoggingCategory.h"
 #include "QGCMapEngine.h"
 #include "QGCMapEngineManager.h"
 #include "QGCMapTasks.h"
@@ -25,24 +22,18 @@
 #include "QGeoFileTileCacheQGC.h"
 #include "QGeoTileFetcherQGC.h"
 
-#include <QGCApplication.h>
-#include <QGCFileDownload.h>
-#include <QGCLoggingCategory.h>
-
-#include <QtNetwork/QNetworkProxy>
-
-QGC_LOGGING_CATEGORY(QGCCachedTileSetLog, "qgc.qtlocation.qgccachedtileset")
+QGC_LOGGING_CATEGORY(QGCCachedTileSetLog, "QtLocationPlugin.QGCCachedTileSet")
 
 QGCCachedTileSet::QGCCachedTileSet(const QString &name, QObject *parent)
     : QObject(parent)
     , _name(name)
 {
-    // qCDebug(QGCCachedTileSetLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCCachedTileSetLog) << this;
 }
 
 QGCCachedTileSet::~QGCCachedTileSet()
 {
-    // qCDebug(QGCCachedTileSetLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCCachedTileSetLog) << this;
 }
 
 QString QGCCachedTileSet::downloadStatus() const
@@ -71,12 +62,14 @@ void QGCCachedTileSet::createDownloadTask()
         _noMoreTiles = false;
     }
 
-    QGCGetTileDownloadListTask* const task = new QGCGetTileDownloadListTask(_id, kTileBatchSize);
+    QGCGetTileDownloadListTask *task = new QGCGetTileDownloadListTask(_id, kTileBatchSize);
     (void) connect(task, &QGCGetTileDownloadListTask::tileListFetched, this, &QGCCachedTileSet::_tileListFetched);
     if (_manager) {
         (void) connect(task, &QGCMapTask::error, _manager, &QGCMapEngineManager::taskError);
     }
-    getQGCMapEngine()->addTask(task);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+    }
 
     emit totalTileCountChanged();
     emit totalTilesSizeChanged();
@@ -87,8 +80,12 @@ void QGCCachedTileSet::createDownloadTask()
 void QGCCachedTileSet::resumeDownloadTask()
 {
     _cancelPending = false;
-    QGCUpdateTileDownloadStateTask* const task = new QGCUpdateTileDownloadStateTask(_id, QGCTile::StatePending, "*");
-    getQGCMapEngine()->addTask(task);
+
+    QGCUpdateTileDownloadStateTask *task = new QGCUpdateTileDownloadStateTask(_id, QGCTile::StatePending, "*");
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+    }
+
     createDownloadTask();
 }
 
@@ -118,7 +115,7 @@ void QGCCachedTileSet::_tileListFetched(const QQueue<QGCTile*> &tiles)
 #endif
     }
 
-    (void) _tilesToDownload.append(tiles);
+    _tilesToDownload.append(tiles);
     _prepareDownload();
 }
 
@@ -132,7 +129,7 @@ void QGCCachedTileSet::_doneWithDownload()
         if (_savedTileSize != 0) {
             avg = _savedTileSize / _savedTileCount;
         } else {
-            qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "_savedTileSize=0";
+            qCWarning(QGCCachedTileSetLog) << "_savedTileSize=0";
         }
 
         setUniqueTileSize(_uniqueTileCount * avg);
@@ -160,17 +157,17 @@ void QGCCachedTileSet::_prepareDownload()
         }
 
         QGCTile* const tile = _tilesToDownload.dequeue();
-        const int mapId = UrlFactory::getQtMapIdFromProviderType(tile->type());
-        QNetworkRequest request = QGeoTileFetcherQGC::getNetworkRequest(mapId, tile->x(), tile->y(), tile->z());
+        const int mapId = UrlFactory::getQtMapIdFromProviderType(tile->type);
+        QNetworkRequest request = QGeoTileFetcherQGC::getNetworkRequest(mapId, tile->x, tile->y, tile->z);
         request.setOriginatingObject(this);
-        request.setAttribute(QNetworkRequest::User, tile->hash());
+        request.setAttribute(QNetworkRequest::User, tile->hash);
 
         QNetworkReply* const reply = _networkManager->get(request);
         reply->setParent(this);
         QGCFileDownload::setIgnoreSSLErrorsIfNeeded(*reply);
         (void) connect(reply, &QNetworkReply::finished, this, &QGCCachedTileSet::_networkReplyFinished);
         (void) connect(reply, &QNetworkReply::errorOccurred, this, &QGCCachedTileSet::_networkReplyError);
-        (void) _replies.insert(tile->hash(), reply);
+        (void) _replies.insert(tile->hash, reply);
 
         delete tile;
         if (!_batchRequested && !_noMoreTiles && (_tilesToDownload.count() < (QGeoTileFetcherQGC::concurrentDownloads(_type) * 10))) {
@@ -183,7 +180,7 @@ void QGCCachedTileSet::_networkReplyFinished()
 {
     QNetworkReply* const reply = qobject_cast<QNetworkReply*>(QObject::sender());
     if (!reply) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "NULL Reply";
+        qCWarning(QGCCachedTileSetLog) << "NULL Reply";
         return;
     }
     reply->deleteLater();
@@ -193,26 +190,26 @@ void QGCCachedTileSet::_networkReplyFinished()
     }
 
     if (!reply->isOpen()) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Empty Reply";
+        qCWarning(QGCCachedTileSetLog) << "Empty Reply";
         return;
     }
 
     const QString hash = reply->request().attribute(QNetworkRequest::User).toString();
     if (hash.isEmpty()) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Empty Hash";
+        qCWarning(QGCCachedTileSetLog) << "Empty Hash";
         return;
     }
 
     if (_replies.contains(hash)) {
         (void) _replies.remove(hash);
     } else {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Reply not in list: " << hash;
+        qCWarning(QGCCachedTileSetLog) << "Reply not in list: " << hash;
     }
     qCDebug(QGCCachedTileSetLog) << "Tile fetched:" << hash;
 
     QByteArray image = reply->readAll();
     if (image.isEmpty()) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Empty Image";
+        qCWarning(QGCCachedTileSetLog) << "Empty Image";
         return;
     }
 
@@ -224,21 +221,23 @@ void QGCCachedTileSet::_networkReplyFinished()
         const SharedElevationProvider elevationProvider = std::dynamic_pointer_cast<const ElevationProvider>(mapProvider);
         image = elevationProvider->serialize(image);
         if (image.isEmpty()) {
-            qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Failed to Serialize Terrain Tile";
+            qCWarning(QGCCachedTileSetLog) << "Failed to Serialize Terrain Tile";
             return;
         }
     }
 
     const QString format = mapProvider->getImageFormat(image);
     if (format.isEmpty()) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Empty Format";
+        qCWarning(QGCCachedTileSetLog) << "Empty Format";
         return;
     }
 
     QGeoFileTileCacheQGC::cacheTile(type, hash, image, format, _id);
 
-    QGCUpdateTileDownloadStateTask* const task = new QGCUpdateTileDownloadStateTask(_id, QGCTile::StateComplete, hash);
-    getQGCMapEngine()->addTask(task);
+    QGCUpdateTileDownloadStateTask *task = new QGCUpdateTileDownloadStateTask(_id, QGCTile::StateComplete, hash);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+    }
 
     setSavedTileSize(_savedTileSize + image.size());
     setSavedTileCount(_savedTileCount + 1);
@@ -258,28 +257,30 @@ void QGCCachedTileSet::_networkReplyError(QNetworkReply::NetworkError error)
     if (!reply) {
         return;
     }
-    qCDebug(QGCCachedTileSetLog) << Q_FUNC_INFO << "Error fetching tile" << reply->errorString();
+    qCDebug(QGCCachedTileSetLog) << "Error fetching tile" << reply->errorString();
 
     setErrorCount(_errorCount + 1);
 
     const QString hash = reply->request().attribute(QNetworkRequest::User).toString();
     if (hash.isEmpty()) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Empty Hash";
+        qCWarning(QGCCachedTileSetLog) << "Empty Hash";
         return;
     }
 
     if (_replies.contains(hash)) {
         (void) _replies.remove(hash);
     } else {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Reply not in list:" << hash;
+        qCWarning(QGCCachedTileSetLog) << "Reply not in list:" << hash;
     }
 
     if (error != QNetworkReply::OperationCanceledError) {
-        qCWarning(QGCCachedTileSetLog) << Q_FUNC_INFO << "Error:" << reply->errorString();
+        qCWarning(QGCCachedTileSetLog) << "Error:" << reply->errorString();
     }
 
-    QGCUpdateTileDownloadStateTask* const task = new QGCUpdateTileDownloadStateTask(_id, QGCTile::StateError, hash);
-    getQGCMapEngine()->addTask(task);
+    QGCUpdateTileDownloadStateTask *task = new QGCUpdateTileDownloadStateTask(_id, QGCTile::StateError, hash);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+    }
 
     _prepareDownload();
 }
diff --git a/src/QtLocationPlugin/QGCCachedTileSet.h b/src/QtLocationPlugin/QGCCachedTileSet.h
index 7f1d5cb88384..615fbc6b7306 100644
--- a/src/QtLocationPlugin/QGCCachedTileSet.h
+++ b/src/QtLocationPlugin/QGCCachedTileSet.h
@@ -7,15 +7,6 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief Map Tile Set
- *
- *   @author Gus Grubba <gus@auterion.com>
- *
- */
-
 #pragma once
 
 #include <QtCore/QDateTime>
diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp
index 1432f7d63ac2..2ca5109d4fa0 100644
--- a/src/QtLocationPlugin/QGCMapEngine.cpp
+++ b/src/QtLocationPlugin/QGCMapEngine.cpp
@@ -7,30 +7,20 @@
  *
  ****************************************************************************/
 
+#include "QGCMapEngine.h"
 
-/**
- * @file
- *   @brief Map Tile Cache
- *
- *   @author Gus Grubba <gus@auterion.com>
- *
- */
+#include <QtCore/QApplicationStatic>
 
-#include "QGCMapEngine.h"
 #include "QGCCachedTileSet.h"
-#include "QGCTileCacheWorker.h"
-#include "QGeoFileTileCacheQGC.h"
+#include "QGCCacheTile.h"
+#include "QGCLoggingCategory.h"
 #include "QGCMapTasks.h"
-#include "QGCTileSet.h"
 #include "QGCTile.h"
-#include "QGCCacheTile.h"
-#include <QGCLoggingCategory.h>
-
-#include <QtCore/QApplicationStatic>
-
-QGC_LOGGING_CATEGORY(QGCMapEngineLog, "qgc.qtlocationplugin.qgcmapengine")
+#include "QGCTileCacheWorker.h"
+#include "QGCTileSet.h"
+#include "QGeoFileTileCacheQGC.h"
 
-Q_DECLARE_METATYPE(QList<QGCTile*>)
+QGC_LOGGING_CATEGORY(QGCMapEngineLog, "QtLocationPlugin.QGCMapEngine")
 
 Q_APPLICATION_STATIC(QGCMapEngine, _mapEngine);
 
@@ -41,26 +31,28 @@ QGCMapEngine *getQGCMapEngine()
 
 QGCMapEngine::QGCMapEngine(QObject *parent)
     : QObject(parent)
-    , m_worker(new QGCCacheWorker(this))
 {
-    // qCDebug(QGCMapEngineLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCMapEngineLog) << this;
 
-    (void) qRegisterMetaType<QGCMapTask::TaskType>("TaskType");
+    (void) qRegisterMetaType<QGCMapTask::TaskType>("QGCMapTask::TaskType");
     (void) qRegisterMetaType<QGCTile>("QGCTile");
+    (void) qRegisterMetaType<QGCTile*>("QGCTile*");
     (void) qRegisterMetaType<QList<QGCTile*>>("QList<QGCTile*>");
     (void) qRegisterMetaType<QGCTileSet>("QGCTileSet");
+    (void) qRegisterMetaType<QGCTileSet*>("QGCTileSet*");
     (void) qRegisterMetaType<QGCCacheTile>("QGCCacheTile");
-
-    (void) connect(m_worker, &QGCCacheWorker::updateTotals, this, &QGCMapEngine::_updateTotals);
+    (void) qRegisterMetaType<QGCCacheTile*>("QGCCacheTile*");
 }
 
 QGCMapEngine::~QGCMapEngine()
 {
-    (void) disconnect(m_worker);
-    m_worker->stop();
-    m_worker->wait();
+    if (m_initialized && m_worker) {
+        (void) disconnect(m_worker);
+        m_worker->stop();
+        (void) m_worker->wait();
+    }
 
-    // qCDebug(QGCMapEngineLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCMapEngineLog) << this;
 }
 
 QGCMapEngine *QGCMapEngine::instance()
@@ -70,28 +62,44 @@ QGCMapEngine *QGCMapEngine::instance()
 
 void QGCMapEngine::init(const QString &databasePath)
 {
+    if (m_initialized) {
+        return;
+    }
+
+    m_initialized = true;
+
+    m_worker = new QGCCacheWorker(this);
     m_worker->setDatabaseFile(databasePath);
+    (void) connect(m_worker, &QGCCacheWorker::updateTotals, this, &QGCMapEngine::_updateTotals);
 
-    QGCMapTask* const task = new QGCMapTask(QGCMapTask::taskInit);
-    (void) addTask(task);
+    QGCMapTask *task = new QGCMapTask(QGCMapTask::TaskType::taskInit);
+    if (!addTask(task)) {
+        task->deleteLater();
+        m_initialized = false;
+    }
 }
 
 bool QGCMapEngine::addTask(QGCMapTask *task)
 {
-    return m_worker->enqueueTask(task);
+    bool result = false;
+    (void) QMetaObject::invokeMethod(m_worker, &QGCCacheWorker::enqueueTask, Qt::DirectConnection, qReturnArg(result), task);
+    return result;
 }
 
 void QGCMapEngine::_updateTotals(quint32 totaltiles, quint64 totalsize, quint32 defaulttiles, quint64 defaultsize)
 {
     emit updateTotals(totaltiles, totalsize, defaulttiles, defaultsize);
 
-    const quint64 maxSize = static_cast<quint64>(QGeoFileTileCacheQGC::getMaxDiskCacheSetting()) * pow(1024, 2);
-    if (!m_prunning && (defaultsize > maxSize)) {
-        m_prunning = true;
+    const quint64 maxSize = static_cast<quint64>(QGeoFileTileCacheQGC::getMaxDiskCacheSetting()) * qPow(1024, 2);
+    if (!m_pruning && (defaultsize > maxSize)) {
+        m_pruning = true;
 
         const quint64 amountToPrune = defaultsize - maxSize;
-        QGCPruneCacheTask* const task = new QGCPruneCacheTask(amountToPrune);
+        QGCPruneCacheTask *task = new QGCPruneCacheTask(amountToPrune);
         (void) connect(task, &QGCPruneCacheTask::pruned, this, &QGCMapEngine::_pruned);
-        (void) addTask(task);
+        if (!addTask(task)) {
+            task->deleteLater();
+            m_pruning = false;
+        }
     }
 }
diff --git a/src/QtLocationPlugin/QGCMapEngine.h b/src/QtLocationPlugin/QGCMapEngine.h
index 88efb1020283..0b3fc32bf7a3 100644
--- a/src/QtLocationPlugin/QGCMapEngine.h
+++ b/src/QtLocationPlugin/QGCMapEngine.h
@@ -7,20 +7,11 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief Map Tile Cache
- *
- *   @author Gus Grubba <gus@auterion.com>
- *
- */
-
 #pragma once
 
-#include <QtCore/QString>
-#include <QtCore/QObject>
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 Q_DECLARE_LOGGING_CATEGORY(QGCMapEngineLog)
 
@@ -45,11 +36,12 @@ class QGCMapEngine : public QObject
 
 private slots:
     void _updateTotals(quint32 totaltiles, quint64 totalsize, quint32 defaulttiles, quint64 defaultsize);
-    void _pruned() { m_prunning = false; }
+    void _pruned() { m_pruning = false; }
 
 private:
     QGCCacheWorker *m_worker = nullptr;
-    bool m_prunning = false;
+    bool m_pruning = false;
+    std::atomic<bool> m_initialized = false;
 };
 
 extern QGCMapEngine *getQGCMapEngine();
diff --git a/src/QtLocationPlugin/QGCMapEngineManager.cc b/src/QtLocationPlugin/QGCMapEngineManager.cc
index 16d51fd5b953..dee8709f5dde 100644
--- a/src/QtLocationPlugin/QGCMapEngineManager.cc
+++ b/src/QtLocationPlugin/QGCMapEngineManager.cc
@@ -7,29 +7,28 @@
  *
  ****************************************************************************/
 
+#include "QGCMapEngineManager.h"
 
-/// @file
-///     @author Gus Grubba <gus@auterion.com>
+#include <QtCore/QApplicationStatic>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QSettings>
+#include <QtCore/QStorageInfo>
+#include <QtQml/QQmlEngine>
 
-#include "QGCMapEngineManager.h"
+#include "ElevationMapProvider.h"
+#include "FlightMapSettings.h"
+#include "QGCApplication.h"
 #include "QGCCachedTileSet.h"
-#include "QGCMapUrlEngine.h"
+#include "QGCLoggingCategory.h"
 #include "QGCMapEngine.h"
+#include "QGCMapUrlEngine.h"
 #include "QGeoFileTileCacheQGC.h"
-#include "ElevationMapProvider.h"
 #include "QmlObjectListModel.h"
-#include "QGCApplication.h"
 #include "SettingsManager.h"
-#include "FlightMapSettings.h"
-#include "QGCLoggingCategory.h"
 
-#include <QtCore/QApplicationStatic>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QSettings>
-#include <QtCore/QStorageInfo>
-#include <QtQml/QQmlEngine>
+using namespace Qt::StringLiterals;
 
-QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "qgc.qtlocation.qmlcontrol.qgcmapenginemanagerlog")
+QGC_LOGGING_CATEGORY(QGCMapEngineManagerLog, "QtLocationPlugin.QGCMapEngineManager")
 
 Q_APPLICATION_STATIC(QGCMapEngineManager, _mapEngineManager);
 
@@ -46,7 +45,7 @@ QGCMapEngineManager::QGCMapEngineManager(QObject *parent)
 
     (void) qmlRegisterUncreatableType<QGCMapEngineManager>("QGroundControl.QGCMapEngineManager", 1, 0, "QGCMapEngineManager", "Reference only");
 
-    (void) connect(getQGCMapEngine(), &QGCMapEngine::updateTotals, this, &QGCMapEngineManager::_updateTotals);
+    (void) connect(getQGCMapEngine(), &QGCMapEngine::updateTotals, this, &QGCMapEngineManager::_updateTotals, Qt::UniqueConnection);
 }
 
 QGCMapEngineManager::~QGCMapEngineManager()
@@ -82,7 +81,7 @@ void QGCMapEngineManager::updateForCurrentView(double lon0, double lat0, double
     emit tileCountChanged();
     emit tileSizeChanged();
 
-    qCDebug(QGCMapEngineManagerLog) << Q_FUNC_INFO << lat0 << lon0 << lat1 << lon1 << minZoom << maxZoom;
+    qCDebug(QGCMapEngineManagerLog) << lat0 << lon0 << lat1 << lon1 << minZoom << maxZoom;
 }
 
 QString QGCMapEngineManager::tileCountStr() const
@@ -102,10 +101,12 @@ void QGCMapEngineManager::loadTileSets()
         emit tileSetsChanged();
     }
 
-    QGCFetchTileSetTask* const task = new QGCFetchTileSetTask(nullptr);
+    QGCFetchTileSetTask *task = new QGCFetchTileSetTask();
     (void) connect(task, &QGCFetchTileSetTask::tileSetFetched, this, &QGCMapEngineManager::_tileSetFetched);
     (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-    (void) getQGCMapEngine()->addTask(task);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+    }
 }
 
 void QGCMapEngineManager::_tileSetFetched(QGCCachedTileSet *tileSet)
@@ -134,12 +135,14 @@ void QGCMapEngineManager::startDownload(const QString &name, const QString &mapT
         set->setTotalTileCount(static_cast<quint32>(_imageSet.tileCount));
         set->setType(mapType);
 
-        QGCCreateTileSetTask* const task = new QGCCreateTileSetTask(set);
+        QGCCreateTileSetTask *task = new QGCCreateTileSetTask(set);
         (void) connect(task, &QGCCreateTileSetTask::tileSetSaved, this, &QGCMapEngineManager::_tileSetSaved);
         (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-        (void) getQGCMapEngine()->addTask(task);
+        if (!getQGCMapEngine()->addTask(task)) {
+            task->deleteLater();
+        }
     } else {
-        qCWarning(QGCMapEngineManagerLog) << Q_FUNC_INFO << "No Tiles to save";
+        qCWarning(QGCMapEngineManagerLog) << "No Tiles to save";
     }
 
     const int mapid = UrlFactory::getQtMapIdFromProviderType(mapType);
@@ -157,12 +160,14 @@ void QGCMapEngineManager::startDownload(const QString &name, const QString &mapT
         set->setTotalTileCount(static_cast<quint32>(_elevationSet.tileCount));
         set->setType(elevationProviderName);
 
-        QGCCreateTileSetTask* const task = new QGCCreateTileSetTask(set);
+        QGCCreateTileSetTask *task = new QGCCreateTileSetTask(set);
         (void) connect(task, &QGCCreateTileSetTask::tileSetSaved, this, &QGCMapEngineManager::_tileSetSaved);
         (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-        (void) getQGCMapEngine()->addTask(task);
+        if (!getQGCMapEngine()->addTask(task)) {
+            task->deleteLater();
+        }
     } else {
-        qCWarning(QGCMapEngineManagerLog) << Q_FUNC_INFO << "No Tiles to save";
+        qCWarning(QGCMapEngineManagerLog) << "No Tiles to save";
     }
 }
 
@@ -194,8 +199,8 @@ QStringList QGCMapEngineManager::mapTypeList(const QString &provider)
     QStringList mapStringList = mapList();
     mapStringList = mapStringList.filter(QRegularExpression(provider));
 
-    static const QRegularExpression providerType = QRegularExpression(QStringLiteral("^([^\\ ]*) (.*)$"));
-    (void) mapStringList.replaceInStrings(providerType,"\\2");
+    static const QRegularExpression providerType = QRegularExpression(uR"(^([^\ ]*) (.*)$)"_s);
+    (void) mapStringList.replaceInStrings(providerType, "\\2");
     (void) mapStringList.removeDuplicates();
 
     return mapStringList;
@@ -213,17 +218,21 @@ void QGCMapEngineManager::deleteTileSet(QGCCachedTileSet *tileSet)
             }
         }
 
-        QGCResetTask* const task = new QGCResetTask(nullptr);
+        QGCResetTask *task = new QGCResetTask();
         (void) connect(task, &QGCResetTask::resetCompleted, this, &QGCMapEngineManager::_resetCompleted);
         (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-        (void) getQGCMapEngine()->addTask(task);
+        if (!getQGCMapEngine()->addTask(task)) {
+            task->deleteLater();
+        }
     } else {
         tileSet->setDeleting(true);
 
-        QGCDeleteTileSetTask* const task = new QGCDeleteTileSetTask(tileSet->id());
+        QGCDeleteTileSetTask *task = new QGCDeleteTileSetTask(tileSet->id());
         (void) connect(task, &QGCDeleteTileSetTask::tileSetDeleted, this, &QGCMapEngineManager::_tileSetDeleted);
         (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-        (void) getQGCMapEngine()->addTask(task);
+        if (!getQGCMapEngine()->addTask(task)) {
+            task->deleteLater();
+        }
     }
 }
 
@@ -239,20 +248,22 @@ void QGCMapEngineManager::renameTileSet(QGCCachedTileSet *tileSet, const QString
     tileSet->setName(name);
     emit tileSet->nameChanged();
 
-    QGCRenameTileSetTask* const task = new QGCRenameTileSetTask(tileSet->id(), name);
+    QGCRenameTileSetTask *task = new QGCRenameTileSetTask(tileSet->id(), name);
     (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-    (void) getQGCMapEngine()->addTask(task);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+    }
 }
 
 void QGCMapEngineManager::_tileSetDeleted(quint64 setID)
 {
     for (qsizetype i = 0; i < _tileSets->count(); i++ ) {
-        QGCCachedTileSet* const set = qobject_cast<QGCCachedTileSet*>(_tileSets->get(i));
+        QGCCachedTileSet *set = qobject_cast<QGCCachedTileSet*>(_tileSets->get(i));
         if (set && (set->id() == setID)) {
-            _tileSets->removeAt(i);
+            (void) _tileSets->removeAt(i);
             delete set;
             emit tileSetsChanged();
-            return;
+            break;
         }
     }
 }
@@ -261,25 +272,25 @@ void QGCMapEngineManager::taskError(QGCMapTask::TaskType type, const QString &er
 {
     QString task;
     switch (type) {
-    case QGCMapTask::taskFetchTileSets:
+    case QGCMapTask::TaskType::taskFetchTileSets:
         task = QStringLiteral("Fetch Tile Set");
         break;
-    case QGCMapTask::taskCreateTileSet:
+    case QGCMapTask::TaskType::taskCreateTileSet:
         task = QStringLiteral("Create Tile Set");
         break;
-    case QGCMapTask::taskGetTileDownloadList:
+    case QGCMapTask::TaskType::taskGetTileDownloadList:
         task = QStringLiteral("Get Tile Download List");
         break;
-    case QGCMapTask::taskUpdateTileDownloadState:
+    case QGCMapTask::TaskType::taskUpdateTileDownloadState:
         task = QStringLiteral("Update Tile Download Status");
         break;
-    case QGCMapTask::taskDeleteTileSet:
+    case QGCMapTask::TaskType::taskDeleteTileSet:
         task = QStringLiteral("Delete Tile Set");
         break;
-    case QGCMapTask::taskReset:
+    case QGCMapTask::TaskType::taskReset:
         task = QStringLiteral("Reset Tile Sets");
         break;
-    case QGCMapTask::taskExport:
+    case QGCMapTask::TaskType::taskExport:
         task = QStringLiteral("Export Tile Sets");
         break;
     default:
@@ -287,8 +298,8 @@ void QGCMapEngineManager::taskError(QGCMapTask::TaskType type, const QString &er
         break;
     }
 
-    QString serror = "Error in task: " + task;
-    serror += "\nError description:\n";
+    QString serror = QStringLiteral("Error in task: ") + task;
+    serror += QStringLiteral("\nError description:\n");
     serror += error;
 
     setErrorMessage(serror);
@@ -358,26 +369,29 @@ int QGCMapEngineManager::selectedCount() const
 
 bool QGCMapEngineManager::importSets(const QString &path)
 {
-    setImportAction(ActionNone);
+    setImportAction(ImportAction::ActionNone);
 
     if (path.isEmpty()) {
         return false;
     }
 
-    setImportAction(ActionImporting);
+    setImportAction(ImportAction::ActionImporting);
 
-    QGCImportTileTask* const task = new QGCImportTileTask(path, _importReplace);
+    QGCImportTileTask *task = new QGCImportTileTask(path, _importReplace);
     (void) connect(task, &QGCImportTileTask::actionCompleted, this, &QGCMapEngineManager::_actionCompleted);
     (void) connect(task, &QGCImportTileTask::actionProgress, this, &QGCMapEngineManager::_actionProgressHandler);
     (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-    (void) getQGCMapEngine()->addTask(task);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+        return false;
+    }
 
     return true;
 }
 
 bool QGCMapEngineManager::exportSets(const QString &path)
 {
-    setImportAction(ActionNone);
+    setImportAction(ImportAction::ActionNone);
 
     if (path.isEmpty()) {
         return false;
@@ -396,13 +410,16 @@ bool QGCMapEngineManager::exportSets(const QString &path)
         return false;
     }
 
-    setImportAction(ActionExporting);
+    setImportAction(ImportAction::ActionExporting);
 
-    QGCExportTileTask* const task = new QGCExportTileTask(sets, path);
+    QGCExportTileTask *task = new QGCExportTileTask(sets, path);
     (void) connect(task, &QGCExportTileTask::actionCompleted, this, &QGCMapEngineManager::_actionCompleted);
     (void) connect(task, &QGCExportTileTask::actionProgress, this, &QGCMapEngineManager::_actionProgressHandler);
     (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
-    (void) getQGCMapEngine()->addTask(task);
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+        return false;
+    }
 
     return true;
 }
@@ -410,9 +427,9 @@ bool QGCMapEngineManager::exportSets(const QString &path)
 void QGCMapEngineManager::_actionCompleted()
 {
     const ImportAction oldState = _importAction;
-    setImportAction(ActionDone);
+    setImportAction(ImportAction::ActionDone);
 
-    if (oldState == ActionImporting) {
+    if (oldState == ImportAction::ActionImporting) {
         loadTileSets();
     }
 }
@@ -427,7 +444,7 @@ QString QGCMapEngineManager::getUniqueName() const
         }
     }
 
-    return QStringLiteral("");
+    return QString("");
 }
 
 QStringList QGCMapEngineManager::mapList()
@@ -443,8 +460,8 @@ QStringList QGCMapEngineManager::mapProviderList()
         (void) mapStringList.removeAll(elevationProviderName);
     }
 
-    static const QRegularExpression providerType = QRegularExpression(QStringLiteral("^([^\\ ]*) (.*)$"));
-    (void) mapStringList.replaceInStrings(providerType,"\\1");
+    static const QRegularExpression providerType = QRegularExpression(uR"(^([^\ ]*) (.*)$)"_s);
+    (void) mapStringList.replaceInStrings(providerType, "\\1");
     (void) mapStringList.removeDuplicates();
 
     return mapStringList;
diff --git a/src/QtLocationPlugin/QGCMapEngineManager.h b/src/QtLocationPlugin/QGCMapEngineManager.h
index d7dfc09a4db8..5a0fca1922b8 100644
--- a/src/QtLocationPlugin/QGCMapEngineManager.h
+++ b/src/QtLocationPlugin/QGCMapEngineManager.h
@@ -7,18 +7,14 @@
  *
  ****************************************************************************/
 
-
-/// @file
-///     @author Gus Grubba <gus@auterion.com>
-
 #pragma once
 
+#include <QtCore/QLoggingCategory>
+#include <QtQmlIntegration/QtQmlIntegration>
+
 #include "QGCTileSet.h"
 #include "QGCMapTasks.h"
 
-// #include <QtQmlIntegration/QtQmlIntegration>
-#include <QtCore/QLoggingCategory>
-
 Q_DECLARE_LOGGING_CATEGORY(QGCMapEngineManagerLog)
 
 class QGCCachedTileSet;
@@ -47,11 +43,11 @@ class QGCMapEngineManager : public QObject
     Q_PROPERTY(quint64              tileSize        READ tileSize                                   NOTIFY tileSizeChanged)
 
 public:
-    QGCMapEngineManager(QObject *parent = nullptr);
+    explicit QGCMapEngineManager(QObject *parent = nullptr);
     ~QGCMapEngineManager();
     static QGCMapEngineManager *instance();
 
-    enum ImportAction {
+    enum class ImportAction {
         ActionNone,
         ActionImporting,
         ActionExporting,
@@ -66,7 +62,7 @@ class QGCMapEngineManager : public QObject
     Q_INVOKABLE void deleteTileSet(QGCCachedTileSet *tileSet);
     Q_INVOKABLE void loadTileSets();
     Q_INVOKABLE void renameTileSet(QGCCachedTileSet *tileSet, const QString &newName);
-    Q_INVOKABLE void resetAction() { setImportAction(ActionNone); }
+    Q_INVOKABLE void resetAction() { setImportAction(ImportAction::ActionNone); }
     Q_INVOKABLE void selectAll();
     Q_INVOKABLE void selectNone();
     Q_INVOKABLE void startDownload(const QString &name, const QString &mapType);
@@ -122,7 +118,7 @@ private slots:
     QmlObjectListModel *_tileSets = nullptr;
     QGCTileSet _imageSet;
     QGCTileSet _elevationSet;
-    ImportAction _importAction = ActionNone;
+    ImportAction _importAction = ImportAction::ActionNone;
     double _topleftLat = 0.;
     double _topleftLon = 0.;
     double _bottomRightLat = 0.;
diff --git a/src/QtLocationPlugin/QGCMapTasks.h b/src/QtLocationPlugin/QGCMapTasks.h
index 6ee9e05e17ad..28bdca9fdcb1 100644
--- a/src/QtLocationPlugin/QGCMapTasks.h
+++ b/src/QtLocationPlugin/QGCMapTasks.h
@@ -7,31 +7,22 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief Map Tile Cache Data
- *
- *   @author Gus Grubba <gus@auterion.com>
- *
- */
-
 #pragma once
 
 #include <QtCore/QObject>
 #include <QtCore/QQueue>
 #include <QtCore/QString>
 
-#include "QGCTile.h"
 #include "QGCCacheTile.h"
 #include "QGCCachedTileSet.h"
+#include "QGCTile.h"
 
 class QGCMapTask : public QObject
 {
     Q_OBJECT
 
 public:
-    enum TaskType {
+    enum class TaskType {
         taskInit,
         taskCacheTile,
         taskFetchTile,
@@ -75,8 +66,8 @@ class QGCFetchTileSetTask : public QGCMapTask
     Q_OBJECT
 
 public:
-    QGCFetchTileSetTask(QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskFetchTileSets, parent)
+    explicit QGCFetchTileSetTask(QObject *parent = nullptr)
+        : QGCMapTask(TaskType::taskFetchTileSets, parent)
     {}
     ~QGCFetchTileSetTask() = default;
 
@@ -97,7 +88,7 @@ class QGCCreateTileSetTask : public QGCMapTask
 
 public:
     explicit QGCCreateTileSetTask(QGCCachedTileSet *tileSet, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskCreateTileSet, parent)
+        : QGCMapTask(TaskType::taskCreateTileSet, parent)
         , m_tileSet(tileSet)
         , m_saved(false)
     {}
@@ -132,7 +123,7 @@ class QGCFetchTileTask : public QGCMapTask
 
 public:
     explicit QGCFetchTileTask(const QString &hash, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskFetchTile, parent)
+        : QGCMapTask(TaskType::taskFetchTile, parent)
         , m_hash(hash)
     {}
     ~QGCFetchTileTask() = default;
@@ -159,7 +150,7 @@ class QGCSaveTileTask : public QGCMapTask
 
 public:
     explicit QGCSaveTileTask(QGCCacheTile *tile, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskCacheTile, parent)
+        : QGCMapTask(TaskType::taskCacheTile, parent)
         , m_tile(tile)
     {}
     ~QGCSaveTileTask()
@@ -167,6 +158,7 @@ class QGCSaveTileTask : public QGCMapTask
         delete m_tile;
     }
 
+    const QGCCacheTile *tile() const { return m_tile; }
     QGCCacheTile *tile() { return m_tile; }
 
 private:
@@ -181,7 +173,7 @@ class QGCGetTileDownloadListTask : public QGCMapTask
 
 public:
     QGCGetTileDownloadListTask(quint64 setID, int count, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskGetTileDownloadList, parent)
+        : QGCMapTask(TaskType::taskGetTileDownloadList, parent)
         , m_setID(setID)
         , m_count(count)
     {}
@@ -211,7 +203,7 @@ class QGCUpdateTileDownloadStateTask : public QGCMapTask
 
 public:
     QGCUpdateTileDownloadStateTask(quint64 setID, QGCTile::TileState state, const QString &hash, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskUpdateTileDownloadState, parent)
+        : QGCMapTask(TaskType::taskUpdateTileDownloadState, parent)
         , m_setID(setID)
         , m_state(state)
         , m_hash(hash)
@@ -236,7 +228,7 @@ class QGCDeleteTileSetTask : public QGCMapTask
 
 public:
     explicit QGCDeleteTileSetTask(quint64 setID, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskDeleteTileSet, parent)
+        : QGCMapTask(TaskType::taskDeleteTileSet, parent)
         , m_setID(setID)
     {}
     ~QGCDeleteTileSetTask() = default;
@@ -263,7 +255,7 @@ class QGCRenameTileSetTask : public QGCMapTask
 
 public:
     QGCRenameTileSetTask(quint64 setID, const QString &newName, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskRenameTileSet, parent)
+        : QGCMapTask(TaskType::taskRenameTileSet, parent)
         , m_setID(setID)
         , m_newName(newName)
     {}
@@ -285,7 +277,7 @@ class QGCPruneCacheTask : public QGCMapTask
 
 public:
     explicit QGCPruneCacheTask(quint64 amount, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskPruneCache, parent)
+        : QGCMapTask(TaskType::taskPruneCache, parent)
         , m_amount(amount)
     {}
     ~QGCPruneCacheTask() = default;
@@ -311,8 +303,8 @@ class QGCResetTask : public QGCMapTask
     Q_OBJECT
 
 public:
-    QGCResetTask(QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskReset, parent)
+    explicit QGCResetTask(QObject *parent = nullptr)
+        : QGCMapTask(TaskType::taskReset, parent)
     {}
     ~QGCResetTask() = default;
 
@@ -332,14 +324,14 @@ class QGCExportTileTask : public QGCMapTask
     Q_OBJECT
 
 public:
-    explicit QGCExportTileTask(const QVector<QGCCachedTileSet*> &sets, const QString &path, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskExport, parent)
+    explicit QGCExportTileTask(const QList<QGCCachedTileSet*> &sets, const QString &path, QObject *parent = nullptr)
+        : QGCMapTask(TaskType::taskExport, parent)
         , m_sets(sets)
         , m_path(path)
     {}
     ~QGCExportTileTask() = default;
 
-    QVector<QGCCachedTileSet*> sets() const { return m_sets; }
+    QList<QGCCachedTileSet*> sets() const { return m_sets; }
     QString path() const { return m_path; }
 
     void setExportCompleted()
@@ -357,7 +349,7 @@ class QGCExportTileTask : public QGCMapTask
     void actionProgress(int percentage);
 
 private:
-    const QVector<QGCCachedTileSet*> m_sets;
+    const QList<QGCCachedTileSet*> m_sets;
     const QString m_path;
 };
 
@@ -369,7 +361,7 @@ class QGCImportTileTask : public QGCMapTask
 
 public:
     QGCImportTileTask(const QString &path, bool replace, QObject *parent = nullptr)
-        : QGCMapTask(QGCMapTask::taskImport, parent)
+        : QGCMapTask(TaskType::taskImport, parent)
         , m_path(path)
         , m_replace(replace)
     {}
@@ -377,6 +369,7 @@ class QGCImportTileTask : public QGCMapTask
 
     QString path() const { return m_path; }
     bool replace() const { return m_replace; }
+    int progress() const { return m_progress; }
 
     void setImportCompleted()
     {
@@ -385,6 +378,7 @@ class QGCImportTileTask : public QGCMapTask
 
     void setProgress(int percentage)
     {
+        m_progress = percentage;
         emit actionProgress(percentage);
     }
 
@@ -395,6 +389,7 @@ class QGCImportTileTask : public QGCMapTask
 private:
     const QString m_path;
     const bool m_replace = false;
+    int m_progress = 0;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.cpp b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
index 18231323dfdf..a0bdd361fc58 100644
--- a/src/QtLocationPlugin/QGCMapUrlEngine.cpp
+++ b/src/QtLocationPlugin/QGCMapUrlEngine.cpp
@@ -7,23 +7,20 @@
  *
  ****************************************************************************/
 
-/**
- *  @file
- *  @author Gus Grubba <gus@auterion.com>
- *  Original work: The OpenPilot Team, http://www.openpilot.org Copyright (C)
- * 2012.
- */
-
 #include "QGCMapUrlEngine.h"
-#include "GoogleMapProvider.h"
+
+#include <QtCore/QtMinMax>
+
 #include "BingMapProvider.h"
-#include "GenericMapProvider.h"
+#include "ElevationMapProvider.h"
 #include "EsriMapProvider.h"
+#include "GenericMapProvider.h"
+#include "GoogleMapProvider.h"
 #include "MapboxMapProvider.h"
-#include "ElevationMapProvider.h"
-#include <QGCLoggingCategory.h>
+#include "TianDiTuProvider.h"
+#include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(QGCMapUrlEngineLog, "qgc.qtlocationplugin.qgcmapurlengine")
+QGC_LOGGING_CATEGORY(QGCMapUrlEngineLog, "QtLocationPlugin.QGCMapUrlEngine")
 
 const QList<SharedMapProvider> UrlFactory::_providers = {
 #ifndef QGC_NO_GOOGLE_MAPS
@@ -37,6 +34,8 @@ const QList<SharedMapProvider> UrlFactory::_providers = {
     std::make_shared<BingSatelliteMapProvider>(),
     std::make_shared<BingHybridMapProvider>(),
 
+    std::make_shared<TianDiTuRoadProvider>(),
+    std::make_shared<TianDiTuSatelliteProvider>(),
     std::make_shared<StatkartTopoMapProvider>(),
     std::make_shared<StatkartBaseMapProvider>(),
     std::make_shared<SvalbardMapProvider>(),
@@ -73,6 +72,8 @@ const QList<SharedMapProvider> UrlFactory::_providers = {
 
     std::make_shared<OpenStreetMapProvider>(),
 
+    std::make_shared<OpenAIPMapProvider>(),
+
     std::make_shared<CustomURLMapProvider>(),
 
     std::make_shared<CopernicusElevationProvider>()
@@ -85,17 +86,17 @@ QString UrlFactory::getImageFormat(int qtMapId, QByteArrayView image)
         return provider->getImageFormat(image);
     }
 
-    return QStringLiteral("");
+    return QString("");
 }
 
 QString UrlFactory::getImageFormat(QStringView type, QByteArrayView image)
 {
-    const SharedMapProvider provider =  getMapProviderFromProviderType(type);
+    const SharedMapProvider provider = getMapProviderFromProviderType(type);
     if (provider) {
         return provider->getImageFormat(image);
     }
 
-    return QStringLiteral("");
+    return QString("");
 }
 
 QUrl UrlFactory::getTileURL(int qtMapId, int x, int y, int zoom)
@@ -125,7 +126,7 @@ quint32 UrlFactory::averageSizeForType(QStringView type)
         return provider->getAverageSize();
     }
 
-    return AVERAGE_TILE_SIZE;
+    return QGC_AVERAGE_TILE_SIZE;
 }
 
 bool UrlFactory::isElevation(int qtMapId)
@@ -162,12 +163,8 @@ QGCTileSet UrlFactory::getTileCount(int zoom, double topleftLon, double topleftL
 {
     const SharedMapProvider provider = getMapProviderFromProviderType(mapType);
     if (provider) {
-        // TODO: Check QGeoCameraCapabilities.maximumZoomLevel() and QGeoCameraCapabilities.minimumZoomLevel()
-        if(zoom < 1) {
-            zoom = 1;
-        } else if(zoom > MAX_MAP_ZOOM) {
-            zoom = MAX_MAP_ZOOM;
-        }
+        // TODO: zoom = qBound(QGeoCameraCapabilities.minimumZoomLevel(), zoom, QGeoCameraCapabilities.maximumZoomLevel());
+        zoom = qBound(1, zoom, QGC_MAX_MAP_ZOOM);
         return provider->getTileCount(zoom, topleftLon, topleftLat, bottomRightLon, bottomRightLat);
     }
 
@@ -177,7 +174,7 @@ QGCTileSet UrlFactory::getTileCount(int zoom, double topleftLon, double topleftL
 QString UrlFactory::getProviderTypeFromQtMapId(int qtMapId)
 {
     // Default Set
-    if(qtMapId == -1) {
+    if (qtMapId == -1) {
         return nullptr;
     }
 
@@ -187,14 +184,14 @@ QString UrlFactory::getProviderTypeFromQtMapId(int qtMapId)
         }
     }
 
-    qCWarning(QGCMapUrlEngineLog) << Q_FUNC_INFO << "map id not found:" << qtMapId;
-    return QStringLiteral("");
+    qCWarning(QGCMapUrlEngineLog) << "map id not found:" << qtMapId;
+    return QString("");
 }
 
 SharedMapProvider UrlFactory::getMapProviderFromQtMapId(int qtMapId)
 {
     // Default Set
-    if(qtMapId == -1) {
+    if (qtMapId == -1) {
         return nullptr;
     }
 
@@ -204,7 +201,7 @@ SharedMapProvider UrlFactory::getMapProviderFromQtMapId(int qtMapId)
         }
     }
 
-    qCWarning(QGCMapUrlEngineLog) << Q_FUNC_INFO << "provider not found from id:" << qtMapId;
+    qCWarning(QGCMapUrlEngineLog) << "provider not found from id:" << qtMapId;
     return nullptr;
 }
 
@@ -216,7 +213,7 @@ SharedMapProvider UrlFactory::getMapProviderFromProviderType(QStringView type)
         }
     }
 
-    qCWarning(QGCMapUrlEngineLog) << Q_FUNC_INFO << "type not found:" << type;
+    qCWarning(QGCMapUrlEngineLog) << "type not found:" << type;
     return nullptr;
 }
 
@@ -228,7 +225,7 @@ int UrlFactory::getQtMapIdFromProviderType(QStringView type)
         }
     }
 
-    qCWarning(QGCMapUrlEngineLog) << Q_FUNC_INFO << "type not found:" << type;
+    qCWarning(QGCMapUrlEngineLog) << "type not found:" << type;
     return -1;
 }
 
@@ -237,7 +234,7 @@ QStringList UrlFactory::getElevationProviderTypes()
     QStringList types;
     for (const SharedMapProvider &provider : _providers) {
         if (provider->isElevationProvider()) {
-            (void) types.append(provider->getMapName());
+            types.append(provider->getMapName());
         }
     }
 
@@ -248,7 +245,7 @@ QStringList UrlFactory::getProviderTypes()
 {
     QStringList types;
     for (const SharedMapProvider &provider : _providers) {
-        (void) types.append(provider->getMapName());
+        types.append(provider->getMapName());
     }
 
     return types;
@@ -263,8 +260,8 @@ QString UrlFactory::providerTypeFromHash(int hash)
         }
     }
 
-    qCWarning(QGCMapUrlEngineLog) << Q_FUNC_INFO << "provider not found from hash:" << hash;
-    return QStringLiteral("");
+    qCWarning(QGCMapUrlEngineLog) << "provider not found from hash:" << hash;
+    return QString("");
 }
 
 // This seems to limit provider name length to less than ~25 chars due to downcasting to int
diff --git a/src/QtLocationPlugin/QGCMapUrlEngine.h b/src/QtLocationPlugin/QGCMapUrlEngine.h
index 11d5f4b5a144..adf5aeeb468a 100644
--- a/src/QtLocationPlugin/QGCMapUrlEngine.h
+++ b/src/QtLocationPlugin/QGCMapUrlEngine.h
@@ -7,12 +7,6 @@
  *
  ****************************************************************************/
 
-
-/**
- *  @file
- *  @author Gus Grubba <gus@auterion.com>
- */
-
 #pragma once
 
 #include "QGCTileSet.h"
diff --git a/src/QtLocationPlugin/QGCTile.h b/src/QtLocationPlugin/QGCTile.h
index 8ae544922c70..2d8a093d0bd9 100644
--- a/src/QtLocationPlugin/QGCTile.h
+++ b/src/QtLocationPlugin/QGCTile.h
@@ -9,15 +9,12 @@
 
 #pragma once
 
-#include <QtCore/QString>
+#include <QtCore/QList>
 #include <QtCore/QMetaType>
+#include <QtCore/QString>
 
-class QGCTile
+struct QGCTile
 {
-public:
-    QGCTile() = default;
-    ~QGCTile() = default;
-
     enum TileState {
         StatePending = 0,
         StateDownloading,
@@ -25,26 +22,13 @@ class QGCTile
         StateComplete
     };
 
-    int x() const { return m_x; }
-    int y() const { return m_y; }
-    int z() const { return m_z; }
-    quint64 tileSet() const { return m_tileSet;  }
-    QString hash() const { return m_hash; }
-    QString type() const { return m_type; }
-
-    void setX(int x) { m_x = x; }
-    void setY(int y) { m_y = y; }
-    void setZ(int z) { m_z = z; }
-    void setTileSet(quint64 tileSet) { m_tileSet = tileSet;  }
-    void setHash(const QString &hash) { m_hash = hash; }
-    void setType(const QString &type) { m_type = type; }
-
-private:
-    int m_x = 0;
-    int m_y = 0;
-    int m_z = 0;
-    quint64 m_tileSet = UINT64_MAX;
-    QString m_hash;
-    QString m_type = QStringLiteral("Invalid");
+    int x = 0;
+    int y = 0;
+    int z = 0;
+    quint64 tileSet = UINT64_MAX;
+    QString hash;
+    QString type = QStringLiteral("Invalid"); // TODO: int?
 };
 Q_DECLARE_METATYPE(QGCTile)
+Q_DECLARE_METATYPE(QGCTile*)
+Q_DECLARE_METATYPE(QList<QGCTile*>)
diff --git a/src/QtLocationPlugin/QGCTileCacheWorker.cpp b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
index 5a3863090945..558650c7884a 100644
--- a/src/QtLocationPlugin/QGCTileCacheWorker.cpp
+++ b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
@@ -8,10 +8,6 @@
  ****************************************************************************/
 
 #include "QGCTileCacheWorker.h"
-#include "QGCCachedTileSet.h"
-#include "QGCMapTasks.h"
-#include "QGCMapUrlEngine.h"
-#include "QGCLoggingCategory.h"
 
 #include <QtCore/QDateTime>
 #include <QtCore/QCoreApplication>
@@ -21,17 +17,22 @@
 #include <QtSql/QSqlQuery>
 #include <QtSql/QSqlError>
 
-QGC_LOGGING_CATEGORY(QGCTileCacheWorkerLog, "qgc.qtlocationplugin.qgctilecacheworker")
+#include "QGCCachedTileSet.h"
+#include "QGCLoggingCategory.h"
+#include "QGCMapTasks.h"
+#include "QGCMapUrlEngine.h"
+
+QGC_LOGGING_CATEGORY(QGCTileCacheWorkerLog, "QtLocationPlugin.QGCTileCacheWorker")
 
 QGCCacheWorker::QGCCacheWorker(QObject *parent)
     : QThread(parent)
 {
-    // qCDebug(QGCTileCacheWorkerLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCTileCacheWorkerLog) << this;
 }
 
 QGCCacheWorker::~QGCCacheWorker()
 {
-    // qCDebug(QGCTileCacheWorkerLog) << Q_FUNC_INFO << this;
+    qCDebug(QGCTileCacheWorkerLog) << this;
 }
 
 void QGCCacheWorker::stop()
@@ -47,7 +48,7 @@ void QGCCacheWorker::stop()
 
 bool QGCCacheWorker::enqueueTask(QGCMapTask *task)
 {
-    if (!_valid && (task->type() != QGCMapTask::taskInit)) {
+    if (!_valid && (task->type() != QGCMapTask::TaskType::taskInit)) {
         task->setError(tr("Database Not Initialized"));
         task->deleteLater();
         return false;
@@ -61,7 +62,7 @@ bool QGCCacheWorker::enqueueTask(QGCMapTask *task)
     if (isRunning()) {
         _waitc.wakeAll();
     } else {
-        start(QThread::HighPriority);
+        start(QThread::NormalPriority);
     }
 
     return true;
@@ -120,42 +121,42 @@ void QGCCacheWorker::run()
 void QGCCacheWorker::_runTask(QGCMapTask *task)
 {
     switch (task->type()) {
-    case QGCMapTask::taskInit:
+    case QGCMapTask::TaskType::taskInit:
         break;
-    case QGCMapTask::taskCacheTile:
+    case QGCMapTask::TaskType::taskCacheTile:
         _saveTile(task);
         break;
-    case QGCMapTask::taskFetchTile:
+    case QGCMapTask::TaskType::taskFetchTile:
         _getTile(task);
         break;
-    case QGCMapTask::taskFetchTileSets:
+    case QGCMapTask::TaskType::taskFetchTileSets:
         _getTileSets(task);
         break;
-    case QGCMapTask::taskCreateTileSet:
+    case QGCMapTask::TaskType::taskCreateTileSet:
         _createTileSet(task);
         break;
-    case QGCMapTask::taskGetTileDownloadList:
+    case QGCMapTask::TaskType::taskGetTileDownloadList:
         _getTileDownloadList(task);
         break;
-    case QGCMapTask::taskUpdateTileDownloadState:
+    case QGCMapTask::TaskType::taskUpdateTileDownloadState:
         _updateTileDownloadState(task);
         break;
-    case QGCMapTask::taskDeleteTileSet:
+    case QGCMapTask::TaskType::taskDeleteTileSet:
         _deleteTileSet(task);
         break;
-    case QGCMapTask::taskRenameTileSet:
+    case QGCMapTask::TaskType::taskRenameTileSet:
         _renameTileSet(task);
         break;
-    case QGCMapTask::taskPruneCache:
+    case QGCMapTask::TaskType::taskPruneCache:
         _pruneCache(task);
         break;
-    case QGCMapTask::taskReset:
+    case QGCMapTask::TaskType::taskReset:
         _resetCacheDatabase(task);
         break;
-    case QGCMapTask::taskExport:
+    case QGCMapTask::TaskType::taskExport:
         _exportSets(task);
         break;
-    case QGCMapTask::taskImport:
+    case QGCMapTask::TaskType::taskImport:
         _importSets(task);
         break;
     default:
@@ -247,11 +248,11 @@ void QGCCacheWorker::_saveTile(QGCMapTask *mtask)
     QGCSaveTileTask *task = static_cast<QGCSaveTileTask*>(mtask);
     QSqlQuery query(*_db);
     (void) query.prepare("INSERT INTO Tiles(hash, format, tile, size, type, date) VALUES(?, ?, ?, ?, ?, ?)");
-    query.addBindValue(task->tile()->hash());
-    query.addBindValue(task->tile()->format());
-    query.addBindValue(task->tile()->img());
-    query.addBindValue(task->tile()->img().size());
-    query.addBindValue(task->tile()->type());
+    query.addBindValue(task->tile()->hash);
+    query.addBindValue(task->tile()->format);
+    query.addBindValue(task->tile()->img);
+    query.addBindValue(task->tile()->img.size());
+    query.addBindValue(task->tile()->type);
     query.addBindValue(QDateTime::currentSecsSinceEpoch());
     if (!query.exec()) {
         // Tile was already there.
@@ -260,14 +261,14 @@ void QGCCacheWorker::_saveTile(QGCMapTask *mtask)
     }
 
     const quint64 tileID = query.lastInsertId().toULongLong();
-    const quint64 setID = task->tile()->tileSet() == UINT64_MAX ? _getDefaultTileSet() : task->tile()->tileSet();
+    const quint64 setID = (task->tile()->tileSet == UINT64_MAX) ? _getDefaultTileSet() : task->tile()->tileSet;
     const QString s = QStringLiteral("INSERT INTO SetTiles(tileID, setID) VALUES(%1, %2)").arg(tileID).arg(setID);
     (void) query.prepare(s);
     if (!query.exec()) {
         qCWarning(QGCTileCacheWorkerLog) << "Map Cache SQL error (add tile into SetTiles):" << query.lastError().text();
     }
 
-    qCDebug(QGCTileCacheWorkerLog) << "HASH:" << task->tile()->hash();
+    qCDebug(QGCTileCacheWorkerLog) << "HASH:" << task->tile()->hash;
 }
 
 void QGCCacheWorker::_getTile(QGCMapTask* mtask)
@@ -514,16 +515,16 @@ void QGCCacheWorker::_getTileDownloadList(QGCMapTask *mtask)
         while (query.next()) {
             QGCTile *tile = new QGCTile;
             // tile->setTileSet(task->setID());
-            tile->setHash(query.value("hash").toString());
-            tile->setType(UrlFactory::getProviderTypeFromQtMapId(query.value("type").toInt()));
-            tile->setX(query.value("x").toInt());
-            tile->setY(query.value("y").toInt());
-            tile->setZ(query.value("z").toInt());
+            tile->hash = query.value("hash").toString();
+            tile->type = UrlFactory::getProviderTypeFromQtMapId(query.value("type").toInt());
+            tile->x = query.value("x").toInt();
+            tile->y = query.value("y").toInt();
+            tile->z = query.value("z").toInt();
             tiles.enqueue(tile);
         }
 
         for (int i = 0; i < tiles.size(); i++) {
-            s = QStringLiteral("UPDATE TilesDownload SET state = %1 WHERE setID = %2 and hash = \"%3\"").arg(static_cast<int>(QGCTile::StateDownloading)).arg(task->setID()).arg(tiles[i]->hash());
+            s = QStringLiteral("UPDATE TilesDownload SET state = %1 WHERE setID = %2 and hash = \"%3\"").arg(static_cast<int>(QGCTile::StateDownloading)).arg(task->setID()).arg(tiles[i]->hash);
             if (!query.exec(s)) {
                 qCWarning(QGCTileCacheWorkerLog) << "Map Cache SQL error (set TilesDownload state):" << query.lastError().text();
             }
diff --git a/src/QtLocationPlugin/QGCTileCacheWorker.h b/src/QtLocationPlugin/QGCTileCacheWorker.h
index eb1615cd296e..764e9bcc82ab 100644
--- a/src/QtLocationPlugin/QGCTileCacheWorker.h
+++ b/src/QtLocationPlugin/QGCTileCacheWorker.h
@@ -7,23 +7,16 @@
  *
  ****************************************************************************/
 
-
-/**
- * @file
- *   @brief Map Tile Cache Worker Thread
- *
- *   @author Gus Grubba <gus@auterion.com>
- *
- */
-
 #pragma once
 
+#include <QtCore/QElapsedTimer>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QMutex>
 #include <QtCore/QQueue>
 #include <QtCore/QString>
 #include <QtCore/QThread>
 #include <QtCore/QWaitCondition>
+#include <QtCore/QElapsedTimer>
 
 Q_DECLARE_LOGGING_CATEGORY(QGCTileCacheWorkerLog)
 
diff --git a/src/QtLocationPlugin/QGCTileSet.h b/src/QtLocationPlugin/QGCTileSet.h
index 330468f2b1e1..310e1bac1eea 100644
--- a/src/QtLocationPlugin/QGCTileSet.h
+++ b/src/QtLocationPlugin/QGCTileSet.h
@@ -9,15 +9,11 @@
 
 #pragma once
 
-#include <QtCore/QtTypes>
 #include <QtCore/QMetaType>
+#include <QtCore/QtTypes>
 
-class QGCTileSet
+struct QGCTileSet
 {
-public:
-    QGCTileSet() = default;
-    ~QGCTileSet() = default;
-
     QGCTileSet &operator+=(const QGCTileSet &other)
     {
         tileX0 += other.tileX0;
@@ -47,3 +43,4 @@ class QGCTileSet
     quint64 tileSize = 0;
 };
 Q_DECLARE_METATYPE(QGCTileSet)
+Q_DECLARE_METATYPE(QGCTileSet*)
diff --git a/src/QtLocationPlugin/QGeoFileTileCacheQGC.cpp b/src/QtLocationPlugin/QGeoFileTileCacheQGC.cpp
index 66a4035629c9..e26a5f480a20 100644
--- a/src/QtLocationPlugin/QGeoFileTileCacheQGC.cpp
+++ b/src/QtLocationPlugin/QGeoFileTileCacheQGC.cpp
@@ -8,20 +8,21 @@
  ****************************************************************************/
 
 #include "QGeoFileTileCacheQGC.h"
-#include "QGCMapEngine.h"
-#include "QGCApplication.h"
-#include "SettingsManager.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QStandardPaths>
+
 #include "AppSettings.h"
 #include "MapsSettings.h"
-#include "QGCMapUrlEngine.h"
-#include "QGCMapTasks.h"
+#include "QGCApplication.h"
 #include "QGCLoggingCategory.h"
+#include "QGCMapEngine.h"
+#include "QGCMapTasks.h"
+#include "QGCMapUrlEngine.h"
+#include "SettingsManager.h"
 
-#include <QtCore/QStandardPaths>
-#include <QtCore/QLoggingCategory>
-#include <QtCore/QDir>
-
-QGC_LOGGING_CATEGORY(QGeoFileTileCacheQGCLog, "qgc.qtlocationplugin.qgeofiletilecacheqgc")
+QGC_LOGGING_CATEGORY(QGeoFileTileCacheQGCLog, "QtLocationPlugin.QGeoFileTileCacheQGC")
 
 QString QGeoFileTileCacheQGC::_databaseFilePath;
 QString QGeoFileTileCacheQGC::_cachePath;
@@ -30,7 +31,7 @@ bool QGeoFileTileCacheQGC::_cacheWasReset = false;
 QGeoFileTileCacheQGC::QGeoFileTileCacheQGC(const QVariantMap &parameters, QObject *parent)
     : QGeoFileTileCache(baseCacheDirectory(), parent)
 {
-    // qCDebug(QGeoFileTileCacheQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoFileTileCacheQGCLog) << this;
 
     setCostStrategyDisk(QGeoFileTileCache::ByteSize);
     setMaxDiskUsage(_getDefaultMaxDiskCache());
@@ -50,11 +51,11 @@ QGeoFileTileCacheQGC::QGeoFileTileCacheQGC(const QVariantMap &parameters, QObjec
 
 QGeoFileTileCacheQGC::~QGeoFileTileCacheQGC()
 {
-#ifdef QT_DEBUG
-    // printStats();
-#endif
+    if (QGeoFileTileCacheQGCLog().isDebugEnabled()) {
+        printStats();
+    }
 
-    // qCDebug(QGeoFileTileCacheQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoFileTileCacheQGCLog) << this;
 }
 
 uint32_t QGeoFileTileCacheQGC::_getMemLimit(const QVariantMap &parameters)
@@ -70,20 +71,15 @@ uint32_t QGeoFileTileCacheQGC::_getMemLimit(const QVariantMap &parameters)
 
     if (memLimit == 0) {
         // Value saved in MB
-        memLimit = _getMaxMemCacheSetting() * pow(1024, 2);
+        memLimit = _getMaxMemCacheSetting() * qPow(1024, 2);
     }
     if (memLimit == 0) {
         memLimit = _getDefaultMaxMemLimit();
     }
+
     // 1MB Minimum Memory Cache Required
-    if (memLimit < pow(1024, 2)) {
-        memLimit = pow(1024, 2);
-    }
     // MaxMemoryUsage is 32bit Integer, Round down to 1GB
-    if (memLimit > pow(1024, 3)) {
-        memLimit = pow(1024, 3);
-    }
-
+    memLimit = qBound(static_cast<uint32_t>(qPow(1024, 2)), memLimit, static_cast<uint32_t>(qPow(1024, 3)));
     return memLimit;
 }
 
@@ -105,18 +101,20 @@ void QGeoFileTileCacheQGC::cacheTile(const QString &type, int x, int y, int z, c
 
 void QGeoFileTileCacheQGC::cacheTile(const QString &type, const QString &hash, const QByteArray &image, const QString &format, qulonglong set)
 {
-    AppSettings* const appSettings = SettingsManager::instance()->appSettings();
+    AppSettings *appSettings = SettingsManager::instance()->appSettings();
     if (!appSettings->disableAllPersistence()->rawValue().toBool()) {
-        QGCCacheTile* const tile = new QGCCacheTile(hash, image, format, type, set);
-        QGCSaveTileTask* const task = new QGCSaveTileTask(tile);
-        (void) getQGCMapEngine()->addTask(task);
+        QGCCacheTile *tile = new QGCCacheTile(hash, image, format, type, set);
+        QGCSaveTileTask *task = new QGCSaveTileTask(tile);
+        if (!getQGCMapEngine()->addTask(task)) {
+            task->deleteLater();
+        }
     }
 }
 
 QGCFetchTileTask* QGeoFileTileCacheQGC::createFetchTileTask(const QString &type, int x, int y, int z)
 {
     const QString hash = UrlFactory::getTileHash(type, x, y, z);
-    QGCFetchTileTask* const task = new QGCFetchTileTask(hash);
+    QGCFetchTileTask *task = new QGCFetchTileTask(hash);
     return task;
 }
 
diff --git a/src/QtLocationPlugin/QGeoFileTileCacheQGC.h b/src/QtLocationPlugin/QGeoFileTileCacheQGC.h
index 47014190a6ea..1d2678e00752 100644
--- a/src/QtLocationPlugin/QGeoFileTileCacheQGC.h
+++ b/src/QtLocationPlugin/QGeoFileTileCacheQGC.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QtLocation/private/qgeofiletilecache_p.h>
 #include <QtCore/QLoggingCategory>
+#include <QtLocation/private/qgeofiletilecache_p.h>
 
 Q_DECLARE_LOGGING_CATEGORY(QGeoFileTileCacheQGCLog)
 
@@ -42,9 +42,9 @@ class QGeoFileTileCacheQGC : public QGeoFileTileCache
     static QString _getCachePath(const QVariantMap &parameters);
     static uint32_t _getMemLimit(const QVariantMap &Parameters);
 
-    static uint32_t _getDefaultMaxMemLimit() { return (3 * pow(1024, 2)); }
+    static uint32_t _getDefaultMaxMemLimit() { return (3 * qPow(1024, 2)); }
     static uint32_t _getDefaultMaxDiskCache() { return 0; } // (50 * pow(1024, 2));
-    static uint32_t _getDefaultExtraTexture() { return (6 * pow(1024, 2)); }
+    static uint32_t _getDefaultExtraTexture() { return (6 * qPow(1024, 2)); }
     static uint32_t _getDefaultMinTexture() { return 0; }
 
     static quint32 _getMaxMemCacheSetting();
diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
index df3badfcd56f..101ef606e725 100644
--- a/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
+++ b/src/QtLocationPlugin/QGeoMapReplyQGC.cpp
@@ -9,22 +9,21 @@
 
 #include "QGeoMapReplyQGC.h"
 
+#include <QtCore/QFile>
+#include <QtLocation/private/qgeotilespec_p.h>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QSslError>
+
+#include "DeviceInfo.h"
 #include "ElevationMapProvider.h"
 #include "MapProvider.h"
+#include "QGCFileDownload.h"
+#include "QGCLoggingCategory.h"
 #include "QGCMapEngine.h"
 #include "QGCMapUrlEngine.h"
 #include "QGeoFileTileCacheQGC.h"
 
-#include <DeviceInfo.h>
-#include <QGCFileDownload.h>
-#include <QGCLoggingCategory.h>
-
-#include <QtCore/QFile>
-#include <QtLocation/private/qgeotilespec_p.h>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QSslError>
-
-QGC_LOGGING_CATEGORY(QGeoTiledMapReplyQGCLog, "qgc.qtlocationplugin.qgeomapreplyqgc")
+QGC_LOGGING_CATEGORY(QGeoTiledMapReplyQGCLog, "QtLocationPlugin.QGeoTiledMapReplyQGC")
 
 QByteArray QGeoTiledMapReplyQGC::_bingNoTileImage;
 QByteArray QGeoTiledMapReplyQGC::_badTile;
@@ -34,26 +33,41 @@ QGeoTiledMapReplyQGC::QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager
     , _networkManager(networkManager)
     , _request(request)
 {
-    // qCDebug(QGeoTiledMapReplyQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTiledMapReplyQGCLog) << this;
+}
+
+QGeoTiledMapReplyQGC::~QGeoTiledMapReplyQGC()
+{
+    qCDebug(QGeoTiledMapReplyQGCLog) << this;
+}
+
+bool QGeoTiledMapReplyQGC::init()
+{
+    if (m_initialized) {
+        return true;
+    }
+
+    m_initialized = true;
 
     _initDataFromResources();
 
     (void) connect(this, &QGeoTiledMapReplyQGC::errorOccurred, this, [this](QGeoTiledMapReply::Error error, const QString &errorString) {
         qCWarning(QGeoTiledMapReplyQGCLog) << error << errorString;
         setMapImageData(_badTile);
-        setMapImageFormat("png");
+        setMapImageFormat(QStringLiteral("png"));
         setCached(false);
     }, Qt::AutoConnection);
 
-    QGCFetchTileTask* const task = QGeoFileTileCacheQGC::createFetchTileTask(UrlFactory::getProviderTypeFromQtMapId(spec.mapId()), spec.x(), spec.y(), spec.zoom());
+    QGCFetchTileTask *task = QGeoFileTileCacheQGC::createFetchTileTask(UrlFactory::getProviderTypeFromQtMapId(tileSpec().mapId()), tileSpec().x(), tileSpec().y(), tileSpec().zoom());
     (void) connect(task, &QGCFetchTileTask::tileFetched, this, &QGeoTiledMapReplyQGC::_cacheReply);
     (void) connect(task, &QGCMapTask::error, this, &QGeoTiledMapReplyQGC::_cacheError);
-    getQGCMapEngine()->addTask(task);
-}
+    if (!getQGCMapEngine()->addTask(task)) {
+        task->deleteLater();
+        m_initialized = false;
+        return false;
+    }
 
-QGeoTiledMapReplyQGC::~QGeoTiledMapReplyQGC()
-{
-    // qCDebug(QGeoTiledMapReplyQGCLog) << Q_FUNC_INFO << this;
+    return true;
 }
 
 void QGeoTiledMapReplyQGC::_initDataFromResources()
@@ -167,8 +181,8 @@ void QGeoTiledMapReplyQGC::_networkReplySslErrors(const QList<QSslError> &errors
 void QGeoTiledMapReplyQGC::_cacheReply(QGCCacheTile *tile)
 {
     if (tile) {
-        setMapImageData(tile->img());
-        setMapImageFormat(tile->format());
+        setMapImageData(tile->img);
+        setMapImageFormat(tile->format);
         setCached(true);
         setFinished(true);
         delete tile;
@@ -181,7 +195,7 @@ void QGeoTiledMapReplyQGC::_cacheError(QGCMapTask::TaskType type, QStringView er
 {
     Q_UNUSED(errorString);
 
-    Q_ASSERT(type == QGCMapTask::taskFetchTile);
+    Q_ASSERT(type == QGCMapTask::TaskType::taskFetchTile);
 
     if (!QGCDeviceInfo::isInternetAvailable()) {
         setError(QGeoTiledMapReply::CommunicationError, tr("Network Not Available"));
diff --git a/src/QtLocationPlugin/QGeoMapReplyQGC.h b/src/QtLocationPlugin/QGeoMapReplyQGC.h
index 173318017fdc..fd53ec80ec51 100644
--- a/src/QtLocationPlugin/QGeoMapReplyQGC.h
+++ b/src/QtLocationPlugin/QGeoMapReplyQGC.h
@@ -26,9 +26,10 @@ class QGeoTiledMapReplyQGC : public QGeoTiledMapReply
     Q_OBJECT
 
 public:
-    QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager, const QNetworkRequest &request, const QGeoTileSpec &spec, QObject *parent = nullptr);
+    explicit QGeoTiledMapReplyQGC(QNetworkAccessManager *networkManager, const QNetworkRequest &request, const QGeoTileSpec &spec, QObject *parent = nullptr);
     ~QGeoTiledMapReplyQGC();
 
+    bool init();
     void abort() final;
 
 private slots:
@@ -43,6 +44,7 @@ private slots:
 
     QNetworkAccessManager *_networkManager = nullptr;
     QNetworkRequest _request;
+    bool m_initialized = false;
 
     static QByteArray _bingNoTileImage;
     static QByteArray _badTile;
diff --git a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
index 55a3da4f6e9b..23879ce5fb36 100644
--- a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
+++ b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
@@ -8,22 +8,24 @@
  ****************************************************************************/
 
 #include "QGeoServiceProviderPluginQGC.h"
-#include "QGeoTiledMappingManagerEngineQGC.h"
-#include <QGCLoggingCategory.h>
 
+#include <QtCore/QThread>
 #include <QtQml/QQmlEngine>
 
-QGC_LOGGING_CATEGORY(QGeoServiceProviderFactoryQGCLog, "qgc.qtlocationplugin.qgeoserviceproviderfactoryqgc")
+#include "QGCLoggingCategory.h"
+#include "QGeoTiledMappingManagerEngineQGC.h"
+
+QGC_LOGGING_CATEGORY(QGeoServiceProviderFactoryQGCLog, "QtLocationPlugin.QGeoServiceProviderFactoryQGC")
 
 QGeoServiceProviderFactoryQGC::QGeoServiceProviderFactoryQGC(QObject *parent)
     : QObject(parent)
 {
-    qCDebug(QGeoServiceProviderFactoryQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoServiceProviderFactoryQGCLog) << this;
 }
 
 QGeoServiceProviderFactoryQGC::~QGeoServiceProviderFactoryQGC()
 {
-    qCDebug(QGeoServiceProviderFactoryQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoServiceProviderFactoryQGCLog) << this;
 }
 
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEngine(
@@ -34,7 +36,7 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEn
         *error = QGeoServiceProvider::NotSupportedError;
     }
     if (errorString) {
-        *errorString = "Geocoding Not Supported";
+        *errorString = QStringLiteral("Geocoding Not Supported");
     }
 
     return nullptr;
@@ -50,10 +52,10 @@ QGeoMappingManagerEngine *QGeoServiceProviderFactoryQGC::createMappingManagerEng
         *errorString = "";
     }
 
-    QNetworkAccessManager *networkManager = nullptr;
-    if (m_engine) {
-        networkManager = m_engine->networkAccessManager();
-    }
+    Q_ASSERT(m_engine);
+    Q_ASSERT(m_engine->thread() == QThread::currentThread());
+
+    QNetworkAccessManager *networkManager = m_engine->networkAccessManager();
 
     return new QGeoTiledMappingManagerEngineQGC(parameters, error, errorString, networkManager, nullptr);
 }
@@ -66,7 +68,7 @@ QGeoRoutingManagerEngine *QGeoServiceProviderFactoryQGC::createRoutingManagerEng
         *error = QGeoServiceProvider::NotSupportedError;
     }
     if (errorString) {
-        *errorString = "Routing Not Supported";
+        *errorString = QStringLiteral("Routing Not Supported");
     }
 
     return nullptr;
@@ -80,7 +82,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryQGC::createPlaceManagerEngine(
         *error = QGeoServiceProvider::NotSupportedError;
     }
     if (errorString) {
-        *errorString = "Place Not Supported";
+        *errorString = QStringLiteral("Place Not Supported");
     }
 
     return nullptr;
diff --git a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.h b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.h
index 46e4c259bbf1..d16ba55a64a7 100644
--- a/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.h
+++ b/src/QtLocationPlugin/QGeoServiceProviderPluginQGC.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
+#include <QtCore/QLoggingCategory>
 #include <QtCore/QObject>
 #include <QtCore/QtPlugin>
-#include <QtCore/QLoggingCategory>
 #include <QtLocation/QGeoServiceProviderFactory>
 
 Q_DECLARE_LOGGING_CATEGORY(QGeoServiceProviderFactoryQGCLog)
diff --git a/src/QtLocationPlugin/QGeoTileFetcherQGC.cpp b/src/QtLocationPlugin/QGeoTileFetcherQGC.cpp
index 5bc50c0c1bee..bf8293b08afd 100644
--- a/src/QtLocationPlugin/QGeoTileFetcherQGC.cpp
+++ b/src/QtLocationPlugin/QGeoTileFetcherQGC.cpp
@@ -8,25 +8,26 @@
  ****************************************************************************/
 
 #include "QGeoTileFetcherQGC.h"
-#include "QGeoTiledMappingManagerEngineQGC.h"
-#include "QGeoMapReplyQGC.h"
-#include "QGCMapUrlEngine.h"
-#include "MapProvider.h"
-#include <QGCLoggingCategory.h>
 
-#include <QtNetwork/QNetworkRequest>
 #include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
 #include <QtLocation/private/qgeotilespec_p.h>
+#include <QtNetwork/QNetworkRequest>
+
+#include "MapProvider.h"
+#include "QGCLoggingCategory.h"
+#include "QGCMapUrlEngine.h"
+#include "QGeoMapReplyQGC.h"
+#include "QGeoTiledMappingManagerEngineQGC.h"
 
-QGC_LOGGING_CATEGORY(QGeoTileFetcherQGCLog, "qgc.qtlocationplugin.qgeotilefetcherqgc")
+QGC_LOGGING_CATEGORY(QGeoTileFetcherQGCLog, "QtLocationPlugin.QGeoTileFetcherQGC")
 
 QGeoTileFetcherQGC::QGeoTileFetcherQGC(QNetworkAccessManager *networkManager, const QVariantMap &parameters, QGeoTiledMappingManagerEngineQGC *parent)
     : QGeoTileFetcher(parent)
     , m_networkManager(networkManager)
 {
-    Q_CHECK_PTR(networkManager);
+    Q_ASSERT(networkManager);
 
-    // qCDebug(QGeoTileFetcherQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTileFetcherQGCLog) << this;
 
     // TODO: Allow useragent override again
     /*if (parameters.contains(QStringLiteral("useragent"))) {
@@ -36,7 +37,7 @@ QGeoTileFetcherQGC::QGeoTileFetcherQGC(QNetworkAccessManager *networkManager, co
 
 QGeoTileFetcherQGC::~QGeoTileFetcherQGC()
 {
-    // qCDebug(QGeoTileFetcherQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTileFetcherQGCLog) << this;
 }
 
 QGeoTiledMapReply* QGeoTileFetcherQGC::getTileImage(const QGeoTileSpec &spec)
@@ -55,7 +56,13 @@ QGeoTiledMapReply* QGeoTileFetcherQGC::getTileImage(const QGeoTileSpec &spec)
         return nullptr;
     }
 
-    return new QGeoTiledMapReplyQGC(m_networkManager, request, spec);
+    QGeoTiledMapReplyQGC *tileImage = new QGeoTiledMapReplyQGC(m_networkManager, request, spec);
+    if (!tileImage->init()) {
+        tileImage->deleteLater();
+        return nullptr;
+    }
+
+    return tileImage;
 }
 
 bool QGeoTileFetcherQGC::initialized() const
@@ -98,6 +105,11 @@ QNetworkRequest QGeoTileFetcherQGC::getNetworkRequest(int mapId, int x, int y, i
 
     QNetworkRequest request;
     request.setUrl(mapProvider->getTileURL(x, y, zoom));
+    request.setPriority(QNetworkRequest::NormalPriority);
+    request.setTransferTimeout(10000);
+    // request.setOriginatingObject(this);
+
+    // Headers
     request.setRawHeader(QByteArrayLiteral("Accept"), QByteArrayLiteral("*/*"));
     request.setHeader(QNetworkRequest::UserAgentHeader, s_userAgent);
     const QByteArray referrer = mapProvider->getReferrer().toUtf8();
@@ -108,14 +120,17 @@ QNetworkRequest QGeoTileFetcherQGC::getNetworkRequest(int mapId, int x, int y, i
     if (!token.isEmpty()) {
         request.setRawHeader(QByteArrayLiteral("User-Token"), token);
     }
-    // request.setOriginatingObject(this);
+    request.setRawHeader(QByteArrayLiteral("Connection"), QByteArrayLiteral("keep-alive"));
+    // request.setRawHeader(QByteArrayLiteral("Accept-Encoding"), QByteArrayLiteral("gzip, deflate, br"));
+
+    // Attributes
     request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
     request.setAttribute(QNetworkRequest::BackgroundRequestAttribute, true);
     request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, true);
+    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
+    request.setAttribute(QNetworkRequest::Http2AllowedAttribute, true);
     request.setAttribute(QNetworkRequest::DoNotBufferUploadDataAttribute, false);
     // request.setAttribute(QNetworkRequest::AutoDeleteReplyOnFinishAttribute, true);
-    request.setPriority(QNetworkRequest::NormalPriority);
-    request.setTransferTimeout(10000);
 
     return request;
 }
diff --git a/src/QtLocationPlugin/QGeoTileFetcherQGC.h b/src/QtLocationPlugin/QGeoTileFetcherQGC.h
index d7b3508a1a90..6fa966297fa9 100644
--- a/src/QtLocationPlugin/QGeoTileFetcherQGC.h
+++ b/src/QtLocationPlugin/QGeoTileFetcherQGC.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QtLocation/private/qgeotilefetcher_p.h>
 #include <QtCore/QLoggingCategory>
+#include <QtLocation/private/qgeotilefetcher_p.h>
 #include <QtNetwork/QNetworkRequest>
 
 Q_DECLARE_LOGGING_CATEGORY(QGeoTileFetcherQGCLog)
@@ -25,7 +25,7 @@ class QGeoTileFetcherQGC : public QGeoTileFetcher
     Q_OBJECT
 
 public:
-    QGeoTileFetcherQGC(QNetworkAccessManager *networkManager, const QVariantMap &parameters, QGeoTiledMappingManagerEngineQGC *parent = nullptr);
+    explicit QGeoTileFetcherQGC(QNetworkAccessManager *networkManager, const QVariantMap &parameters, QGeoTiledMappingManagerEngineQGC *parent = nullptr);
     ~QGeoTileFetcherQGC();
 
     static QNetworkRequest getNetworkRequest(int mapId, int x, int y, int zoom);
diff --git a/src/QtLocationPlugin/QGeoTiledMapQGC.cpp b/src/QtLocationPlugin/QGeoTiledMapQGC.cpp
index 080fea2b172b..5d815223ee7a 100644
--- a/src/QtLocationPlugin/QGeoTiledMapQGC.cpp
+++ b/src/QtLocationPlugin/QGeoTiledMapQGC.cpp
@@ -8,20 +8,21 @@
  ****************************************************************************/
 
 #include "QGeoTiledMapQGC.h"
+
+#include "QGCLoggingCategory.h"
 #include "QGeoTiledMappingManagerEngineQGC.h"
-#include <QGCLoggingCategory.h>
 
-QGC_LOGGING_CATEGORY(QGeoTiledMapQGCLog, "qgc.qtlocationplugin.qgeotiledmapqgc")
+QGC_LOGGING_CATEGORY(QGeoTiledMapQGCLog, "QtLocationPlugin.QGeoTiledMapQGC")
 
 QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngineQGC *engine, QObject *parent)
     : QGeoTiledMap(engine, parent)
 {
-	// qCDebug(QGeoTiledMapQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTiledMapQGCLog) << this;
 }
 
 QGeoTiledMapQGC::~QGeoTiledMapQGC()
 {
-    // qCDebug(QGeoTiledMapQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTiledMapQGCLog) << this;
 }
 
 QGeoMap::Capabilities QGeoTiledMapQGC::capabilities() const
diff --git a/src/QtLocationPlugin/QGeoTiledMapQGC.h b/src/QtLocationPlugin/QGeoTiledMapQGC.h
index d715e1edce5e..6acc779788ad 100644
--- a/src/QtLocationPlugin/QGeoTiledMapQGC.h
+++ b/src/QtLocationPlugin/QGeoTiledMapQGC.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <QtLocation/private/qgeotiledmap_p.h>
 #include <QtCore/QLoggingCategory>
+#include <QtLocation/private/qgeotiledmap_p.h>
 
 Q_DECLARE_LOGGING_CATEGORY(QGeoTiledMapQGCLog)
 
diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
index 11e5f7997d13..bd7c4f40378a 100644
--- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
+++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
@@ -8,42 +8,47 @@
  ****************************************************************************/
 
 #include "QGeoTiledMappingManagerEngineQGC.h"
-#include "QGCApplication.h"
-#include "QGCMapEngine.h"
-#include "QGeoTileFetcherQGC.h"
-#include "QGeoFileTileCacheQGC.h"
-#include "QGeoTiledMapQGC.h"
-#include "QGCMapUrlEngine.h"
-#include "MapProvider.h"
-#include "QGCMapEngineManager.h"
-#include "QGCLoggingCategory.h"
 
 #include <mutex>
 
 #include <QtCore/QDir>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkDiskCache>
+#include <QtNetwork/QNetworkInformation>
 #include <QtNetwork/QNetworkProxy>
 #include <QtLocation/private/qgeocameracapabilities_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 #include <QtLocation/private/qgeotiledmap_p.h>
 #include <QtLocation/private/qgeofiletilecache_p.h>
 
-QGC_LOGGING_CATEGORY(QGeoTiledMappingManagerEngineQGCLog, "qgc.qtlocationplugin.qgeotiledmappingmanagerengineqgc")
+#include "DeviceInfo.h"
+#include "MapProvider.h"
+#include "QGCApplication.h"
+#include "QGCLoggingCategory.h"
+#include "QGCMapEngine.h"
+#include "QGCMapEngineManager.h"
+#include "QGCMapUrlEngine.h"
+#include "QGeoFileTileCacheQGC.h"
+#include "QGeoTiledMapQGC.h"
+#include "QGeoTileFetcherQGC.h"
+
+QGC_LOGGING_CATEGORY(QGeoTiledMappingManagerEngineQGCLog, "QtLocationPlugin.QGeoTiledMappingManagerEngineQGC")
 
 QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString, QNetworkAccessManager *networkManager, QObject *parent)
     : QGeoTiledMappingManagerEngine(parent)
     , m_networkManager(networkManager)
 {
-    // qCDebug(QGeoTiledMappingManagerEngineQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTiledMappingManagerEngineQGCLog) << this;
 
-    // TODO: Better way to get current language without qgcApp()?
     setLocale(qgcApp()->getCurrentLanguage());
+    (void) connect(qgcApp(), &QGCApplication::languageChanged, this, [this](const QLocale &locale) {
+        setLocale(locale);
+    });
 
-    QGeoCameraCapabilities cameraCaps;
+    QGeoCameraCapabilities cameraCaps{};
     cameraCaps.setTileSize(256);
     cameraCaps.setMinimumZoomLevel(2.0);
-    cameraCaps.setMaximumZoomLevel(MAX_MAP_ZOOM);
+    cameraCaps.setMaximumZoomLevel(QGC_MAX_MAP_ZOOM);
     cameraCaps.setSupportsBearing(true);
     cameraCaps.setSupportsRolling(false);
     cameraCaps.setSupportsTilting(false);
@@ -70,12 +75,12 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian
             QByteArrayLiteral("QGroundControl"),
             cameraCapabilities()
         );
-        (void) mapList.append(map);
+        mapList.append(map);
     }
     setSupportedMapTypes(mapList);
 
     setCacheHint(QAbstractGeoTileCache::CacheArea::AllCaches);
-    QGeoFileTileCacheQGC* const fileTileCache = new QGeoFileTileCacheQGC(parameters);
+    QGeoFileTileCacheQGC *fileTileCache = new QGeoFileTileCacheQGC(parameters, this);
     setTileCache(fileTileCache);
 
     // MapEngine must be init after fileTileCache
@@ -84,25 +89,17 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian
         getQGCMapEngine()->init(fileTileCache->getDatabaseFilePath());
     });
 
-    m_prefetchStyle = QGeoTiledMap::PrefetchTwoNeighbourLayers;
-
-    if (!m_networkManager) {
-        m_networkManager = new QNetworkAccessManager(this);
-        #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-            QNetworkProxy proxy = m_networkManager->proxy();
-            proxy.setType(QNetworkProxy::DefaultProxy);
-            m_networkManager->setProxy(proxy);
-        #endif
-        m_networkManager->setTransferTimeout(10000);
-        // m_networkManager->setAutoDeleteReplies(true);
-        QNetworkDiskCache *const diskCache = new QNetworkDiskCache(this);
-        diskCache->setCacheDirectory(fileTileCache->getCachePath() + "/Downloads");
-        const qint64 maxCacheSize = (50 * pow(1024, 2)); // fileTileCache->getMaxDiskCache()
-        diskCache->setMaximumCacheSize(maxCacheSize);
-        m_networkManager->setCache(diskCache);
-    }
+    m_prefetchStyle = QGCDeviceInfo::isInternetAvailable() ? QGeoTiledMap::PrefetchTwoNeighbourLayers : QGeoTiledMap::NoPrefetching;
+    (void) connect(QNetworkInformation::instance(), &QNetworkInformation::reachabilityChanged, this, [this](QNetworkInformation::Reachability newReachability) {
+        if (newReachability == QNetworkInformation::Reachability::Online) {
+            m_prefetchStyle = QGeoTiledMap::PrefetchTwoNeighbourLayers;
+        } else {
+            m_prefetchStyle = QGeoTiledMap::NoPrefetching;
+        }
+    });
 
-    QGeoTileFetcherQGC* const tileFetcher = new QGeoTileFetcherQGC(m_networkManager, parameters, this);
+    Q_ASSERT(m_networkManager);
+    QGeoTileFetcherQGC *tileFetcher = new QGeoTileFetcherQGC(m_networkManager, parameters, this);
 
     *error = QGeoServiceProvider::NoError;
     errorString->clear();
@@ -111,12 +108,12 @@ QGeoTiledMappingManagerEngineQGC::QGeoTiledMappingManagerEngineQGC(const QVarian
 
 QGeoTiledMappingManagerEngineQGC::~QGeoTiledMappingManagerEngineQGC()
 {
-    // qCDebug(QGeoTiledMappingManagerEngineQGCLog) << Q_FUNC_INFO << this;
+    qCDebug(QGeoTiledMappingManagerEngineQGCLog) << this;
 }
 
 QGeoMap *QGeoTiledMappingManagerEngineQGC::createMap()
 {
-    QGeoTiledMapQGC* const map = new QGeoTiledMapQGC(this, this);
+    QGeoTiledMapQGC *map = new QGeoTiledMapQGC(this, this);
     map->setPrefetchStyle(m_prefetchStyle);
     return map;
 }
diff --git a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h
index c2ed218e0fd2..d71d054d1952 100644
--- a/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h
+++ b/src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
+#include <QtCore/QLoggingCategory>
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/private/qgeotiledmappingmanagerengine_p.h>
-#include <QtCore/QLoggingCategory>
 
 Q_DECLARE_LOGGING_CATEGORY(QGeoTiledMappingManagerEngineQGCLog)
 
@@ -26,7 +26,7 @@ class QGeoTiledMappingManagerEngineQGC : public QGeoTiledMappingManagerEngine
     ~QGeoTiledMappingManagerEngineQGC();
 
     QGeoMap* createMap() final;
-    QNetworkAccessManager* networkManager() const { return m_networkManager; }
+    QNetworkAccessManager *networkManager() const { return m_networkManager; }
 
 private:
     QNetworkAccessManager *m_networkManager = nullptr;
diff --git a/src/RunGuard.h b/src/RunGuard.h
index b35414a90f7d..0f3546286f4a 100644
--- a/src/RunGuard.h
+++ b/src/RunGuard.h
@@ -36,4 +36,6 @@ class RunGuard
     const QString _key;
     const QString _lockFilePath;
     QLockFile _lockFile;
+
+    Q_DISABLE_COPY(RunGuard)
 };
diff --git a/src/Settings/App.SettingsGroup.json b/src/Settings/App.SettingsGroup.json
index 84984ad0df6a..e8702a7eb145 100644
--- a/src/Settings/App.SettingsGroup.json
+++ b/src/Settings/App.SettingsGroup.json
@@ -165,13 +165,20 @@
     "default":     ""
 },
 {
-    "name":                 "androidSaveToSDCard",
-    "shortDesc":            "Save to SD card",
-    "longDesc":             "Application data is saved to the sd card",
+    "name":                 "androidDontSaveToSDCard",
+    "shortDesc":            "Don't save to SD card, even if available",
+    "longDesc":             "If this option is enabled, application data will not be saved to the SD card.",
     "type":                 "bool",
     "default":              false,
     "qgcRebootRequired":    true
 },
+{
+    "name":             "tiandituToken",
+    "shortDesc": "Access token to TianDiTu maps",
+    "longDesc":  "Your personal access token for TianDiTu maps",
+    "type":             "string",
+    "default":     ""
+},
 {
     "name":             "mapboxToken",
     "shortDesc": "Access token to Mapbox maps",
@@ -214,6 +221,13 @@
     "type":             "string",
     "default":     ""
 },
+{
+    "name":             "openaipToken",
+    "shortDesc": "OpenAIP API Key",
+    "longDesc":  "Your personal API key for OpenAIP aviation maps. Get one at https://www.openaip.net",
+    "type":             "string",
+    "default":     ""
+},
 {
     "name":             "followTarget",
     "shortDesc": "Stream GCS' coordinates to Autopilot",
diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc
index aa21fc904679..c4804c172029 100644
--- a/src/Settings/AppSettings.cc
+++ b/src/Settings/AppSettings.cc
@@ -24,7 +24,7 @@
 // Release languages are 90%+ complete
 QList<QLocale::Language> AppSettings::_rgReleaseLanguages = {
     QLocale::English,
-    QLocale::Azerbaijani,    
+    QLocale::Azerbaijani,
     QLocale::Chinese,
     QLocale::Japanese,
     QLocale::Korean,
@@ -65,28 +65,6 @@ DECLARE_SETTINGGROUP(App, "")
 {
     QGCPalette::setGlobalTheme(indoorPalette()->rawValue().toBool() ? QGCPalette::Dark : QGCPalette::Light);
 
-    QSettings settings;
-
-    // These two "type" keys were changed to "class" values
-    static const char* deprecatedFirmwareTypeKey    = "offlineEditingFirmwareType";
-    static const char* deprecatedVehicleTypeKey     = "offlineEditingVehicleType";
-    if (settings.contains(deprecatedFirmwareTypeKey)) {
-        settings.setValue(deprecatedFirmwareTypeKey, QGCMAVLink::firmwareClass(static_cast<MAV_AUTOPILOT>(settings.value(deprecatedFirmwareTypeKey).toInt())));
-    }
-    if (settings.contains(deprecatedVehicleTypeKey)) {
-        settings.setValue(deprecatedVehicleTypeKey, QGCMAVLink::vehicleClass(static_cast<MAV_TYPE>(settings.value(deprecatedVehicleTypeKey).toInt())));
-    }
-
-    QStringList deprecatedKeyNames  = { "virtualJoystickCentralized",           "offlineEditingFirmwareType",   "offlineEditingVehicleType" };
-    QStringList newKeyNames         = { "virtualJoystickAutoCenterThrottle",    "offlineEditingFirmwareClass",  "offlineEditingVehicleClass" };
-    settings.beginGroup(_settingsGroup);
-    for (int i=0; i<deprecatedKeyNames.count(); i++) {
-        if (settings.contains(deprecatedKeyNames[i])) {
-            settings.setValue(newKeyNames[i], settings.value(deprecatedKeyNames[i]));
-            settings.remove(deprecatedKeyNames[i]);
-        }
-    }
-
     // Instantiate savePath so we can check for override and setup default path if needed
 
     SettingsFact* savePathFact = qobject_cast<SettingsFact*>(savePath());
@@ -107,12 +85,12 @@ DECLARE_SETTINGGROUP(App, "")
     #else
         QString rootDirPath;
         #ifdef Q_OS_ANDROID
-        if (androidSaveToSDCard()->rawValue().toBool()) {
+            if (!androidDontSaveToSDCard()->rawValue().toBool()) {
                 rootDirPath = AndroidInterface::getSDCardPath();
-            qDebug() << "AndroidInterface::getSDCardPath();" << rootDirPath;
+                qDebug() << "AndroidInterface::getSDCardPath();" << rootDirPath;
                 if (rootDirPath.isEmpty() || !QDir(rootDirPath).exists()) {
                     rootDirPath.clear();
-                    qgcApp()->showAppMessage(AppSettings::tr("Save to SD card specified for application data. But no SD card present. Using internal storage."));
+                    qDebug() << "Save to SD card specified for application data. But no SD card present or permissions not granted. Using internal storage.";
                 } else if (!QFileInfo(rootDirPath).isWritable()) {
                     rootDirPath.clear();
                     qgcApp()->showAppMessage(AppSettings::tr("Save to SD card specified for application data. But SD card is write protected. Using internal storage."));
@@ -151,16 +129,18 @@ DECLARE_SETTINGSFACT(AppSettings, virtualJoystickAutoCenterThrottle)
 DECLARE_SETTINGSFACT(AppSettings, virtualJoystickLeftHandedMode)
 DECLARE_SETTINGSFACT(AppSettings, appFontPointSize)
 DECLARE_SETTINGSFACT(AppSettings, savePath)
-DECLARE_SETTINGSFACT(AppSettings, androidSaveToSDCard)
+DECLARE_SETTINGSFACT(AppSettings, androidDontSaveToSDCard)
 DECLARE_SETTINGSFACT(AppSettings, useChecklist)
 DECLARE_SETTINGSFACT(AppSettings, enforceChecklist)
 DECLARE_SETTINGSFACT(AppSettings, enableMultiVehiclePanel)
+DECLARE_SETTINGSFACT(AppSettings, tiandituToken)
 DECLARE_SETTINGSFACT(AppSettings, mapboxToken)
 DECLARE_SETTINGSFACT(AppSettings, mapboxAccount)
 DECLARE_SETTINGSFACT(AppSettings, mapboxStyle)
 DECLARE_SETTINGSFACT(AppSettings, esriToken)
 DECLARE_SETTINGSFACT(AppSettings, customURL)
 DECLARE_SETTINGSFACT(AppSettings, vworldToken)
+DECLARE_SETTINGSFACT(AppSettings, openaipToken)
 DECLARE_SETTINGSFACT(AppSettings, gstDebugLevel)
 DECLARE_SETTINGSFACT(AppSettings, followTarget)
 DECLARE_SETTINGSFACT(AppSettings, disableAllPersistence)
@@ -241,7 +221,23 @@ void AppSettings::_checkSavePathDirectories(void)
         savePathDir.mkdir(photoDirectory);
         savePathDir.mkdir(crashDirectory);
         savePathDir.mkdir(mavlinkActionsDirectory);
+        savePathDir.mkdir(settingsDirectory);
+    }
+}
+
+QString AppSettings::_childSavePath(const char* directory)
+{
+    const QString rootPath = savePath()->rawValue().toString();
+    if (rootPath.isEmpty()) {
+        return QString();
+    }
+
+    const QDir rootDir(rootPath);
+    if (!rootDir.exists()) {
+        return QString();
     }
+
+    return rootDir.filePath(directory);
 }
 
 void AppSettings::_indoorPaletteChanged(void)
@@ -251,82 +247,47 @@ void AppSettings::_indoorPaletteChanged(void)
 
 QString AppSettings::missionSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(missionDirectory);
-    }
-    return QString();
+    return _childSavePath(missionDirectory);
 }
 
 QString AppSettings::parameterSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(parameterDirectory);
-    }
-    return QString();
+    return _childSavePath(parameterDirectory);
 }
 
 QString AppSettings::telemetrySavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(telemetryDirectory);
-    }
-    return QString();
+    return _childSavePath(telemetryDirectory);
 }
 
 QString AppSettings::logSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(logDirectory);
-    }
-    return QString();
+    return _childSavePath(logDirectory);
 }
 
 QString AppSettings::videoSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(videoDirectory);
-    }
-    return QString();
+    return _childSavePath(videoDirectory);
 }
 
 QString AppSettings::photoSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(photoDirectory);
-    }
-    return QString();
+    return _childSavePath(photoDirectory);
 }
 
 QString AppSettings::crashSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(crashDirectory);
-    }
-    return QString();
+    return _childSavePath(crashDirectory);
 }
 
 QString AppSettings::mavlinkActionsSavePath(void)
 {
-    QString path = savePath()->rawValue().toString();
-    if (!path.isEmpty() && QDir(path).exists()) {
-        QDir dir(path);
-        return dir.filePath(mavlinkActionsDirectory);
-    }
-    return QString();
+    return _childSavePath(mavlinkActionsDirectory);
+}
+
+QString AppSettings::settingsSavePath(void)
+{
+    return _childSavePath(settingsDirectory);
 }
 
 QList<int> AppSettings::firstRunPromptsIdsVariantToList(const QVariant& firstRunPromptIds)
@@ -360,9 +321,9 @@ void AppSettings::firstRunPromptIdsMarkIdAsShown(int id)
 }
 
 /// Returns the current qLocaleLanguage setting bypassing the standard SettingsGroup path. It also validates
-/// that the value is a supported language. This should only be used by QGCApplication::setLanguage to query 
-/// the language setting as early in the boot process as possible. Specfically prior to any JSON files being 
-/// loaded such that JSON file can be translated. Also since this is a one-off mechanism custom build overrides 
+/// that the value is a supported language. This should only be used by QGCApplication::setLanguage to query
+/// the language setting as early in the boot process as possible. Specfically prior to any JSON files being
+/// loaded such that JSON file can be translated. Also since this is a one-off mechanism custom build overrides
 /// for language are not currently supported.
 QLocale::Language AppSettings::_qLocaleLanguageEarlyAccess(void)
 {
diff --git a/src/Settings/AppSettings.h b/src/Settings/AppSettings.h
index 26b1503503fc..e2f5c094c944 100644
--- a/src/Settings/AppSettings.h
+++ b/src/Settings/AppSettings.h
@@ -42,16 +42,18 @@ class AppSettings : public SettingsGroup
     DEFINE_SETTINGFACT(appFontPointSize)
     DEFINE_SETTINGFACT(indoorPalette)
     DEFINE_SETTINGFACT(savePath)
-    DEFINE_SETTINGFACT(androidSaveToSDCard)
+    DEFINE_SETTINGFACT(androidDontSaveToSDCard)
     DEFINE_SETTINGFACT(useChecklist)
     DEFINE_SETTINGFACT(enforceChecklist)
     DEFINE_SETTINGFACT(enableMultiVehiclePanel)
+    DEFINE_SETTINGFACT(tiandituToken)
     DEFINE_SETTINGFACT(mapboxToken)
     DEFINE_SETTINGFACT(mapboxAccount)
     DEFINE_SETTINGFACT(mapboxStyle)
     DEFINE_SETTINGFACT(esriToken)
     DEFINE_SETTINGFACT(customURL)
     DEFINE_SETTINGFACT(vworldToken)
+    DEFINE_SETTINGFACT(openaipToken)
     DEFINE_SETTINGFACT(gstDebugLevel)
     DEFINE_SETTINGFACT(followTarget)
     DEFINE_SETTINGFACT(qLocaleLanguage)
@@ -67,7 +69,8 @@ class AppSettings : public SettingsGroup
     Q_PROPERTY(QString videoSavePath            READ videoSavePath              NOTIFY savePathsChanged)
     Q_PROPERTY(QString photoSavePath            READ photoSavePath              NOTIFY savePathsChanged)
     Q_PROPERTY(QString crashSavePath            READ crashSavePath              NOTIFY savePathsChanged)
-    Q_PROPERTY(QString mavlinkActionsSavePath    READ mavlinkActionsSavePath      NOTIFY savePathsChanged)
+    Q_PROPERTY(QString mavlinkActionsSavePath   READ mavlinkActionsSavePath     NOTIFY savePathsChanged)
+    Q_PROPERTY(QString settingsSavePath         READ settingsSavePath           NOTIFY savePathsChanged)
 
     Q_PROPERTY(QString planFileExtension        MEMBER planFileExtension        CONSTANT)
     Q_PROPERTY(QString missionFileExtension     MEMBER missionFileExtension     CONSTANT)
@@ -78,6 +81,8 @@ class AppSettings : public SettingsGroup
     Q_PROPERTY(QString shpFileExtension         MEMBER shpFileExtension         CONSTANT)
     Q_PROPERTY(QString logFileExtension         MEMBER logFileExtension         CONSTANT)
     Q_PROPERTY(QString tilesetFileExtension     MEMBER tilesetFileExtension     CONSTANT)
+    Q_PROPERTY(QString settingsFileExtension    MEMBER settingsFileExtension    CONSTANT)
+
 
     QString missionSavePath       ();
     QString parameterSavePath     ();
@@ -86,7 +91,8 @@ class AppSettings : public SettingsGroup
     QString videoSavePath         ();
     QString photoSavePath         ();
     QString crashSavePath         ();
-    QString mavlinkActionsSavePath ();
+    QString mavlinkActionsSavePath();
+    QString settingsSavePath      ();
 
     // Helper methods for working with firstRunPromptIds QVariant settings string list
     static QList<int> firstRunPromptsIdsVariantToList   (const QVariant& firstRunPromptIds);
@@ -105,6 +111,7 @@ class AppSettings : public SettingsGroup
     static constexpr const char* shpFileExtension =         "shp";
     static constexpr const char* logFileExtension =         "ulg";
     static constexpr const char* tilesetFileExtension =     "qgctiledb";
+    static constexpr const char* settingsFileExtension =    "settings";
 
     // Child directories of savePath for specific file types
     static constexpr const char* parameterDirectory =       QT_TRANSLATE_NOOP("AppSettings", "Parameters");
@@ -115,6 +122,7 @@ class AppSettings : public SettingsGroup
     static constexpr const char* photoDirectory =           QT_TRANSLATE_NOOP("AppSettings", "Photo");
     static constexpr const char* crashDirectory =           QT_TRANSLATE_NOOP("AppSettings", "CrashLogs");
     static constexpr const char* mavlinkActionsDirectory =  QT_TRANSLATE_NOOP("AppSettings", "MavlinkActions");
+    static constexpr const char* settingsDirectory =        QT_TRANSLATE_NOOP("AppSettings", "Settings");
 
 signals:
     void savePathsChanged();
@@ -130,11 +138,13 @@ private slots:
     static QList<QLocale::Language> _rgReleaseLanguages;
     static QList<QLocale::Language> _rgPartialLanguages;
 
+    QString _childSavePath(const char* directory);
+
     typedef struct {
         QLocale::Language   languageId;
         const char*         languageName;
     } LanguageInfo_t;
     static LanguageInfo_t _rgLanguageInfo[];
-    
+
     friend class QGCApplication;
 };
diff --git a/src/Settings/BatteryIndicator.SettingsGroup.json b/src/Settings/BatteryIndicator.SettingsGroup.json
index cef79cd84426..433d00f4d74f 100644
--- a/src/Settings/BatteryIndicator.SettingsGroup.json
+++ b/src/Settings/BatteryIndicator.SettingsGroup.json
@@ -23,6 +23,12 @@
             "type": "uint32",
             "default": 60,
             "units": "%"
+        },
+        {
+            "name": "consolidateMultipleBatteries",
+            "shortDesc": "Consolidate multiple battery readings",
+            "type": "bool",
+            "default": true
         }
     ]
 }
diff --git a/src/Settings/BatteryIndicatorSettings.cc b/src/Settings/BatteryIndicatorSettings.cc
index 8e5b7d43c2b8..1ac42cb1c1f8 100644
--- a/src/Settings/BatteryIndicatorSettings.cc
+++ b/src/Settings/BatteryIndicatorSettings.cc
@@ -16,6 +16,7 @@ DECLARE_SETTINGGROUP(BatteryIndicator, "BatteryIndicator")
 }
 
 DECLARE_SETTINGSFACT(BatteryIndicatorSettings, valueDisplay)
+DECLARE_SETTINGSFACT(BatteryIndicatorSettings, consolidateMultipleBatteries)
 
 DECLARE_SETTINGSFACT_NO_FUNC(BatteryIndicatorSettings, threshold1)
 {
diff --git a/src/Settings/BatteryIndicatorSettings.h b/src/Settings/BatteryIndicatorSettings.h
index 1514c0f6f6cf..6413eed9c823 100644
--- a/src/Settings/BatteryIndicatorSettings.h
+++ b/src/Settings/BatteryIndicatorSettings.h
@@ -26,13 +26,14 @@ class BatteryIndicatorSettings : public SettingsGroup
     DEFINE_SETTINGFACT(valueDisplay)            // Battery value display mode
     DEFINE_SETTINGFACT(threshold1)              // First threshold for battery level
     DEFINE_SETTINGFACT(threshold2)              // Second threshold for battery level
+    DEFINE_SETTINGFACT(consolidateMultipleBatteries)
 
     Q_INVOKABLE void setThreshold1(int value);  // Set threshold1 with validation
     Q_INVOKABLE void setThreshold2(int value);  // Set threshold2 with validation
 
 private:
     void validateThreshold1();
-    void validateThreshold2(); 
+    void validateThreshold2();
     void _threshold1Changed();
     void _threshold2Changed();
 };
diff --git a/src/Settings/CMakeLists.txt b/src/Settings/CMakeLists.txt
index 8b11c1ae1dcd..2fb22393035c 100644
--- a/src/Settings/CMakeLists.txt
+++ b/src/Settings/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Settings Module
+# Application, vehicle, and user preference settings management
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ADSBVehicleManagerSettings.cc
@@ -32,6 +37,8 @@ target_sources(${CMAKE_PROJECT_NAME}
         RemoteIDSettings.h
         RTKSettings.cc
         RTKSettings.h
+        NTRIPSettings.cc
+        NTRIPSettings.h
         SettingsGroup.cc
         SettingsGroup.h
         SettingsManager.cc
@@ -46,6 +53,9 @@ target_sources(${CMAKE_PROJECT_NAME}
         Viewer3DSettings.h
 )
 
+# ----------------------------------------------------------------------------
+# APM-Specific Settings
+# ----------------------------------------------------------------------------
 if(NOT QGC_DISABLE_APM_MAVLINK)
     target_sources(${CMAKE_PROJECT_NAME}
         PRIVATE
@@ -54,7 +64,9 @@ if(NOT QGC_DISABLE_APM_MAVLINK)
     )
 endif()
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# Settings Definition Resources
+# ----------------------------------------------------------------------------
 file(GLOB_RECURSE JSON_SETTINGS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.json)
 qt_add_resources(${CMAKE_PROJECT_NAME} json_app_settings
     PREFIX "/json"
diff --git a/src/Settings/FlightMode.SettingsGroup.json b/src/Settings/FlightMode.SettingsGroup.json
index 8454dbda4738..e520350efb86 100644
--- a/src/Settings/FlightMode.SettingsGroup.json
+++ b/src/Settings/FlightMode.SettingsGroup.json
@@ -80,6 +80,12 @@
     "shortDesc":    "Comma separated list of hidden flight modes for Airship",
     "type":         "string",
     "default":      ""
+},
+{
+    "name":         "requireModeChangeConfirmation",
+    "shortDesc":    "Require confirmation when changing flight modes",
+    "type":         "bool",
+    "default":      true
 }
 ]
 }
diff --git a/src/Settings/FlightModeSettings.cc b/src/Settings/FlightModeSettings.cc
index c37c78cb7ea1..4525258e4376 100644
--- a/src/Settings/FlightModeSettings.cc
+++ b/src/Settings/FlightModeSettings.cc
@@ -25,3 +25,4 @@ DECLARE_SETTINGSFACT(FlightModeSettings, apmHiddenFlightModesVTOL)
 DECLARE_SETTINGSFACT(FlightModeSettings, apmHiddenFlightModesRoverBoat)
 DECLARE_SETTINGSFACT(FlightModeSettings, apmHiddenFlightModesSub)
 DECLARE_SETTINGSFACT(FlightModeSettings, apmHiddenFlightModesAirship)
+DECLARE_SETTINGSFACT(FlightModeSettings, requireModeChangeConfirmation)
diff --git a/src/Settings/FlightModeSettings.h b/src/Settings/FlightModeSettings.h
index 7855aa135057..3f02f88be5d6 100644
--- a/src/Settings/FlightModeSettings.h
+++ b/src/Settings/FlightModeSettings.h
@@ -34,4 +34,5 @@ class FlightModeSettings : public SettingsGroup
     DEFINE_SETTINGFACT(apmHiddenFlightModesRoverBoat)
     DEFINE_SETTINGFACT(apmHiddenFlightModesSub)
     DEFINE_SETTINGFACT(apmHiddenFlightModesAirship)
+    DEFINE_SETTINGFACT(requireModeChangeConfirmation)
 };
diff --git a/src/Settings/FlyView.SettingsGroup.json b/src/Settings/FlyView.SettingsGroup.json
index 28469ed762b0..320a5b2fefc9 100644
--- a/src/Settings/FlyView.SettingsGroup.json
+++ b/src/Settings/FlyView.SettingsGroup.json
@@ -45,7 +45,7 @@
     "name":         "showSimpleCameraControl",
     "shortDesc":    "Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.",
     "type":         "bool",
-    "default":      true
+    "default":      false
 },
 {
     "name":         "showObstacleDistanceOverlay",
@@ -102,6 +102,12 @@
     "min":          3,
     "max":          60,
     "default":      10
+},
+{
+    "name":         "showJoystickIndicatorInToolbar",
+    "shortDesc":    "Show joystick indicator in toolbar",
+    "type":         "bool",
+    "default":      false
 }
 ]
 }
diff --git a/src/Settings/FlyViewSettings.cc b/src/Settings/FlyViewSettings.cc
index 2e5024e63690..2dda725f164b 100644
--- a/src/Settings/FlyViewSettings.cc
+++ b/src/Settings/FlyViewSettings.cc
@@ -28,3 +28,4 @@ DECLARE_SETTINGSFACT(FlyViewSettings, updateHomePosition)
 DECLARE_SETTINGSFACT(FlyViewSettings, instrumentQmlFile2)
 DECLARE_SETTINGSFACT(FlyViewSettings, requestControlAllowTakeover)
 DECLARE_SETTINGSFACT(FlyViewSettings, requestControlTimeout)
+DECLARE_SETTINGSFACT(FlyViewSettings, showJoystickIndicatorInToolbar)
diff --git a/src/Settings/FlyViewSettings.h b/src/Settings/FlyViewSettings.h
index 2188f4997bb8..bced85b89038 100644
--- a/src/Settings/FlyViewSettings.h
+++ b/src/Settings/FlyViewSettings.h
@@ -38,4 +38,5 @@ class FlyViewSettings : public SettingsGroup
     DEFINE_SETTINGFACT(instrumentQmlFile2)
     DEFINE_SETTINGFACT(requestControlAllowTakeover)
     DEFINE_SETTINGFACT(requestControlTimeout)
+    DEFINE_SETTINGFACT(showJoystickIndicatorInToolbar)
 };
diff --git a/src/Settings/GimbalController.SettingsGroup.json b/src/Settings/GimbalController.SettingsGroup.json
index fac1dd504c39..e45fac5d1daa 100644
--- a/src/Settings/GimbalController.SettingsGroup.json
+++ b/src/Settings/GimbalController.SettingsGroup.json
@@ -13,7 +13,7 @@
     "name":              "ControlType",
     "shortDesc":         "Type of on-screen control",
     "type":              "uint32",
-    "enumStrings":       "Click to point, click and drag",
+    "enumStrings":       "Click to point, Click and drag",
     "enumValues":        "0, 1",
     "default":           0
 },
@@ -65,4 +65,4 @@
     "units":             "deg/s"
 }
 ]
-}
\ No newline at end of file
+}
diff --git a/src/Settings/MapsSettings.cc b/src/Settings/MapsSettings.cc
index d4560523b1ee..ae5a3daa237f 100644
--- a/src/Settings/MapsSettings.cc
+++ b/src/Settings/MapsSettings.cc
@@ -32,7 +32,7 @@ DECLARE_SETTINGGROUP(Maps, "Maps")
         deprecatedSettings.remove(kMaxMemCacheKey);
         newSettings.setValue("maxCacheMemorySize", maxMemCache);
     }
- 
+
 }
 
 DECLARE_SETTINGSFACT(MapsSettings, maxCacheDiskSize)
diff --git a/src/Settings/MavlinkSettings.cc b/src/Settings/MavlinkSettings.cc
index 92c2363a4e90..ed26eaa1434a 100644
--- a/src/Settings/MavlinkSettings.cc
+++ b/src/Settings/MavlinkSettings.cc
@@ -47,7 +47,6 @@ DECLARE_SETTINGSFACT(MavlinkSettings, forwardMavlinkHostName)
 DECLARE_SETTINGSFACT(MavlinkSettings, forwardMavlinkAPMSupportHostName)
 DECLARE_SETTINGSFACT(MavlinkSettings, sendGCSHeartbeat)
 DECLARE_SETTINGSFACT(MavlinkSettings, gcsMavlinkSystemID)
-DECLARE_SETTINGSFACT(MavlinkSettings, requireMatchingMavlinkVersions)
 
 DECLARE_SETTINGSFACT_NO_FUNC(MavlinkSettings, mavlink2SigningKey)
 {
diff --git a/src/Settings/MavlinkSettings.h b/src/Settings/MavlinkSettings.h
index 473dc3b98792..f554573a72ca 100644
--- a/src/Settings/MavlinkSettings.h
+++ b/src/Settings/MavlinkSettings.h
@@ -33,7 +33,6 @@ class MavlinkSettings : public SettingsGroup
     DEFINE_SETTINGFACT(mavlink2SigningKey)
     DEFINE_SETTINGFACT(sendGCSHeartbeat)
     DEFINE_SETTINGFACT(gcsMavlinkSystemID)
-    DEFINE_SETTINGFACT(requireMatchingMavlinkVersions)
 
     // Although this is a global setting it only affects ArduPilot vehicle since PX4 automatically starts the stream from the vehicle side
     DEFINE_SETTINGFACT(apmStartMavlinkStreams)
diff --git a/src/Settings/NTRIP.SettingsGroup.json b/src/Settings/NTRIP.SettingsGroup.json
new file mode 100644
index 000000000000..527e19f39bc7
--- /dev/null
+++ b/src/Settings/NTRIP.SettingsGroup.json
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "fileType": "FactMetaData",
+  "QGC.MetaData.Facts": [
+    {
+      "name": "ntripServerConnectEnabled",
+      "shortDescription": "Connect to NTRIP server",
+      "longDescription": "Connect to NTRIP server using specified address/port",
+      "type": "bool",
+      "defaultValue": false,
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripServerHostAddress",
+      "shortDescription": "Host address",
+      "type": "string",
+      "defaultValue": "127.0.0.1",
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripServerPort",
+      "shortDescription": "Server port",
+      "type": "int32",
+      "defaultValue": 2101,
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripUsername",
+      "shortDescription": "Username",
+      "type": "string",
+      "defaultValue": "",
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripPassword",
+      "shortDescription": "Password",
+      "type": "string",
+      "defaultValue": "",
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripMountpoint",
+      "shortDescription": "Mount Point",
+      "longDescription": "NTRIP Mount Point. Leave blank for RTCM over TCP",
+      "type": "string",
+      "defaultValue": "",
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripWhitelist",
+      "shortDescription": "RTCM Message Whitelist",
+      "longDescription": "RTCM Messages to send over mavlink. Leave blank for all messages",
+      "type": "string",
+      "defaultValue": "",
+      "qgcRebootRequired": true
+    },
+    {
+      "name": "ntripUseSpartn",
+      "shortDescription": "Use SPARTN pipeline",
+      "longDescription": "If enabled, connect with TLS (2102) and treat payload as SPARTN instead of RTCM. Requires SPARTN keys handled by the receiver.",
+      "type": "bool",
+      "defaultValue": false,
+      "qgcRebootRequired": true
+    }
+  ]
+}
diff --git a/src/Settings/NTRIPSettings.cc b/src/Settings/NTRIPSettings.cc
new file mode 100644
index 000000000000..e03685536de0
--- /dev/null
+++ b/src/Settings/NTRIPSettings.cc
@@ -0,0 +1,77 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "NTRIPSettings.h"
+
+NTRIPSettings::NTRIPSettings(QObject* parent)
+    : SettingsGroup("NTRIP", "NTRIP", parent)
+{
+    FactMetaData* metaData = new FactMetaData(FactMetaData::valueTypeBool, this);
+    metaData->setName("ntripServerConnectEnabled");
+    metaData->setShortDescription(tr("Enable NTRIP"));
+    metaData->setRawDefaultValue(false);
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeString, this);
+    metaData->setName("ntripServerHostAddress");
+    metaData->setShortDescription(tr("Host Address"));
+    metaData->setRawDefaultValue("");
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeUint16, this);
+    metaData->setName("ntripServerPort");
+    metaData->setShortDescription(tr("Port"));
+    metaData->setRawDefaultValue(2101);
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeString, this);
+    metaData->setName("ntripUsername");
+    metaData->setShortDescription(tr("Username"));
+    metaData->setRawDefaultValue("");
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeString, this);
+    metaData->setName("ntripPassword");
+    metaData->setShortDescription(tr("Password"));
+    metaData->setRawDefaultValue("");
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeString, this);
+    metaData->setName("ntripMountpoint");
+    metaData->setShortDescription(tr("Mount Point"));
+    metaData->setRawDefaultValue("");
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeString, this);
+    metaData->setName("ntripWhitelist");
+    metaData->setShortDescription(tr("RTCM Message Whitelist"));
+    metaData->setRawDefaultValue("");
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    metaData = new FactMetaData(FactMetaData::valueTypeBool, this);
+    metaData->setName("ntripUseSpartn");
+    metaData->setShortDescription(tr("Use SPARTN pipeline"));
+    metaData->setRawDefaultValue(false);
+    _nameToMetaDataMap[metaData->name()] = metaData;
+
+    // Force ntripServerConnectEnabled to false at every startup, ignoring saved settings
+    // This ensures NTRIP never auto-starts regardless of previous user state
+    if (ntripServerConnectEnabled()) {
+        ntripServerConnectEnabled()->setRawValue(false);
+    }
+}
+
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripServerConnectEnabled)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripServerHostAddress)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripServerPort)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripUsername)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripPassword)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripMountpoint)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripWhitelist)
+DECLARE_SETTINGSFACT(NTRIPSettings, ntripUseSpartn)
diff --git a/src/Settings/NTRIPSettings.h b/src/Settings/NTRIPSettings.h
new file mode 100644
index 000000000000..91197ecf10b5
--- /dev/null
+++ b/src/Settings/NTRIPSettings.h
@@ -0,0 +1,31 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "SettingsGroup.h"
+
+class NTRIPSettings : public SettingsGroup
+{
+    Q_OBJECT
+
+public:
+    NTRIPSettings(QObject* parent = nullptr);
+
+    DEFINE_SETTING_NAME_GROUP()
+
+    DEFINE_SETTINGFACT(ntripServerConnectEnabled)
+    DEFINE_SETTINGFACT(ntripServerHostAddress)
+    DEFINE_SETTINGFACT(ntripServerPort)
+    DEFINE_SETTINGFACT(ntripUsername)
+    DEFINE_SETTINGFACT(ntripPassword)
+    DEFINE_SETTINGFACT(ntripMountpoint)
+    DEFINE_SETTINGFACT(ntripWhitelist)
+    DEFINE_SETTINGFACT(ntripUseSpartn)
+};
diff --git a/src/Settings/RemoteIDSettings.h b/src/Settings/RemoteIDSettings.h
index 91b7c042b980..ef790e97abcf 100644
--- a/src/Settings/RemoteIDSettings.h
+++ b/src/Settings/RemoteIDSettings.h
@@ -18,7 +18,27 @@ class RemoteIDSettings : public SettingsGroup
     Q_OBJECT
     QML_ELEMENT
     QML_UNCREATABLE("")
+
 public:
+    enum class RegionOperation {
+        FAA,
+        EU
+    };
+    Q_ENUM(RegionOperation)
+
+    enum class LocationType {
+        TAKEOFF,
+        LIVE,
+        FIXED
+    };
+    Q_ENUM(LocationType)
+
+    enum class ClassificationType {
+        UNDEFINED,
+        EU
+    };
+    Q_ENUM(ClassificationType)
+
     RemoteIDSettings(QObject* parent = nullptr);
     DEFINE_SETTING_NAME_GROUP()
 
diff --git a/src/Settings/SettingsGroup.cc b/src/Settings/SettingsGroup.cc
index 34a4adda016a..536b4d9fa0d8 100644
--- a/src/Settings/SettingsGroup.cc
+++ b/src/Settings/SettingsGroup.cc
@@ -32,4 +32,3 @@ SettingsFact* SettingsGroup::_createSettingsFact(const QString& factName)
     }
     return new SettingsFact(_settingsGroup, m, this);
 }
-
diff --git a/src/Settings/SettingsManager.cc b/src/Settings/SettingsManager.cc
index ed7651d51e0c..396162a3da94 100644
--- a/src/Settings/SettingsManager.cc
+++ b/src/Settings/SettingsManager.cc
@@ -29,16 +29,20 @@
 #include "RemoteIDSettings.h"
 #include "RTKSettings.h"
 #include "UnitsSettings.h"
+#include "NTRIPSettings.h"
 #include "VideoSettings.h"
 #include "MavlinkSettings.h"
 #ifdef QGC_VIEWER3D
 #include "Viewer3DSettings.h"
 #endif
+#include "JsonHelper.h"
+#include "QGCCorePlugin.h"
+#include "QGCApplication.h"
 
 #include <QtCore/QApplicationStatic>
 #include <QtQml/qqml.h>
 
-QGC_LOGGING_CATEGORY(SettingsManagerLog, "qgc.settings.settingsmanager")
+QGC_LOGGING_CATEGORY(SettingsManagerLog, "Utilities.SettingsManager")
 
 Q_APPLICATION_STATIC(SettingsManager, _settingsManagerInstance);
 
@@ -58,15 +62,20 @@ SettingsManager *SettingsManager::instance()
     return _settingsManagerInstance();
 }
 
+void SettingsManager::registerQmlTypes()
+{
+    (void) qmlRegisterUncreatableType<SettingsManager>("QGroundControl.SettingsManager", 1, 0, "SettingsManager", "Reference only");
+    (void) qmlRegisterUncreatableType<NTRIPSettings>("QGroundControl", 1, 0, "NTRIPSettings", "Reference only");
+
+}
+
 void SettingsManager::init()
 {
     _unitsSettings = new UnitsSettings(this); // Must be first since AppSettings references it
 
-    _adsbVehicleManagerSettings = new ADSBVehicleManagerSettings(this);
-#ifndef QGC_NO_ARDUPILOT_DIALECT
-    _apmMavlinkStreamRateSettings = new APMMavlinkStreamRateSettings(this);
-#endif
     _appSettings = new AppSettings(this);
+    _loadSettingsFiles();
+
     _autoConnectSettings = new AutoConnectSettings(this);
     _batteryIndicatorSettings = new BatteryIndicatorSettings(this);
     _brandImageSettings = new BrandImageSettings(this);
@@ -81,10 +90,15 @@ void SettingsManager::init()
     _planViewSettings = new PlanViewSettings(this);
     _remoteIDSettings = new RemoteIDSettings(this);
     _rtkSettings = new RTKSettings(this);
+    _ntripSettings = new NTRIPSettings(this);
     _videoSettings = new VideoSettings(this);
     _mavlinkSettings = new MavlinkSettings(this);
 #ifdef QGC_VIEWER3D
     _viewer3DSettings = new Viewer3DSettings(this);
+#endif
+    _adsbVehicleManagerSettings = new ADSBVehicleManagerSettings(this);
+#ifndef QGC_NO_ARDUPILOT_DIALECT
+    _apmMavlinkStreamRateSettings = new APMMavlinkStreamRateSettings(this);
 #endif
 }
 
@@ -108,8 +122,166 @@ PlanViewSettings *SettingsManager::planViewSettings() const { return _planViewSe
 RemoteIDSettings *SettingsManager::remoteIDSettings() const { return _remoteIDSettings; }
 RTKSettings *SettingsManager::rtkSettings() const { return _rtkSettings; }
 UnitsSettings *SettingsManager::unitsSettings() const { return _unitsSettings; }
+NTRIPSettings *SettingsManager::ntripSettings() const { return _ntripSettings; }
 VideoSettings *SettingsManager::videoSettings() const { return _videoSettings; }
 MavlinkSettings *SettingsManager::mavlinkSettings() const { return _mavlinkSettings; }
 #ifdef QGC_VIEWER3D
 Viewer3DSettings *SettingsManager::viewer3DSettings() const { return _viewer3DSettings; }
 #endif
+
+void SettingsManager::_loadSettingsFiles()
+{
+    // Settings files can be found in the settingsSavePath() directory
+    // Settings files are json files which end in the settingsFileExtension extension
+    // The format for a settings file is:
+    // {
+    //      "version": 1,
+    //      "fileType": "Settings",
+    //      "groups": {
+    //          "groupName": {
+    //              "settingName": {
+    //                  "forceRawValue": <value>, // Forces the rawValue for this setting to the specific value
+    //                  any FactMetaData json keys except for name and type,
+    //                  ...
+    //          },
+    //          "groupName": {
+    //              ...
+    //          }
+    //      }
+    // }
+
+    QDir settingsDir(_appSettings->settingsSavePath());
+    if (!settingsDir.exists()) {
+        qCWarning(SettingsManagerLog) << "Settings directory does not exist:" << settingsDir.absolutePath();
+        return;
+    }
+
+    QStringList settingsFiles = settingsDir.entryList(QStringList() << QString("*.%1").arg(_appSettings->settingsFileExtension), QDir::Files);
+    for (const QString &fileName : settingsFiles) {
+        QFileInfo fileInfo(settingsDir, fileName);
+        if (!fileInfo.isFile()) continue;
+
+        // Load the settings file
+        qCDebug(SettingsManagerLog) << "Loading settings file:" << fileInfo.absoluteFilePath();
+
+        QJsonDocument jsonDoc;
+        QString errorString;
+        if (!JsonHelper::isJsonFile(fileInfo.absoluteFilePath(), jsonDoc, errorString)) {
+            qCWarning(SettingsManagerLog) << "Failed to load settings file:" << fileInfo.absoluteFilePath() << errorString;
+            continue;
+        }
+
+        QJsonObject jsonObject = jsonDoc.object();
+
+        // Validate the settings file
+        int version;
+        if (!JsonHelper::validateInternalQGCJsonFile(jsonObject, "Settings", 1, 1, version, errorString)) {
+            qCWarning(SettingsManagerLog) << "Settings file failed validation:" << fileInfo.absoluteFilePath() << errorString;
+            continue;
+        }
+
+        // Validate the remainder of the file
+
+        // groups key is an object
+        static const QList<JsonHelper::KeyValidateInfo> keyInfoList = {
+            { kJsonGroupsObjectKey, QJsonValue::Object, true },
+        };
+        if (!JsonHelper::validateKeys(jsonObject, keyInfoList, errorString)) {
+            qCWarning(SettingsManagerLog) << "Settings file incorrect format:" << fileInfo.absoluteFilePath() << errorString;
+            continue;
+        }
+
+        auto groupsObject = jsonObject[kJsonGroupsObjectKey].toObject();
+        for (const QString &groupName : groupsObject.keys()) {
+            qCDebug(SettingsManagerLog) << "  Loading settings group:" << groupName;
+
+            const QJsonValue &groupValue = groupsObject[groupName];
+            if (!groupValue.isObject()) {
+                qCWarning(SettingsManagerLog) << "Settings file incorrect format, group is not an object:" << fileInfo.absoluteFilePath()
+                                            << groupName;
+                continue;
+            }
+
+            auto groupObject = groupValue.toObject();
+            for (const QString &settingName : groupObject.keys()) {
+                qCDebug(SettingsManagerLog) << "  Loading settings:" << groupName << settingName;
+
+                if (!groupObject[settingName].isObject()) {
+                    qCWarning(SettingsManagerLog) << "Settings file incorrect format, setting is not an object:" << fileInfo.absoluteFilePath()
+                                                << groupName << settingName;
+                    continue;
+                }
+
+                // Store the setting overrides. Note that last one wins if there are multiple settings files with the same setting.
+                QJsonObject metaDataObject = groupObject[settingName].toObject();
+                _settingsFileOverrides[groupName][settingName] = metaDataObject;
+            }
+        }
+    }
+}
+
+void SettingsManager::adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData, bool &visible)
+{
+    visible = true; // By default all settings are visible
+
+    SettingsManager *settingsManager = SettingsManager::instance();
+    if (!settingsManager) {
+        qCWarning(SettingsManagerLog) << "SettingsManager instance not available";
+        return;
+    }
+
+    if (!qgcApp()->runningUnitTests()) {
+        // Apply settings file overrides
+        const auto &groupOverrides = settingsManager->_settingsFileOverrides;
+        if (groupOverrides.contains(settingsGroup) && groupOverrides[settingsGroup].contains(metaData.name())) {
+            QJsonObject settingOverrideJsonObject = groupOverrides[settingsGroup][metaData.name()];
+
+            // We need to stuff in name and type so settingOverrideJsonObject can parse properly
+            settingOverrideJsonObject["name"] = metaData.name();
+            settingOverrideJsonObject["type"] = FactMetaData::typeToString(metaData.type());
+
+            qCDebug(SettingsManagerLog) << "Applying settings file override for" << settingsGroup << metaData.name();
+
+            QScopedPointer<FactMetaData> overrideMetaData(FactMetaData::createFromJsonObject(settingOverrideJsonObject, {}, nullptr));
+
+            // Apply overrides
+            for (const QString &metaDataName : settingOverrideJsonObject.keys()) {
+                if (metaDataName == kJsonVisibleKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting visibility to" << settingOverrideJsonObject[kJsonVisibleKey].toBool();
+                    visible = settingOverrideJsonObject[kJsonVisibleKey].toBool();
+                } else if (metaDataName == kJsonForceRawValueKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting forceRawValue to" << settingOverrideJsonObject[kJsonForceRawValueKey];
+                    metaData.setRawDefaultValue(settingOverrideJsonObject[kJsonForceRawValueKey].toVariant());
+                    visible = false;
+                } else if (metaDataName == FactMetaData::_defaultValueJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting default to" << overrideMetaData->rawDefaultValue();
+                    metaData.setRawDefaultValue(overrideMetaData->rawDefaultValue());
+                } else if (metaDataName == FactMetaData::_minJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting min to" << overrideMetaData->rawMin();
+                    metaData.setRawMin(overrideMetaData->rawMin());
+                } else if (metaDataName == FactMetaData::_maxJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting max to" << overrideMetaData->rawMax();
+                    metaData.setRawMax(overrideMetaData->rawMax());
+                } else if (metaDataName == FactMetaData::_decimalPlacesJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting decimalPlaces to" << overrideMetaData->decimalPlaces();
+                    metaData.setDecimalPlaces(overrideMetaData->decimalPlaces());
+                } else if (metaDataName == FactMetaData::_enumValuesJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting enumInfo to" << overrideMetaData->enumValues() << overrideMetaData->enumStrings();
+                    metaData.setEnumInfo(overrideMetaData->enumStrings(), overrideMetaData->enumValues());
+                } else if (metaDataName == FactMetaData::_enumBitmaskArrayJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting bitmaskInfo to" << overrideMetaData->bitmaskValues() << overrideMetaData->bitmaskStrings();
+                    metaData.setBitmaskInfo(overrideMetaData->bitmaskStrings(), overrideMetaData->bitmaskValues());
+                } else if (metaDataName == FactMetaData::_longDescriptionJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting longDesc to" << overrideMetaData->longDescription();
+                    metaData.setLongDescription(overrideMetaData->longDescription());
+                } else if (metaDataName == FactMetaData::_shortDescriptionJsonKey) {
+                    qCDebug(SettingsManagerLog) << "  Setting shortDesc to" << overrideMetaData->shortDescription();
+                    metaData.setShortDescription(overrideMetaData->shortDescription());
+                }
+            }
+        }
+    }
+
+    // Give QGCCorePlugin a whack at it too
+    QGCCorePlugin::instance()->adjustSettingMetaData(settingsGroup, metaData, visible);
+}
diff --git a/src/Settings/SettingsManager.h b/src/Settings/SettingsManager.h
index 4767b72f2d6c..450a6f1abebd 100644
--- a/src/Settings/SettingsManager.h
+++ b/src/Settings/SettingsManager.h
@@ -12,6 +12,8 @@
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QObject>
 #include <QtQmlIntegration/QtQmlIntegration>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
 
 class ADSBVehicleManagerSettings;
 class APMMavlinkStreamRateSettings;
@@ -31,9 +33,11 @@ class PlanViewSettings;
 class RemoteIDSettings;
 class RTKSettings;
 class UnitsSettings;
+class NTRIPSettings;
 class VideoSettings;
 class Viewer3DSettings;
 class MavlinkSettings;
+class FactMetaData;
 
 Q_DECLARE_LOGGING_CATEGORY(SettingsManagerLog)
 
@@ -63,6 +67,7 @@ class SettingsManager : public QObject
     Q_MOC_INCLUDE("RemoteIDSettings.h")
     Q_MOC_INCLUDE("RTKSettings.h")
     Q_MOC_INCLUDE("UnitsSettings.h")
+    Q_MOC_INCLUDE("NTRIPSettings.h")
     Q_MOC_INCLUDE("VideoSettings.h")
     Q_MOC_INCLUDE("MavlinkSettings.h")
 #ifdef QGC_VIEWER3D
@@ -88,6 +93,7 @@ class SettingsManager : public QObject
     Q_PROPERTY(QObject *remoteIDSettings                READ remoteIDSettings               CONSTANT)
     Q_PROPERTY(QObject *rtkSettings                     READ rtkSettings                    CONSTANT)
     Q_PROPERTY(QObject *unitsSettings                   READ unitsSettings                  CONSTANT)
+    Q_PROPERTY(QObject *ntripSettings                   READ ntripSettings                  CONSTANT)
     Q_PROPERTY(QObject *videoSettings                   READ videoSettings                  CONSTANT)
     Q_PROPERTY(QObject *mavlinkSettings                 READ mavlinkSettings                CONSTANT)
 #ifdef QGC_VIEWER3D
@@ -102,6 +108,12 @@ class SettingsManager : public QObject
 
     void init();
 
+    /// Allows for overriding the meta data before the fact is created.
+    ///     @param settingsGroup - QSettings group which contains this item
+    ///     @param metaData - MetaData for setting fact
+    ///     @param visible - true: Setting should be visible in ui, false: Setting should not be shown in ui (default value will be used as value)
+    static void adjustSettingMetaData(const QString &settingsGroup, FactMetaData &metaData, bool &visible);
+
     ADSBVehicleManagerSettings *adsbVehicleManagerSettings() const;
 #ifndef QGC_NO_ARDUPILOT_DIALECT
     APMMavlinkStreamRateSettings *apmMavlinkStreamRateSettings() const;
@@ -122,6 +134,7 @@ class SettingsManager : public QObject
     RemoteIDSettings *remoteIDSettings() const;
     RTKSettings *rtkSettings() const;
     UnitsSettings *unitsSettings() const;
+    NTRIPSettings *ntripSettings() const;
     VideoSettings *videoSettings() const;
     MavlinkSettings *mavlinkSettings() const;
 #ifdef QGC_VIEWER3D
@@ -129,6 +142,8 @@ class SettingsManager : public QObject
 #endif
 
 private:
+    void _loadSettingsFiles();
+
     ADSBVehicleManagerSettings *_adsbVehicleManagerSettings = nullptr;
 #ifndef QGC_NO_ARDUPILOT_DIALECT
     APMMavlinkStreamRateSettings *_apmMavlinkStreamRateSettings = nullptr;
@@ -149,9 +164,18 @@ class SettingsManager : public QObject
     RemoteIDSettings *_remoteIDSettings = nullptr;
     RTKSettings *_rtkSettings = nullptr;
     UnitsSettings *_unitsSettings = nullptr;
+    NTRIPSettings *_ntripSettings = nullptr;
     VideoSettings *_videoSettings = nullptr;
     MavlinkSettings *_mavlinkSettings = nullptr;
 #ifdef QGC_VIEWER3D
     Viewer3DSettings *_viewer3DSettings = nullptr;
 #endif
+
+    QMap<QString, QMap<QString, QJsonObject>> _settingsFileOverrides;   // groupName:settingName:metaDataObject
+
+    static constexpr int kSettingsFileVersion = 1;
+    static constexpr const char* kSettingsFileType = "Settings";
+    static constexpr const char* kJsonGroupsObjectKey = "groups";
+    static constexpr const char* kJsonVisibleKey = "visible";
+    static constexpr const char* kJsonForceRawValueKey = "forceRawValue";
 };
diff --git a/src/Settings/Video.SettingsGroup.json b/src/Settings/Video.SettingsGroup.json
index cf3fd14d9389..aff4a24c8ac1 100644
--- a/src/Settings/Video.SettingsGroup.json
+++ b/src/Settings/Video.SettingsGroup.json
@@ -74,9 +74,9 @@
     "shortDesc": "Video Recording Format",
     "longDesc":  "Video recording file format.",
     "type":             "uint32",
-    "enumStrings":      "mkv,mov,mp4",
-    "enumValues":       "0,1,2",
-    "default":     0
+    "enumStrings":      "mp4,mov,mkv",
+    "enumValues":       "2,1,0",
+    "default":     2
 },
 {
     "name":             "maxVideoSize",
@@ -128,12 +128,13 @@
 },
 {
     "name":             "forceVideoDecoder",
-    "shortDesc":        "Force specific category of video decode",
+    "shortDesc":        "Force video decoder priority",
     "longDesc":         "Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.",
     "type":             "uint32",
-    "enumStrings":      "Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder",
-    "enumValues":       "0,1,2,3,4,5,6,7",
-    "default":           0
+    "enumStrings":      "Default,Force software decoder,Force hardware decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder",
+    "enumValues":       "0,1,8,2,3,4,5,6,7",
+    "default":           0,
+    "qgcRebootRequired": true
 }
 ]
 }
diff --git a/src/Settings/VideoSettings.cc b/src/Settings/VideoSettings.cc
index 44baa01f29f3..084afafa4a64 100644
--- a/src/Settings/VideoSettings.cc
+++ b/src/Settings/VideoSettings.cc
@@ -40,7 +40,10 @@ DECLARE_SETTINGGROUP(Video, "Video")
     #endif
 #endif
 #ifndef QGC_DISABLE_UVC
-    videoSourceList.append(UVCReceiver::getDeviceNameList());
+    QStringList uvcDevices = UVCReceiver::getDeviceNameList();
+    for (const QString& device : uvcDevices) {
+        videoSourceList.append(device);
+    }
 #endif
     if (videoSourceList.count() == 0) {
         _noVideo = true;
diff --git a/src/Settings/Viewer3DSettings.cc b/src/Settings/Viewer3DSettings.cc
index e4e100f8b73d..2a8f929893a9 100644
--- a/src/Settings/Viewer3DSettings.cc
+++ b/src/Settings/Viewer3DSettings.cc
@@ -17,5 +17,3 @@ DECLARE_SETTINGSFACT(Viewer3DSettings, enabled)
 DECLARE_SETTINGSFACT(Viewer3DSettings, osmFilePath)
 DECLARE_SETTINGSFACT(Viewer3DSettings, buildingLevelHeight)
 DECLARE_SETTINGSFACT(Viewer3DSettings, altitudeBias)
-
-
diff --git a/src/Terrain/CMakeLists.txt b/src/Terrain/CMakeLists.txt
index b6f6d1339d80..2f9a85fe973e 100644
--- a/src/Terrain/CMakeLists.txt
+++ b/src/Terrain/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Terrain Module
+# Provides terrain elevation data and queries using Copernicus data
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         Providers/TerrainQueryCopernicus.cc
diff --git a/src/Terrain/Providers/TerrainQueryCopernicus.cc b/src/Terrain/Providers/TerrainQueryCopernicus.cc
index bede9ec136e9..604a4bb3fa67 100644
--- a/src/Terrain/Providers/TerrainQueryCopernicus.cc
+++ b/src/Terrain/Providers/TerrainQueryCopernicus.cc
@@ -24,7 +24,7 @@
 #include <QtNetwork/QSslConfiguration>
 #include <QtPositioning/QGeoCoordinate>
 
-QGC_LOGGING_CATEGORY(TerrainQueryCopernicusLog, "qgc.terrain.terrainquerycopernicus")
+QGC_LOGGING_CATEGORY(TerrainQueryCopernicusLog, "Terrain.TerrainQueryCopernicus")
 
 TerrainQueryCopernicus::TerrainQueryCopernicus(QObject *parent)
     : TerrainOnlineQuery(parent)
diff --git a/src/Terrain/Providers/TerrainTileCopernicus.cc b/src/Terrain/Providers/TerrainTileCopernicus.cc
index 9363938c9f22..819fd3722013 100644
--- a/src/Terrain/Providers/TerrainTileCopernicus.cc
+++ b/src/Terrain/Providers/TerrainTileCopernicus.cc
@@ -15,7 +15,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(TerrainTileCopernicusLog, "qgc.terrain.terraintilecopernicus");
+QGC_LOGGING_CATEGORY(TerrainTileCopernicusLog, "Terrain.TerrainTileCopernicus");
 
 TerrainTileCopernicus::TerrainTileCopernicus(const QByteArray &byteArray)
     : TerrainTile(byteArray)
diff --git a/src/Terrain/TerrainQuery.cc b/src/Terrain/TerrainQuery.cc
index 500d29cf9b3e..0756e73cc2a5 100644
--- a/src/Terrain/TerrainQuery.cc
+++ b/src/Terrain/TerrainQuery.cc
@@ -14,8 +14,8 @@
 
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(TerrainQueryLog, "qgc.terrain.terrainquery")
-QGC_LOGGING_CATEGORY(TerrainQueryVerboseLog, "qgc.terrain.terrainquery.verbose")
+QGC_LOGGING_CATEGORY(TerrainQueryLog, "Terrain.TerrainQuery")
+QGC_LOGGING_CATEGORY(TerrainQueryVerboseLog, "Terrain.TerrainQuery:verbose")
 
 Q_GLOBAL_STATIC(TerrainAtCoordinateBatchManager, _terrainAtCoordinateBatchManager)
 
diff --git a/src/Terrain/TerrainQueryInterface.cc b/src/Terrain/TerrainQueryInterface.cc
index 63dba07b1a13..1c5bb5741b4d 100644
--- a/src/Terrain/TerrainQueryInterface.cc
+++ b/src/Terrain/TerrainQueryInterface.cc
@@ -15,7 +15,7 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QtPositioning/QGeoCoordinate>
 
-QGC_LOGGING_CATEGORY(TerrainQueryInterfaceLog, "qgc.terrain.terrainqueryinterface")
+QGC_LOGGING_CATEGORY(TerrainQueryInterfaceLog, "Terrain.TerrainQueryInterface")
 
 TerrainQueryInterface::TerrainQueryInterface(QObject *parent)
     : QObject(parent)
diff --git a/src/Terrain/TerrainTile.cc b/src/Terrain/TerrainTile.cc
index eb26e55a4ecd..9f55bda84e1c 100644
--- a/src/Terrain/TerrainTile.cc
+++ b/src/Terrain/TerrainTile.cc
@@ -13,7 +13,7 @@
 #include <QtCore/QtNumeric>
 #include <QtPositioning/QGeoCoordinate>
 
-QGC_LOGGING_CATEGORY(TerrainTileLog, "qgc.terrain.terraintile");
+QGC_LOGGING_CATEGORY(TerrainTileLog, "Terrain.terraintile");
 
 TerrainTile::TerrainTile(const QByteArray &byteArray)
     : _tileInfo(*reinterpret_cast<const TileInfo_t*>(byteArray.constData()))
diff --git a/src/Terrain/TerrainTileManager.cc b/src/Terrain/TerrainTileManager.cc
index 1561bec6f419..7fa9f1035fd5 100644
--- a/src/Terrain/TerrainTileManager.cc
+++ b/src/Terrain/TerrainTileManager.cc
@@ -23,7 +23,7 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QNetworkRequest>
 
-QGC_LOGGING_CATEGORY(TerrainTileManagerLog, "qgc.terrain.terraintilemanager")
+QGC_LOGGING_CATEGORY(TerrainTileManagerLog, "Terrain.TerrainTileManager")
 
 Q_GLOBAL_STATIC(TerrainTileManager, _terrainTileManager)
 
@@ -36,7 +36,7 @@ TerrainTileManager::TerrainTileManager(QObject *parent)
     : QObject(parent)
     , _networkManager(new QNetworkAccessManager(this))
 {
-    // qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << this;
+    qCDebug(TerrainTileManagerLog) << this;
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
     QNetworkProxy proxy = _networkManager->proxy();
@@ -49,7 +49,7 @@ TerrainTileManager::~TerrainTileManager()
 {
     qDeleteAll(_tiles);
 
-    // qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << this;
+    qCDebug(TerrainTileManagerLog) << this;
 }
 
 bool TerrainTileManager::getAltitudesForCoordinates(const QList<QGeoCoordinate> &coordinates, QList<double> &altitudes, bool &error)
@@ -65,16 +65,16 @@ bool TerrainTileManager::getAltitudesForCoordinates(const QList<QGeoCoordinate>
             provider->lat2tileY(coordinate.latitude(), 1),
             1
         );
-        qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "hash:coordinate" << tileHash << coordinate;
+        qCDebug(TerrainTileManagerLog) << "hash:coordinate" << tileHash << coordinate;
 
         TerrainTile* const tile = _getCachedTile(tileHash);
         if (tile) {
             const double elevation = tile->elevation(coordinate);
             if (qIsNaN(elevation)) {
                 error = true;
-                qCWarning(TerrainTileManagerLog) << Q_FUNC_INFO << "Internal Error: missing elevation in tile cache";
+                qCWarning(TerrainTileManagerLog) << "Internal Error: missing elevation in tile cache";
             } else {
-                qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "returning elevation from tile cache" << elevation;
+                qCDebug(TerrainTileManagerLog) << "returning elevation from tile cache" << elevation;
             }
             altitudes.push_back(elevation);
         } else if (_state != TerrainQuery::State::Downloading) {
@@ -84,10 +84,13 @@ bool TerrainTileManager::getAltitudesForCoordinates(const QList<QGeoCoordinate>
             spec.setZoom(1);
             spec.setMapId(provider->getMapId());
             const QNetworkRequest request = QGeoTileFetcherQGC::getNetworkRequest(spec.mapId(), spec.x(), spec.y(), spec.zoom());
-            QGeoTiledMapReplyQGC* const reply = new QGeoTiledMapReplyQGC(_networkManager, request, spec, this);
+            QGeoTiledMapReplyQGC *reply = new QGeoTiledMapReplyQGC(_networkManager, request, spec, this);
             (void) connect(reply, &QGeoTiledMapReplyQGC::finished, this, &TerrainTileManager::_terrainDone);
-            _state = TerrainQuery::State::Downloading;
-            // TODO: Batch Downloading?
+            if (reply->init()) {
+                _state = TerrainQuery::State::Downloading;
+            } else {
+                reply->deleteLater();
+            }
             return false;
         } else {
             return false;
@@ -99,7 +102,7 @@ bool TerrainTileManager::getAltitudesForCoordinates(const QList<QGeoCoordinate>
 
 void TerrainTileManager::addCoordinateQuery(TerrainQueryInterface *terrainQueryInterface, const QList<QGeoCoordinate> &coordinates)
 {
-    qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "count" << coordinates.count();
+    qCDebug(TerrainTileManagerLog) << "count" << coordinates.count();
 
     if (coordinates.isEmpty()) {
         return;
@@ -108,7 +111,7 @@ void TerrainTileManager::addCoordinateQuery(TerrainQueryInterface *terrainQueryI
     bool error;
     QList<double> altitudes;
     if (!getAltitudesForCoordinates(coordinates, altitudes, error)) {
-        qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "queue count" << _requestQueue.count();
+        qCDebug(TerrainTileManagerLog) << "queue count" << _requestQueue.count();
         const QueuedRequestInfo_t queuedRequestInfo = {
             terrainQueryInterface,
             TerrainQuery::QueryMode::QueryModeCoordinates,
@@ -122,12 +125,12 @@ void TerrainTileManager::addCoordinateQuery(TerrainQueryInterface *terrainQueryI
 
     if (error) {
         QList<double> noAltitudes;
-        qCWarning(TerrainTileManagerLog) << Q_FUNC_INFO << "signalling failure due to internal error";
+        qCWarning(TerrainTileManagerLog) << "signalling failure due to internal error";
         terrainQueryInterface->signalCoordinateHeights(false, noAltitudes);
         return;
     }
 
-    qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "all altitudes taken from cached data";
+    qCDebug(TerrainTileManagerLog) << "all altitudes taken from cached data";
     terrainQueryInterface->signalCoordinateHeights((coordinates.count() == altitudes.count()), altitudes);
 }
 
@@ -140,7 +143,7 @@ void TerrainTileManager::addPathQuery(TerrainQueryInterface *terrainQueryInterfa
     bool error;
     QList<double> altitudes;
     if (!getAltitudesForCoordinates(coordinates, altitudes, error)) {
-        qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "queue count" << _requestQueue.count();
+        qCDebug(TerrainTileManagerLog) << "queue count" << _requestQueue.count();
         const QueuedRequestInfo_t queuedRequestInfo = {
             terrainQueryInterface,
             TerrainQuery::QueryMode::QueryModePath,
@@ -154,12 +157,12 @@ void TerrainTileManager::addPathQuery(TerrainQueryInterface *terrainQueryInterfa
 
     if (error) {
         QList<double> noAltitudes;
-        qCWarning(TerrainTileManagerLog) << Q_FUNC_INFO << "signalling failure due to internal error";
+        qCWarning(TerrainTileManagerLog) << "signalling failure due to internal error";
         terrainQueryInterface->signalPathHeights(false, distanceBetween, finalDistanceBetween, noAltitudes);
         return;
     }
 
-    qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "all altitudes taken from cached data";
+    qCDebug(TerrainTileManagerLog) << "all altitudes taken from cached data";
     terrainQueryInterface->signalPathHeights((coordinates.count() == altitudes.count()), distanceBetween, finalDistanceBetween, altitudes);
 }
 
@@ -189,7 +192,7 @@ QList<QGeoCoordinate> TerrainTileManager::_pathQueryToCoords(const QGeoCoordinat
         finalDistanceBetween = coordinates[coordinates.count() - 2].distanceTo(coordinates.last());
     }
 
-    qCDebug(TerrainTileManagerLog) << Q_FUNC_INFO << "fromCoord:toCoord:distanceBetween:finalDisanceBetween:coordCount" << fromCoord << toCoord << distanceBetween << finalDistanceBetween << coordinates.count();
+    qCDebug(TerrainTileManagerLog) << "fromCoord:toCoord:distanceBetween:finalDisanceBetween:coordCount" << fromCoord << toCoord << distanceBetween << finalDistanceBetween << coordinates.count();
 
     return coordinates;
 }
diff --git a/src/UI/AppSettings/CMakeLists.txt b/src/UI/AppSettings/CMakeLists.txt
index 496ed81bcee8..84eb16fa66a7 100644
--- a/src/UI/AppSettings/CMakeLists.txt
+++ b/src/UI/AppSettings/CMakeLists.txt
@@ -14,6 +14,7 @@ qt_add_qml_module(AppSettingsModule
         LinkSettings.qml
         LogReplaySettings.qml
         MapSettings.qml
+        NTRIPSettings.qml
         MockLink.qml
         MockLinkSettings.qml
         PlanViewSettings.qml
diff --git a/src/UI/AppSettings/FlyViewSettings.qml b/src/UI/AppSettings/FlyViewSettings.qml
index 84fbfb8f7bb2..819f9a8fe626 100644
--- a/src/UI/AppSettings/FlyViewSettings.qml
+++ b/src/UI/AppSettings/FlyViewSettings.qml
@@ -19,9 +19,6 @@ import QGroundControl.FactControls
 import QGroundControl.Controls
 
 
-
-
-
 SettingsPage {
     property var    _settingsManager:                       QGroundControl.settingsManager
     property var    _flyViewSettings:                       _settingsManager.flyViewSettings
@@ -110,6 +107,13 @@ SettingsPage {
             visible:            _updateHomePosition.visible
             property Fact _updateHomePosition: _flyViewSettings.updateHomePosition
         }
+
+        FactCheckBoxSlider {
+            Layout.fillWidth:   true
+            text:               qsTr("Show Joystick Status in Toolbar")
+            fact:               _flyViewSettings.showJoystickIndicatorInToolbar
+            visible:            fact.visible
+        }
     }
 
     SettingsGroupLayout {
diff --git a/src/UI/AppSettings/GeneralSettings.qml b/src/UI/AppSettings/GeneralSettings.qml
index db2859842fd6..64e62fc1fb60 100644
--- a/src/UI/AppSettings/GeneralSettings.qml
+++ b/src/UI/AppSettings/GeneralSettings.qml
@@ -65,10 +65,9 @@ SettingsPage {
 
         FactCheckBoxSlider {
             Layout.fillWidth: true
-            text:       qsTr("Save application data to SD Card")
-            fact:       _androidSaveToSDCard
-            visible:    _androidSaveToSDCard.visible
-            property Fact _androidSaveToSDCard: _appSettings.androidSaveToSDCard
+            text:       fact.shortDescription
+            fact:       _appSettings.androidDontSaveToSDCard
+            visible:    fact.visible
         }
 
         QGCCheckBoxSlider {
@@ -89,9 +88,9 @@ SettingsPage {
             spacing:            ScreenTools.defaultFontPixelWidth * 2
             visible:            _appFontPointSize.visible
 
-            QGCLabel { 
+            QGCLabel {
                 Layout.fillWidth:   true
-                text:               qsTr("UI Scaling") 
+                text:               qsTr("UI Scaling")
             }
 
             RowLayout {
@@ -137,7 +136,7 @@ SettingsPage {
                 spacing:            0
 
                 QGCLabel { text: qsTr("Application Load/Save Path") }
-                QGCLabel { 
+                QGCLabel {
                     Layout.fillWidth:   true
                     font.pointSize:     ScreenTools.smallFontPointSize
                     text:               _appSavePath.rawValue === "" ? qsTr("<default location>") : _appSavePath.value
@@ -179,7 +178,7 @@ SettingsPage {
         Layout.fillWidth:   true
         heading:            qsTr("Brand Image")
         visible:            _brandImageSettings.visible && !ScreenTools.isMobile
-        
+
         RowLayout {
             Layout.fillWidth:   true
             spacing:            ScreenTools.defaultFontPixelWidth * 2
@@ -189,14 +188,14 @@ SettingsPage {
                 Layout.fillWidth:   true
                 spacing:            0
 
-                QGCLabel { 
+                QGCLabel {
                     Layout.fillWidth:   true
-                    text:               qsTr("Indoor Image") 
+                    text:               qsTr("Indoor Image")
                 }
-                QGCLabel { 
+                QGCLabel {
                     Layout.fillWidth:   true
                     font.pointSize:     ScreenTools.smallFontPointSize
-                    text:               _userBrandImageIndoor.valueString.replace("file:///", "") 
+                    text:               _userBrandImageIndoor.valueString.replace("file:///", "")
                     elide:              Text.ElideMiddle
                     visible:            _userBrandImageIndoor.valueString.length > 0
                 }
@@ -225,14 +224,14 @@ SettingsPage {
                 Layout.fillWidth:   true
                 spacing:            0
 
-                QGCLabel { 
+                QGCLabel {
                     Layout.fillWidth:   true
-                    text:               qsTr("Outdoor Image") 
+                    text:               qsTr("Outdoor Image")
                 }
-                QGCLabel { 
+                QGCLabel {
                     Layout.fillWidth:   true
                     font.pointSize:     ScreenTools.smallFontPointSize
-                    text:               _userBrandImageOutdoor.valueString.replace("file:///", "") 
+                    text:               _userBrandImageOutdoor.valueString.replace("file:///", "")
                     elide:              Text.ElideMiddle
                     visible:            _userBrandImageOutdoor.valueString.length > 0
                 }
diff --git a/src/UI/AppSettings/LinkSettings.qml b/src/UI/AppSettings/LinkSettings.qml
index 40dbf66087fe..0c7da231fbd3 100644
--- a/src/UI/AppSettings/LinkSettings.qml
+++ b/src/UI/AppSettings/LinkSettings.qml
@@ -166,9 +166,9 @@ SettingsPage {
                     QGCMouseArea {
                         fillItem:   parent
                         onClicked:  mainWindow.showMessageDialog(
-                                        qsTr("Delete Link"), 
-                                        qsTr("Are you sure you want to delete '%1'?").arg(object.name), 
-                                        Dialog.Ok | Dialog.Cancel, 
+                                        qsTr("Delete Link"),
+                                        qsTr("Are you sure you want to delete '%1'?").arg(object.name),
+                                        Dialog.Ok | Dialog.Cancel,
                                         function () {
                                             _linkManager.removeConfiguration(object)
                                         })
diff --git a/src/UI/AppSettings/MapSettings.qml b/src/UI/AppSettings/MapSettings.qml
index aef95176ae60..7d14f4cef1f8 100644
--- a/src/UI/AppSettings/MapSettings.qml
+++ b/src/UI/AppSettings/MapSettings.qml
@@ -28,12 +28,13 @@ Item {
     property var    _appSettings:                   _settingsManager.appSettings
     property var    _mapsSettings:                  _settingsManager.mapsSettings
     property var    _mapEngineManager:              QGroundControl.mapEngineManager
-    property bool   _currentlyImportOrExporting:    _mapEngineManager.importAction === QGCMapEngineManager.ActionExporting || _mapEngineManager.importAction === QGCMapEngineManager.ActionImporting
+    property bool   _currentlyImportOrExporting:    _mapEngineManager.importAction === QGCMapEngineManager.ImportAction.ActionExporting || _mapEngineManager.importAction === QGCMapEngineManager.ImportAction.ActionImporting
     property real   _largeTextFieldWidth:           ScreenTools.defaultFontPixelWidth * 30
 
     property Fact   _mapProviderFact:   _settingsManager.flightMapSettings.mapProvider
     property Fact   _mapTypeFact:       _settingsManager.flightMapSettings.mapType
     property Fact   _elevationProviderFact: _settingsManager.flightMapSettings.elevationMapProvider
+    property Fact   _tiandituFac:       _settingsManager ? _settingsManager.appSettings.tiandituToken : null
     property Fact   _mapboxFact:        _settingsManager ? _settingsManager.appSettings.mapboxToken : null
     property Fact   _mapboxAccountFact: _settingsManager ? _settingsManager.appSettings.mapboxAccount : null
     property Fact   _mapboxStyleFact:   _settingsManager ? _settingsManager.appSettings.mapboxStyle : null
@@ -128,7 +129,7 @@ Item {
                 visible:    QGroundControl.corePlugin.options.showOfflineMapImport
                 enabled:    !_currentlyImportOrExporting
                 onClicked: {
-                    _mapEngineManager.importAction = QGCMapEngineManager.ActionNone
+                    _mapEngineManager.importAction = QGCMapEngineManager.ImportAction.ActionNone
                     importDialogComponent.createObject(mainWindow).open()
                 }
             }
@@ -147,7 +148,7 @@ Item {
 
                 QGCLabel {
                     Layout.fillWidth:   true
-                    text:               _mapEngineManager.importAction === QGCMapEngineManager.ActionExporting ? qsTr("Exporting") : qsTr("Importing")
+                    text:               _mapEngineManager.importAction === QGCMapEngineManager.ImportAction.ActionExporting ? qsTr("Exporting") : qsTr("Importing")
                     font.bold:          true
                 }
                 ProgressBar {
@@ -164,6 +165,12 @@ Item {
             heading:            qsTr("Tokens")
             headingDescription: qsTr("Allows access to additional providers")
 
+            LabelledFactTextField {
+                textFieldPreferredWidth:    _largeTextFieldWidth
+                label:                      qsTr("TianDiTu")
+                fact:                       _appSettings.tiandituToken
+            }
+
             LabelledFactTextField {
                 textFieldPreferredWidth:    _largeTextFieldWidth
                 label:                      qsTr("Mapbox")
@@ -181,6 +188,12 @@ Item {
                 label:                      qsTr("VWorld")
                 fact:                       _appSettings.vworldToken
             }
+
+            LabelledFactTextField {
+                textFieldPreferredWidth:    _largeTextFieldWidth
+                label:                      qsTr("OpenAIP")
+                fact:                       _appSettings.openaipToken
+            }
         }
 
         SettingsGroupLayout {
@@ -222,7 +235,7 @@ Item {
 
             LabelledFactTextField {
                 fact: _mapsSettings.maxCacheMemorySize
-            }    
+            }
         }
 
         QGCFileDialog {
diff --git a/src/UI/AppSettings/MockLink.qml b/src/UI/AppSettings/MockLink.qml
index 13171fe492f1..cbdd9820860d 100644
--- a/src/UI/AppSettings/MockLink.qml
+++ b/src/UI/AppSettings/MockLink.qml
@@ -36,7 +36,7 @@ Rectangle {
             anchors.margins:    _margins
             anchors.left:       parent.left
             anchors.top:        parent.top
-            spacing:            ScreenTools.defaultFontPixelHeight
+            spacing:            ScreenTools.defaultFontPixelHeight / 4
 
             QGCCheckBox {
                 id:             sendStatusText
diff --git a/src/UI/AppSettings/NTRIPSettings.qml b/src/UI/AppSettings/NTRIPSettings.qml
new file mode 100644
index 000000000000..60165dc620be
--- /dev/null
+++ b/src/UI/AppSettings/NTRIPSettings.qml
@@ -0,0 +1,127 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QGroundControl
+import QGroundControl.FactControls
+import QGroundControl.Controls
+import QGroundControl.NTRIP 1.0
+
+SettingsPage {
+    property var _settingsManager:   QGroundControl.settingsManager
+    property var _ntrip:             _settingsManager.ntripSettings
+    property Fact _enabled:          _ntrip.ntripServerConnectEnabled
+
+    SettingsGroupLayout {
+        Layout.fillWidth:   true
+        heading:            qsTr("NTRIP / RTK")
+        visible:            _ntrip.visible
+
+        FactCheckBoxSlider {
+            Layout.fillWidth:   true
+            text:               _enabled.shortDescription
+            fact:               _enabled
+            visible:            _enabled.visible
+        }
+    }
+
+    SettingsGroupLayout {
+        Layout.fillWidth:   true
+        visible:            _ntrip.ntripServerHostAddress.visible || _ntrip.ntripServerPort.visible ||
+                            _ntrip.ntripUsername.visible || _ntrip.ntripPassword.visible ||
+                            _ntrip.ntripMountpoint.visible || _ntrip.ntripWhitelist.visible ||
+                            _ntrip.ntripUseSpartn.visible
+        enabled:            _enabled.rawValue
+
+        // Status line
+        QGCLabel {
+            Layout.fillWidth:   true
+            Layout.minimumHeight: 30
+            visible: true
+            text: {
+                try {
+                    return NTRIPManager ? (NTRIPManager.ntripStatus || "Disconnected") : "NTRIP Manager not available"
+                } catch (e) {
+                    return "Disconnected"
+                }
+            }
+            wrapMode: Text.WordWrap
+            color: {
+                try {
+                    if (!NTRIPManager) return qgcPal.text
+                    var status = NTRIPManager.ntripStatus || ""
+                    if (status.toLowerCase().includes("connected")) return qgcPal.colorGreen
+                    if (status.toLowerCase().includes("connecting")) return qgcPal.colorOrange
+                    if (status.toLowerCase().includes("error") || status.toLowerCase().includes("failed")) return qgcPal.colorRed
+                    return qgcPal.text
+                } catch (e) {
+                    return qgcPal.text
+                }
+            }
+        }
+
+        LabelledFactTextField {
+            Layout.fillWidth:   true
+            label:              _ntrip.ntripServerHostAddress.shortDescription
+            fact:               _ntrip.ntripServerHostAddress
+            visible:            _ntrip.ntripServerHostAddress.visible
+            textFieldPreferredWidth: ScreenTools.defaultFontPixelWidth * 60
+        }
+
+        LabelledFactTextField {
+            Layout.fillWidth:   true
+            label:              _ntrip.ntripServerPort.shortDescription
+            fact:               _ntrip.ntripServerPort
+            visible:            _ntrip.ntripServerPort.visible
+            textFieldPreferredWidth: ScreenTools.defaultFontPixelWidth * 20
+        }
+
+        LabelledFactTextField {
+            Layout.fillWidth:   true
+            label:              _ntrip.ntripUsername.shortDescription
+            fact:               _ntrip.ntripUsername
+            visible:            _ntrip.ntripUsername.visible
+            textFieldPreferredWidth: ScreenTools.defaultFontPixelWidth * 60
+        }
+
+        LabelledFactTextField {
+            Layout.fillWidth:   true
+            label:              _ntrip.ntripPassword.shortDescription
+            fact:               _ntrip.ntripPassword
+            visible:            _ntrip.ntripPassword.visible
+            textField.echoMode: TextInput.Password
+            textFieldPreferredWidth: ScreenTools.defaultFontPixelWidth * 60
+        }
+
+        LabelledFactTextField {
+            Layout.fillWidth:   true
+            label:              _ntrip.ntripMountpoint.shortDescription
+            fact:               _ntrip.ntripMountpoint
+            visible:            _ntrip.ntripMountpoint.visible
+            textFieldPreferredWidth: ScreenTools.defaultFontPixelWidth * 40
+        }
+
+        LabelledFactTextField {
+            Layout.fillWidth:   true
+            label:              _ntrip.ntripWhitelist.shortDescription
+            fact:               _ntrip.ntripWhitelist
+            visible:            _ntrip.ntripWhitelist.visible
+            textFieldPreferredWidth: ScreenTools.defaultFontPixelWidth * 40
+        }
+
+        FactCheckBoxSlider {
+            Layout.fillWidth:   true
+            text:               _ntrip.ntripUseSpartn.shortDescription
+            fact:               _ntrip.ntripUseSpartn
+            visible:            _ntrip.ntripUseSpartn.visible
+            enabled:            false
+        }
+    }
+}
diff --git a/src/UI/AppSettings/RemoteIDSettings.qml b/src/UI/AppSettings/RemoteIDSettings.qml
index 14562103bbf1..b4ec5912946d 100644
--- a/src/UI/AppSettings/RemoteIDSettings.qml
+++ b/src/UI/AppSettings/RemoteIDSettings.qml
@@ -60,22 +60,6 @@ SettingsPage {
     property real textFieldWidth:       ScreenTools.defaultFontPixelWidth * 24
     property real textLabelWidth:       ScreenTools.defaultFontPixelWidth * 30
 
-    enum RegionOperation {
-        FAA,
-        EU
-    }
-
-    enum LocationType {
-        TAKEOFF,
-        LIVE,
-        FIXED
-    }
-
-    enum ClassificationType {
-        UNDEFINED,
-        EU
-    }
-
     // GPS properties
     property var    gcsPosition:        QGroundControl.qgcPositionManger.gcsPosition
     property real   gcsHeading:         QGroundControl.qgcPositionManger.gcsHeading
@@ -250,9 +234,9 @@ SettingsPage {
         Connections {
             target: regionFact
             function onRawValueChanged(value) {
-                if (value === RemoteIDSettings.EU) {
+                if (value === RemoteIDSettings.RegionOperation.EU) {
                     sendOperatorIdFact.rawValue = true
-                } else if (value === RemoteIDSettings.FAA) {
+                } else if (value === RemoteIDSettings.RegionOperation.FAA) {
                     locationTypeFact.value = RemoteIDSettings.LocationType.LIVE
                 }
             }
@@ -389,7 +373,7 @@ SettingsPage {
                                 operatorIDTextField.clearValidationError(false /* preventViewSwitch */)
                             }
                         }
-                        
+
                         onTextChanged: {
                             operatorIDFact.value = text
                             if (_activeVehicle) {
@@ -527,7 +511,7 @@ SettingsPage {
                     visible:                    !ScreenTools.isMobile
                                                 && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaPort.visible
                                                 && QGroundControl.settingsManager.autoConnectSettings.autoConnectNmeaBaud.visible
-                                                && _locationType !== RemoteIDIndicatorPage.LocationType.TAKEOFF
+                                                && _locationType !== RemoteIDSettings.LocationType.TAKEOFF
                     anchors.margins:            _margins
                     rowSpacing:                 _margins * 3
                     columns:                    2
diff --git a/src/UI/AppSettings/SerialSettings.qml b/src/UI/AppSettings/SerialSettings.qml
index 05977c7f6942..f972eaa32a43 100644
--- a/src/UI/AppSettings/SerialSettings.qml
+++ b/src/UI/AppSettings/SerialSettings.qml
@@ -116,6 +116,13 @@ ColumnLayout {
             onCheckedChanged:   subEditConfig.flowControl = checked ? 1 : 0
         }
 
+        QGCCheckBox {
+            Layout.columnSpan:  2
+            text:               qsTr("Force DTR Low")
+            checked:            subEditConfig ? subEditConfig.dtrForceLow : false
+            onCheckedChanged:   { if (subEditConfig) subEditConfig.dtrForceLow = checked }
+        }
+
         QGCLabel { text: qsTr("Parity") }
         QGCComboBox {
             Layout.preferredWidth:  _secondColumnWidth
diff --git a/src/UI/AppSettings/SettingsPagesModel.qml b/src/UI/AppSettings/SettingsPagesModel.qml
index 45a8bd15b161..4d1c4f669134 100644
--- a/src/UI/AppSettings/SettingsPagesModel.qml
+++ b/src/UI/AppSettings/SettingsPagesModel.qml
@@ -54,7 +54,15 @@ ListModel {
         iconUrl: "qrc:/InstrumentValueIcons/airplane.svg"
         pageVisible: function() { return true }
     }
-
+    ListElement {
+        name: qsTr("NTRIP/RTK")
+        url: "qrc:/qml/QGroundControl/AppSettings/NTRIPSettings.qml"
+        iconUrl: "qrc:/InstrumentValueIcons/globe.svg"
+        pageVisible: function() {
+            return QGroundControl.settingsManager &&
+                   QGroundControl.settingsManager.ntripSettings !== undefined
+        }
+    }
     ListElement {
         name: qsTr("Comm Links")
         url: "qrc:/qml/QGroundControl/AppSettings/LinkSettings.qml"
@@ -73,10 +81,10 @@ ListModel {
         name: qsTr("PX4 Log Transfer")
         url: "qrc:/qml/QGroundControl/AppSettings/PX4LogTransferSettings.qml"
         iconUrl: "qrc:/InstrumentValueIcons/inbox-download.svg"
-        pageVisible: function() { 
+        pageVisible: function() {
             var activeVehicle = QGroundControl.multiVehicleManager.activeVehicle
-            return QGroundControl.corePlugin.options.showPX4LogTransferOptions && 
-                        QGroundControl.px4ProFirmwareSupported && 
+            return QGroundControl.corePlugin.options.showPX4LogTransferOptions &&
+                        QGroundControl.px4ProFirmwareSupported &&
                         (activeVehicle ? activeVehicle.px4Firmware : true)
         }
     }
@@ -89,8 +97,8 @@ ListModel {
     }
 
     ListElement {
-        name: qsTr("Console")
-        url: "qrc:/qml/QGroundControl/Controls/AppMessages.qml"
+        name: qsTr("Logging")
+        url: "qrc:/qml/QGroundControl/Controls/AppLogging.qml"
         iconUrl: "qrc:/InstrumentValueIcons/conversation.svg"
         pageVisible: function() { return true }
     }
@@ -123,4 +131,3 @@ ListModel {
         pageVisible: function() { return ScreenTools.isDebug }
     }
 }
-
diff --git a/src/UI/AppSettings/TcpSettings.qml b/src/UI/AppSettings/TcpSettings.qml
index 44d323fca391..9ea101f046c5 100644
--- a/src/UI/AppSettings/TcpSettings.qml
+++ b/src/UI/AppSettings/TcpSettings.qml
@@ -14,15 +14,13 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
 GridLayout {
     columns:        2
     rowSpacing:     _rowSpacing
     columnSpacing:  _colSpacing
 
     function saveSettings() {
-        subEditConfig.host = hostField.text
+        subEditConfig.host = hostField.text.trim()
         subEditConfig.port = parseInt(portField.text)
     }
 
@@ -31,6 +29,14 @@ GridLayout {
         id:                     hostField
         Layout.preferredWidth:  _secondColumnWidth
         text:                   subEditConfig.host
+        placeholderText:        qsTr("localhost or 192.168.1.1")
+
+        // Allow IPv4, IPv6, hostnames, and domain names
+        // This is permissive - actual validation happens at connection time
+        validator: RegularExpressionValidator {
+            // Allow alphanumeric, dots, colons, hyphens, and brackets (for IPv6)
+            regularExpression: /^[a-zA-Z0-9\.\-:\[\]]+$/
+        }
     }
 
     QGCLabel { text: qsTr("Port") }
@@ -39,5 +45,22 @@ GridLayout {
         Layout.preferredWidth:  _secondColumnWidth
         text:                   subEditConfig.port.toString()
         inputMethodHints:       Qt.ImhFormattedNumbersOnly
+        placeholderText:        qsTr("5760")
+
+        validator: IntValidator {
+            bottom: 1
+            top: 65535
+        }
+    }
+
+    // Help text
+    QGCLabel {
+        Layout.columnSpan:      2
+        Layout.preferredWidth:  _secondColumnWidth
+        Layout.fillWidth:       true
+        font.pointSize:         ScreenTools.smallFontPointSize
+        wrapMode:               Text.WordWrap
+        text:                   qsTr("You can enter an IP address (e.g. 192.168.1.1) or hostname (e.g. my-drone.local)")
+        color:                  qgcPal.text
     }
 }
diff --git a/src/UI/AppSettings/VideoSettings.qml b/src/UI/AppSettings/VideoSettings.qml
index b9f548f37450..cf8f8843ce7a 100644
--- a/src/UI/AppSettings/VideoSettings.qml
+++ b/src/UI/AppSettings/VideoSettings.qml
@@ -108,7 +108,7 @@ SettingsPage {
 
         LabelledFactComboBox {
             Layout.fillWidth:   true
-            label:              qsTr("Video decode priority")
+            label:              fact.shortDescription
             fact:               _videoSettings.forceVideoDecoder
             visible:            fact.visible
             indexModel:         false
diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
index 91154de29ac2..f4259d24f4a6 100644
--- a/src/UI/CMakeLists.txt
+++ b/src/UI/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# UI Module
+# Main application user interface components
+# ============================================================================
+
 add_subdirectory(AppSettings)
 add_subdirectory(FirstRunPromptDialogs)
 add_subdirectory(toolbar)
diff --git a/src/UI/MainWindow.qml b/src/UI/MainWindow.qml
index ea5a9e9c5eee..29b099a76ec4 100644
--- a/src/UI/MainWindow.qml
+++ b/src/UI/MainWindow.qml
@@ -14,18 +14,18 @@ import QtQuick.Layouts
 import QtQuick.Window
 
 import QGroundControl
-
 import QGroundControl.Controls
 import QGroundControl.FactControls
-
 import QGroundControl.FlightDisplay
 import QGroundControl.FlightMap
 
 /// @brief Native QML top level window
 /// All properties defined here are visible to all QML pages.
 ApplicationWindow {
-    id:             mainWindow
-    visible:        true
+    id:         mainWindow
+    visible:    true
+    // The special casing for android prevents white bars from showing up on the edges of the screen with newer android versions
+    flags:      Qt.Window | (ScreenTools.isAndroid ? Qt.ExpandedClientAreaHint | Qt.NoTitleBarBackgroundHint : 0)
 
     property bool   _utmspSendActTrigger
 
@@ -81,7 +81,7 @@ ApplicationWindow {
         readonly property var       guidedControllerFlyView:        flyView.guidedController
 
         // Number of QGCTextField's with validation errors. Used to prevent closing panels with validation errors.
-        property int                validationErrorCount:           0 
+        property int                validationErrorCount:           0
 
         // Property to manage RemoteID quick access to settings page
         property bool               commingFromRIDIndicator:        false
@@ -260,7 +260,7 @@ ApplicationWindow {
         color:          QGroundControl.globalPalette.window
     }
 
-    FlyView { 
+    FlyView {
         id:                     flyView
         anchors.fill:           parent
     }
@@ -324,132 +324,134 @@ ApplicationWindow {
 
             contentComponent: Component {
                 ColumnLayout {
-                    width:  innerLayout.width + (toolSelectDialog._margins * 2)
-                    height: innerLayout.height + (toolSelectDialog._margins * 2)
-
-                    ColumnLayout {
-                        id:             innerLayout
-                        Layout.margins: toolSelectDialog._margins
-                        spacing:        ScreenTools.defaultFontPixelWidth
-
-                        SubMenuButton {
-                            height:             toolSelectDialog._toolButtonHeight
-                            Layout.fillWidth:   true
-                            text:               qsTr("Plan Flight")
-                            imageResource:      "/qmlimages/Plan.svg"
-                            onClicked: {
-                                if (mainWindow.allowViewSwitch()) {
-                                    mainWindow.closeIndicatorDrawer()
-                                    mainWindow.showPlanView()
-                                }
+                    spacing: ScreenTools.defaultFontPixelWidth
+
+                    SubMenuButton {
+                        height:             toolSelectDialog._toolButtonHeight
+                        Layout.fillWidth:   true
+                        text:               qsTr("Plan Flight")
+                        imageResource:      "/qmlimages/Plan.svg"
+                        onClicked: {
+                            if (mainWindow.allowViewSwitch()) {
+                                mainWindow.closeIndicatorDrawer()
+                                mainWindow.showPlanView()
                             }
                         }
+                    }
 
-                        SubMenuButton {
-                            id:                 analyzeButton
-                            height:             toolSelectDialog._toolButtonHeight
-                            Layout.fillWidth:   true
-                            text:               qsTr("Analyze Tools")
-                            imageResource:      "/qmlimages/Analyze.svg"
-                            visible:            QGroundControl.corePlugin.showAdvancedUI
-                            onClicked: {
-                                if (mainWindow.allowViewSwitch()) {
-                                    mainWindow.closeIndicatorDrawer()
-                                    mainWindow.showAnalyzeTool()
-                                }
+                    SubMenuButton {
+                        id:                 analyzeButton
+                        height:             toolSelectDialog._toolButtonHeight
+                        Layout.fillWidth:   true
+                        text:               qsTr("Analyze Tools")
+                        imageResource:      "/qmlimages/Analyze.svg"
+                        visible:            QGroundControl.corePlugin.showAdvancedUI
+                        onClicked: {
+                            if (mainWindow.allowViewSwitch()) {
+                                mainWindow.closeIndicatorDrawer()
+                                mainWindow.showAnalyzeTool()
                             }
                         }
+                    }
 
-                        SubMenuButton {
-                            id:                 setupButton
-                            height:             toolSelectDialog._toolButtonHeight
-                            Layout.fillWidth:   true
-                            text:               qsTr("Vehicle Configuration")
-                            imageResource:      "/qmlimages/Gears.svg"
-                            onClicked: {
-                                if (mainWindow.allowViewSwitch()) {
-                                    mainWindow.closeIndicatorDrawer()
-                                    mainWindow.showVehicleConfig()
-                                }
+                    SubMenuButton {
+                        id:                 setupButton
+                        height:             toolSelectDialog._toolButtonHeight
+                        Layout.fillWidth:   true
+                        text:               qsTr("Vehicle Configuration")
+                        imageResource:      "/qmlimages/Gears.svg"
+                        onClicked: {
+                            if (mainWindow.allowViewSwitch()) {
+                                mainWindow.closeIndicatorDrawer()
+                                mainWindow.showVehicleConfig()
                             }
                         }
+                    }
 
-                        SubMenuButton {
-                            id:                 settingsButton
-                            height:             toolSelectDialog._toolButtonHeight
-                            Layout.fillWidth:   true
-                            text:               qsTr("Application Settings")
-                            imageResource:      "/res/QGCLogoFull.svg"
-                            imageColor:         "transparent"
-                            visible:            !QGroundControl.corePlugin.options.combineSettingsAndSetup
-                            onClicked: {
-                                if (mainWindow.allowViewSwitch()) {
-                                    drawer.close()
-                                    mainWindow.showSettingsTool()
-                                }
+                    SubMenuButton {
+                        id:                 settingsButton
+                        height:             toolSelectDialog._toolButtonHeight
+                        Layout.fillWidth:   true
+                        text:               qsTr("Application Settings")
+                        imageResource:      "/res/QGCLogoFull.svg"
+                        imageColor:         "transparent"
+                        visible:            !QGroundControl.corePlugin.options.combineSettingsAndSetup
+                        onClicked: {
+                            if (mainWindow.allowViewSwitch()) {
+                                drawer.close()
+                                mainWindow.showSettingsTool()
                             }
                         }
+                    }
 
-                        SubMenuButton {
-                            id:                 closeButton
-                            height:             toolSelectDialog._toolButtonHeight
-                            Layout.fillWidth:   true
-                            text:               qsTr("Close %1").arg(QGroundControl.appName)
-                            imageResource:      "/res/cancel.svg"
-                            visible:            mainWindow.visibility === Window.FullScreen
-                            onClicked: {
-                                if (mainWindow.allowViewSwitch()) {
-                                    mainWindow.finishCloseProcess()
-                                }
+                    SubMenuButton {
+                        id:                 closeButton
+                        height:             toolSelectDialog._toolButtonHeight
+                        Layout.fillWidth:   true
+                        text:               qsTr("Close %1").arg(QGroundControl.appName)
+                        imageResource:      "/res/cancel.svg"
+                        visible:            mainWindow.visibility === Window.FullScreen
+                        onClicked: {
+                            if (mainWindow.allowViewSwitch()) {
+                                mainWindow.finishCloseProcess()
                             }
                         }
+                    }
+
+                    ColumnLayout {
+                        id:                     versionColumnLayout
+                        Layout.preferredWidth:  parent.width
+                        spacing:                0
+                        Layout.alignment:       Qt.AlignHCenter
+
+                        QGCLabel {
+                            id:                     versionLabel
+                            text:                   qsTr("%1 Version").arg(QGroundControl.appName)
+                            font.pointSize:         ScreenTools.smallFontPointSize
+                            wrapMode:               QGCLabel.WordWrap
+                            Layout.maximumWidth:    parent.width
+                            Layout.alignment:       Qt.AlignHCenter
+                        }
 
-                        ColumnLayout {
-                            width:                  innerLayout.width
-                            spacing:                0
+                        QGCLabel {
+                            text:                   QGroundControl.qgcVersion
+                            font.pointSize:         ScreenTools.smallFontPointSize
+                            wrapMode:               QGCLabel.WrapAnywhere
+                            Layout.maximumWidth:    parent.width
                             Layout.alignment:       Qt.AlignHCenter
+                        }
 
-                            QGCLabel {
-                                id:                     versionLabel
-                                text:                   qsTr("%1 Version").arg(QGroundControl.appName)
-                                font.pointSize:         ScreenTools.smallFontPointSize
-                                wrapMode:               QGCLabel.WordWrap
-                                Layout.maximumWidth:    parent.width
-                                Layout.alignment:       Qt.AlignHCenter
-                            }
+                        QGCLabel {
+                            text:                   QGroundControl.qgcAppDate
+                            font.pointSize:         ScreenTools.smallFontPointSize
+                            wrapMode:               QGCLabel.WrapAnywhere
+                            Layout.maximumWidth:    parent.width
+                            Layout.alignment:       Qt.AlignHCenter
+                            visible:                QGroundControl.qgcDailyBuild
 
-                            QGCLabel {
-                                text:                   QGroundControl.qgcVersion
-                                font.pointSize:         ScreenTools.smallFontPointSize
-                                wrapMode:               QGCLabel.WrapAnywhere
-                                Layout.maximumWidth:    parent.width
-                                Layout.alignment:       Qt.AlignHCenter
-
-                                QGCMouseArea {
-                                    id:                 easterEggMouseArea
-                                    anchors.topMargin:  -versionLabel.height
-                                    anchors.fill:       parent
-
-                                    onClicked: (mouse) => {
-                                        if (mouse.modifiers & Qt.ControlModifier) {
-                                            QGroundControl.corePlugin.showTouchAreas = !QGroundControl.corePlugin.showTouchAreas
-                                            showTouchAreasNotification.open()
-                                        } else if (ScreenTools.isMobile || mouse.modifiers & Qt.ShiftModifier) {
-                                            mainWindow.closeIndicatorDrawer()
-                                            if(!QGroundControl.corePlugin.showAdvancedUI) {
-                                                advancedModeOnConfirmation.open()
-                                            } else {
-                                                advancedModeOffConfirmation.open()
-                                            }
-                                        }
-                                    }
+                            QGCMouseArea {
+                                anchors.topMargin:  -(parent.y - versionLabel.y)
+                                anchors.fill:       parent
 
-                                    // This allows you to change this on mobile
-                                    onPressAndHold: {
+                                onClicked: (mouse) => {
+                                    if (mouse.modifiers & Qt.ControlModifier) {
                                         QGroundControl.corePlugin.showTouchAreas = !QGroundControl.corePlugin.showTouchAreas
                                         showTouchAreasNotification.open()
+                                    } else if (ScreenTools.isMobile || mouse.modifiers & Qt.ShiftModifier) {
+                                        mainWindow.closeIndicatorDrawer()
+                                        if(!QGroundControl.corePlugin.showAdvancedUI) {
+                                            advancedModeOnConfirmation.open()
+                                        } else {
+                                            advancedModeOffConfirmation.open()
+                                        }
                                     }
                                 }
+
+                                // This allows you to change this on mobile
+                                onPressAndHold: {
+                                    QGroundControl.corePlugin.showTouchAreas = !QGroundControl.corePlugin.showTouchAreas
+                                    showTouchAreasNotification.open()
+                                }
                             }
                         }
                     }
@@ -475,6 +477,11 @@ ApplicationWindow {
             }
         }
 
+        // This need to block click event leakage to underlying map.
+        DeadMouseArea {
+            anchors.fill: parent
+        }
+
         Rectangle {
             id:             toolDrawerToolbar
             anchors.left:   parent.left
@@ -708,7 +715,7 @@ ApplicationWindow {
                     anchors.centerIn:   parent
                     text:               ">"
                     color:              QGroundControl.globalPalette.buttonText
-                }  
+                }
 
                 QGCMouseArea {
                     fillItem: parent
diff --git a/src/UI/toolbar/APMBatteryIndicator.qml b/src/UI/toolbar/APMBatteryIndicator.qml
deleted file mode 100644
index a04801de2533..000000000000
--- a/src/UI/toolbar/APMBatteryIndicator.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-import QtQuick
-import QtQuick.Layouts
-
-import QGroundControl
-import QGroundControl.Controls
-
-
-
-
-import QGroundControl.FactControls
-
-BatteryIndicator {
-    waitForParameters: true
-
-    expandedPageComponent: Component {
-        ColumnLayout {
-            FactPanelController { id: controller }
-
-            property Fact batt1Monitor: controller.getParameterFact(-1, "BATT_MONITOR")
-            property string disabledString: qsTr("- disabled")
-
-            SettingsGroupLayout {
-                Layout.fillWidth:   true
-                heading:            qsTr("Low Voltage Failsafe")
-                visible:            batt1Monitor.rawValue !== 0
-
-                LabelledFactComboBox {
-                    label:              qsTr("Vehicle Action")
-                    fact:               controller.getParameterFact(-1, "BATT_FS_LOW_ACT")
-                    indexModel:         false
-                }
-
-                FactSlider {
-                    Layout.fillWidth:   true
-                    label:              qsTr("Voltage Trigger") + (value == 0 ? disabledString : "")
-                    fact:               controller.getParameterFact(-1, "BATT_LOW_VOLT")
-                    from:               0
-                    to:                 100
-                    majorTickStepSize:  5
-                }
-
-                FactSlider {
-                    Layout.fillWidth:   true
-                    label:              qsTr("mAh Trigger") + (value == 0 ? disabledString : "")
-                    fact:               controller.getParameterFact(-1, "BATT_LOW_MAH")
-                    from:               0
-                    to:                 30000
-                    majorTickStepSize:  1000
-                }
-            }
-
-            SettingsGroupLayout {
-                Layout.fillWidth:   true
-                heading:            qsTr("Critical Voltage Failsafe")
-                visible:            batt1Monitor.rawValue !== 0
-
-                LabelledFactComboBox {
-                    label:              qsTr("Vehicle Action")
-                    fact:               controller.getParameterFact(-1, "BATT_FS_CRT_ACT")
-                    indexModel:         false
-                }
-
-                FactSlider {
-                    Layout.fillWidth:   true
-                    label:              qsTr("Voltage Trigger") + (value == 0 ? disabledString : "")
-                    fact:               controller.getParameterFact(-1, "BATT_CRT_VOLT")
-                    from:               0
-                    to:                 100
-                    majorTickStepSize:  5
-                }
-
-                FactSlider {
-                    Layout.fillWidth:   true
-                    label:              qsTr("mAh Trigger") + (value == 0 ? disabledString : "")
-                    fact:               controller.getParameterFact(-1, "BATT_CRT_MAH")
-                    from:               0
-                    to:                 30000
-                    majorTickStepSize:  1000
-                }
-            }
-        }
-    }
-}
diff --git a/src/UI/toolbar/APMFlightModeIndicator.qml b/src/UI/toolbar/APMFlightModeIndicator.qml
deleted file mode 100644
index bd5d62e42451..000000000000
--- a/src/UI/toolbar/APMFlightModeIndicator.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2022 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import QGroundControl
-import QGroundControl.Controls
-
-
-
-
-import QGroundControl.FactControls
-
-FlightModeIndicator {
-    waitForParameters:      true
-    expandedPageComponent:  activeVehicle.multiRotor ? copterComponent : undefined
-
-    property var  activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
-
-    Component {
-        id: copterComponent
-
-        SettingsGroupLayout {
-            Layout.fillWidth:   true
-            heading:            qsTr("Return to Launch")
-
-            property Fact rtlAltFact: controller.getParameterFact(-1, "RTL_ALT")
-
-            FactPanelController { id: controller }
-
-            RowLayout {
-                Layout.fillWidth:   true
-                spacing:            ScreenTools.defaultFontPixelWidth * 2
-
-                QGCLabel {
-                    id:                 label  
-                    Layout.fillWidth:   true
-                    text:               qsTr("Return At")
-                }
-
-                QGCComboBox {
-                    id:             returnAtCombo
-                    sizeToContents: true
-                    model:          [ qsTr("Current alttiude"), qsTr("Specified altitude") ]
-
-                    function setCurrentIndex() {
-                        if (rtlAltFact.value === 0) {
-                            returnAtCombo.currentIndex = 0
-                        } else {
-                            returnAtCombo.currentIndex = 1
-                        }
-                    }
-
-                    Component.onCompleted: setCurrentIndex()
-
-                    onActivated: (index) => {
-                        if (index === 0) {
-                            rtlAltFact.rawValue = 0
-                        } else {
-                            rtlAltFact.rawValue = 1500
-                        }
-                    }
-
-                    Connections {
-                        target:             rtlAltFact
-                        onRawValueChanged:  returnAtCombo.setCurrentIndex()
-                    }
-                }
-
-                FactTextField {
-                    fact:       rtlAltFact
-                    enabled:    rtlAltFact.rawValue !== 0
-                }
-            }
-        }
-    }
-}
diff --git a/src/UI/toolbar/CMakeLists.txt b/src/UI/toolbar/CMakeLists.txt
index 3397c482d344..985812093efd 100644
--- a/src/UI/toolbar/CMakeLists.txt
+++ b/src/UI/toolbar/CMakeLists.txt
@@ -5,17 +5,12 @@ qt_add_qml_module(ToolbarModule
     VERSION 1.0
     RESOURCE_PREFIX /qml
     QML_FILES
-        APMBatteryIndicator.qml
-        APMFlightModeIndicator.qml
-        APMMainStatusIndicatorContentItem.qml
-        APMSupportForwardingIndicator.qml
         ArmedIndicator.qml
         EscIndicator.qml
         EscIndicatorPage.qml
         GCSControlIndicator.qml
         GimbalIndicator.qml
         JoystickIndicator.qml
-        LinkIndicator.qml
         ModeIndicator.qml
         MultiVehicleSelector.qml
         RCRSSIIndicator.qml
diff --git a/src/UI/toolbar/EscIndicator.qml b/src/UI/toolbar/EscIndicator.qml
index a049d8683981..07240f0de29a 100644
--- a/src/UI/toolbar/EscIndicator.qml
+++ b/src/UI/toolbar/EscIndicator.qml
@@ -12,7 +12,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-import QGroundControl.ScreenTools
 
 Item {
     id:             control
@@ -67,6 +66,8 @@ Item {
         return _escHealthy ? qgcPal.colorGreen : qgcPal.colorRed
     }
 
+    QGCPalette { id: qgcPal }
+
     Row {
         id:             escIndicatorRow
         anchors.top:    parent.top
@@ -81,7 +82,7 @@ Item {
             source:             "/qmlimages/EscIndicator.svg"
             fillMode:           Image.PreserveAspectFit
             sourceSize.height:  height
-            color:              qgcPal.buttonText
+            color:              qgcPal.windowTransparentText
         }
 
         Column {
@@ -91,7 +92,7 @@ Item {
 
             QGCLabel {
                 anchors.horizontalCenter:   parent.horizontalCenter
-                color:                      qgcPal.buttonText
+                color:                      qgcPal.windowTransparentText
                 text:                       _onlineMotorCount.toString()
                 font.pointSize:             ScreenTools.smallFontPointSize
             }
diff --git a/src/UI/toolbar/EscIndicatorPage.qml b/src/UI/toolbar/EscIndicatorPage.qml
index d498ab5d7c75..75e35a81e327 100644
--- a/src/UI/toolbar/EscIndicatorPage.qml
+++ b/src/UI/toolbar/EscIndicatorPage.qml
@@ -12,7 +12,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-import QGroundControl.ScreenTools
 import QGroundControl.FactControls
 
 ToolIndicatorPage {
@@ -21,7 +20,7 @@ ToolIndicatorPage {
 
     property var    activeVehicle:  QGroundControl.multiVehicleManager.activeVehicle
     property string na:             qsTr("N/A", "No data to display")
-    property string valueNA:        qsTr("--.--", "No data to display")
+    property string valueNA:        qsTr("--", "No data to display")
 
     property var    _escs:          activeVehicle ? activeVehicle.escs : null
     property int    _onlineBitmask: _escs ? _escs.get(0).info.rawValue : 0
diff --git a/src/UI/toolbar/GCSControlIndicator.qml b/src/UI/toolbar/GCSControlIndicator.qml
index 01e8658fe191..bc2414b9d04a 100644
--- a/src/UI/toolbar/GCSControlIndicator.qml
+++ b/src/UI/toolbar/GCSControlIndicator.qml
@@ -32,9 +32,9 @@ Item {
     property var    separatorHeight:                        buttonHeight * 0.9
     property var    settingsPanelVisible:                   false
     property bool   outdoorPalette:                         qgcPal.globalTheme === QGCPalette.Light
-    
+
     // Used by control request popup, when other GCS ask us for control
-    property var    receivedRequestTimeoutMs:               QGroundControl.settingsManager.flyViewSettings.requestControlTimeout.defaultValue // Use this as default in case something goes wrong. Usually it will be overriden on onRequestOperatorControlReceived 
+    property var    receivedRequestTimeoutMs:               QGroundControl.settingsManager.flyViewSettings.requestControlTimeout.defaultValue // Use this as default in case something goes wrong. Usually it will be overriden on onRequestOperatorControlReceived
     property var    requestSysIdRequestingControl:          0
     property var    requestAllowTakeover:                   false
 
@@ -75,7 +75,7 @@ Item {
         opacity:            0.0
 
         function doOpacityAnimation() { opacityAnimation.restart() }
-        SequentialAnimation on opacity { 
+        SequentialAnimation on opacity {
             id:         opacityAnimation
             running:    false
             loops:      1
@@ -149,13 +149,13 @@ Item {
         }
     }
 
-    // Allow takeover expiration time popup. When a request is received and takeover was allowed, this popup alerts 
+    // Allow takeover expiration time popup. When a request is received and takeover was allowed, this popup alerts
     // that after vehicle::REQUEST_OPERATOR_CONTROL_ALLOW_TAKEOVER_TIMEOUT_MSECS seconds, this GCS will change back to takeover not allowed, as per mavlink specs
     Component {
         id: allowTakeoverExpirationPopup
 
             ToolIndicatorPage {
-            // Allow takeover expiration time popup. When a request is received and takeover was allowed, this popup alerts 
+            // Allow takeover expiration time popup. When a request is received and takeover was allowed, this popup alerts
             // that after vehicle::REQUEST_OPERATOR_CONTROL_ALLOW_TAKEOVER_TIMEOUT_MSECS seconds, this GCS will change back to takeover not allowed, as per mavlink specs
             TimedProgressTracker {
                 id:                     revertTakeoverProgressTracker
@@ -184,8 +184,8 @@ Item {
                 // Action label
                 QGCLabel {
                     font.pointSize:         ScreenTools.defaultFontPointSize * 1.1
-                    text:                   qsTr("Reverting back to takeover not allowed if GCS ") + requestSysIdRequestingControl + 
-                                            qsTr(" doesn't take control in ") + revertTakeoverProgressTracker.progressLabel + 
+                    text:                   qsTr("Reverting back to takeover not allowed if GCS ") + requestSysIdRequestingControl +
+                                            qsTr(" doesn't take control in ") + revertTakeoverProgressTracker.progressLabel +
                                             qsTr(" seconds ...")
                 }
                 QGCButton {
@@ -248,7 +248,7 @@ Item {
                 }
                 QGCLabel {
                     text:                   gcsControlStatusFlags_TakeoverAllowed ? qsTr("Takeover allowed") : qsTr("Takeover NOT allowed")
-                    Layout.columnSpan:      2         
+                    Layout.columnSpan:      2
                     Layout.alignment:       Qt.AlignRight
                     Layout.fillWidth:       true
                     horizontalAlignment:    Text.AlignRight
diff --git a/src/UI/toolbar/GimbalIndicator.qml b/src/UI/toolbar/GimbalIndicator.qml
index b4ec56bfbb9a..562b121b63d3 100644
--- a/src/UI/toolbar/GimbalIndicator.qml
+++ b/src/UI/toolbar/GimbalIndicator.qml
@@ -14,23 +14,23 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
 import QGroundControl.FactControls
 
 Item {
     id:             control
-    width:          gimbalIndicatorIcon.width * 1.1 + gimbalTelemetryLayout.childrenRect.width + margins
     anchors.top:    parent.top
     anchors.bottom: parent.bottom
+    width:          gimbalIndicatorRow.width
+
+    property bool   showIndicator:              gimbalController.gimbals.count
 
     property var    activeVehicle:              QGroundControl.multiVehicleManager.activeVehicle
     property var    gimbalController:           activeVehicle.gimbalController
-    property bool   showIndicator:              gimbalController && gimbalController.gimbals.count
+    property var    gimbals:                    gimbalController.gimbals
     property var    activeGimbal:               gimbalController.activeGimbal
     property var    multiGimbalSetup:           gimbalController.gimbals.count > 1
     property bool   joystickButtonsAvailable:   activeVehicle.joystickEnabled
+    property bool   showAzimuth:                QGroundControl.settingsManager.gimbalControllerSettings.toolbarIndicatorShowAzimuth.rawValue
 
     property var    margins:                    ScreenTools.defaultFontPixelWidth
     property var    panelRadius:                ScreenTools.defaultFontPixelWidth * 0.5
@@ -39,373 +39,266 @@ Item {
     property var    separatorHeight:            buttonHeight * 0.9
     property var    settingsPanelVisible:       false
 
-    // Popup panel, appears when clicking top toolbar gimbal indicator
+    property var _gimbalControllerSettings: QGroundControl.settingsManager.gimbalControllerSettings
+
+    QGCPalette { id: qgcPal }
+
+    Row {
+        id:             gimbalIndicatorRow
+        anchors.top:    parent.top
+        anchors.bottom: parent.bottom
+        spacing:        ScreenTools.defaultFontPixelWidth / 2
+
+        Column {
+            anchors.top:    parent.top
+            anchors.bottom: parent.bottom
+            spacing:        0
+
+            QGCColoredImage {
+                id:                      gimbalIndicatorIcon
+                anchors.horizontalCenter: parent.horizontalCenter
+                width:                   height
+                height:                  multiGimbalSetup ? parent.height - gimbalIdLabel.contentHeight : parent.height
+                source:                  "/gimbal/payload.png"
+                fillMode:                Image.PreserveAspectFit
+                sourceSize.height:       height
+                color:                   qgcPal.windowTransparentText
+
+            }
+
+            QGCLabel {
+                id:                     gimbalIdLabel
+                anchors.horizontalCenter: parent.horizontalCenter
+                font.pointSize:         ScreenTools.smallFontPointSize
+                text:                   activeGimbal ? activeGimbal.deviceId.rawValue : ""
+                color:                  qgcPal.windowTransparentText
+                visible:                multiGimbalSetup
+            }
+        }
+
+        // Telemetry and status indicator
+        GridLayout {
+            anchors.verticalCenter:  parent.verticalCenter
+            columns:        2
+            rows:           2
+            rowSpacing:     0
+            columnSpacing:  margins / 2
+
+            QGCLabel {
+                id:                     statusLabel
+                font.pointSize:         ScreenTools.smallFontPointSize
+                text:                   activeGimbal && activeGimbal.retracted ?
+                                            qsTr("Retracted") :
+                                            (activeGimbal && activeGimbal.yawLock ? qsTr("Yaw locked") : qsTr("Yaw follow"))
+                color:                  qgcPal.windowTransparentText
+                Layout.columnSpan:      2
+                Layout.alignment:       Qt.AlignHCenter
+            }
+            QGCLabel {
+                id:             pitchLabel
+                font.pointSize: ScreenTools.smallFontPointSize
+                text:           activeGimbal ? qsTr("P: ") + activeGimbal.absolutePitch.valueString : ""
+                color:          qgcPal.windowTransparentText
+            }
+            QGCLabel {
+                id:             panLabel
+                font.pointSize: ScreenTools.smallFontPointSize
+                text:           activeGimbal ?
+                                    (showAzimuth ?
+                                        (qsTr("Az: ") + activeGimbal.absoluteYaw.valueString) :
+                                        (qsTr("Y: ") + activeGimbal.bodyYaw.valueString)) :
+                                    ""
+                color:          qgcPal.windowTransparentText
+            }
+        }
+    }
+
+    MouseArea {
+        anchors.fill:   parent
+        onClicked:      mainWindow.showIndicatorDrawer(gimbalPopup, control)
+    }
+
     Component {
-        id: gimbalControlsPage
+        id: gimbalPopup
 
         ToolIndicatorPage {
-            contentComponent: GridLayout {
-                // Label indicating the purpose of the panel and active gimbal instance
-                QGCLabel {
-                    text:                   qsTr("Gimbal ") + 
-                                                (multiGimbalSetup ? activeGimbal.deviceId.rawValue : "") + 
-                                                    qsTr("<br> Controls")
-
-                    font.pointSize:         ScreenTools.smallFontPointSize
-                    Layout.preferredWidth:  buttonHeight * 1.1
-                    font.weight:            Font.DemiBold
-                }
+            showExpand:         true
+            waitForParameters:  false
+            contentComponent:   gimbalContentComponent
+            expandedComponent:  gimbalExpandedComponent
+        }
+    }
+
+    Component {
+        id: gimbalContentComponent
 
-                // These are simple buttons that can be grouped on this Repeater
-                Repeater {
-                    id: simpleGimbalButtonsRepeater
-                    property var hasControl:              gimbalController && gimbalController.activeGimbal && gimbalController.activeGimbal.gimbalHaveControl
-                    property var acqControlButtonEnabled: QGroundControl.settingsManager.gimbalControllerSettings.toolbarIndicatorShowAcquireReleaseControl.rawValue
-
-                    model: [
-                        {id: "yawLock",   text: activeGimbal.yawLock ? qsTr("Yaw <br> Follow") : qsTr("Yaw <br> Lock")  , visible: true                    },
-                        {id: "center",    text: qsTr("Center")                                                          , visible: true                    },
-                        {id: "tilt90",    text: qsTr("Tilt 90")                                                         , visible: true                    },
-                        {id: "pointHome", text: qsTr("Point <br> Home")                                                 , visible: true                    },
-                        {id: "retract",   text: qsTr("Retract")                                                         , visible: true                    },
-                        {id: "acqControl",text: hasControl ? qsTr("Release <br> Control") : qsTr("Acquire <br> Control"), visible: acqControlButtonEnabled }
-                    ]
-
-                    QGCButton {
-                        property var callbackList: [
-                           {"yawLock":      function(){ gimbalController.toggleGimbalYawLock(!activeGimbal.yawLock) }   },
-                           {"center":       function(){ gimbalController.centerGimbal() }                               },
-                           {"tilt90":       function(){ gimbalController.sendPitchBodyYaw(-90, 0) }                     },
-                           {"pointHome":    function(){ activeVehicle.guidedModeROI(activeVehicle.homePosition) }       },
-                           {"retract":      function(){ gimbalController.toggleGimbalRetracted(true) }                  },
-                           // This button changes its action depending on gimbal being under control or not
-                           {"acqControl":   function(){ simpleGimbalButtonsRepeater.hasControl ? 
-                                                            gimbalController.releaseGimbalControl() : 
-                                                                gimbalController.acquireGimbalControl() }               }
-                        ]
-
-                        Layout.preferredWidth: Layout.preferredHeight
-                        Layout.preferredHeight: buttonHeight
-                        Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                        text: modelData.text
-                        fontWeight: Font.DemiBold
-                        visible: modelData.visible
-                        pointSize: ScreenTools.smallFontPointSize
-                        backRadius: panelRadius * 0.5
-                        leftPadding: squareButtonPadding
-                        rightPadding: squareButtonPadding
-                        onClicked: {
-                            var callback = callbackList.find(function(item) {
-                                return item.hasOwnProperty(modelData.id);
-                            });
-                            if (callback !== undefined) {
-                                callback[modelData.id]();
+        ColumnLayout {
+            spacing: ScreenTools.defaultFontPixelWidth / 2
+
+            SettingsGroupLayout {
+                heading: qsTr("Active Gimbal")
+                visible: multiGimbalSetup
+
+                QGCComboBox {
+                    id:                     gimbalSelectorCombo
+                    Layout.fillWidth:       true
+                    visible:                multiGimbalSetup
+                    onCurrentIndexChanged:  gimbalController.activeGimbal = gimbalController.gimbals.get(currentIndex)
+
+                    function _updateComboModel() {
+                        let gimbalModel = []
+                        let activeIndex = -1
+                        for (var i = 0; i < gimbals.count; i++) {
+                            var gimbal = gimbals.get(i)
+                            gimbalModel.push(qsTr("Gimbal %1").arg(gimbal.deviceId.valueString))
+                            if (gimbal === activeGimbal) {
+                                activeIndex = i
                             }
                         }
+                        gimbalSelectorCombo.model = gimbalModel
+                        gimbalSelectorCombo.currentIndex = activeIndex
                     }
-                }
 
-                // Separator
-                Rectangle {
-                    Layout.leftMargin:      margins
-                    Layout.preferredWidth:  2
-                    Layout.preferredHeight: separatorHeight
-                    color:                  qgcPal.windowShade
-                    visible:                multiGimbalSetup
+                    Component.onCompleted:  _updateComboModel()
+                    Connections {
+                        target: gimbals
+                        function onCountChanged(count) { _updateComboModel() }
+                    }
                 }
+            }
+
+            SettingsGroupLayout {
+                heading:        qsTr("Commands")
+                showDividers:   false
 
-                // Active gimbal selector section
-                QGCLabel {
-                    text:                   qsTr("Active <br> Gimbal: ") + activeGimbal.deviceId.rawValue
-                    font.pointSize:         ScreenTools.smallFontPointSize
-                    Layout.preferredWidth:  buttonHeight * 1.1
-                    Layout.leftMargin:      margins
-                    font.weight:            Font.DemiBold
-                    visible:                multiGimbalSetup
-                }
                 QGCButton {
-                    id:                     gimbalSelectorButton
-                    Layout.preferredWidth:  Layout.preferredHeight
-                    Layout.preferredHeight: buttonHeight
-                    Layout.alignment:       Qt.AlignHCenter | Qt.AlignBottom
-                    text:                   qsTr("Select <br> Gimbal")
-                    fontWeight:             Font.DemiBold
-                    pointSize:              ScreenTools.smallFontPointSize
-                    backRadius:             panelRadius * 0.5
-                    visible:                multiGimbalSetup
-                    checkable:              true
-
-                    // This rectangle is to hide the "roundness" of panels when showing the dropdown, in the join between the 2 panels
-                    Rectangle {
-                        id:                         hideRoundCornersRectangle
-                        anchors.verticalCenter:     gimbalSelectorPanel.top
-                        anchors.horizontalCenter:   gimbalSelectorPanel.horizontalCenter
-                        width:                      gimbalSelectorPanel.width
-                        height:                     panelRadius * 2
-                        color:                      qgcPal.window
-                        visible:                    gimbalSelectorPanel.visible
-                    }
-                    
-                    Rectangle {
-                        id:                         gimbalSelectorPanel
-                        width:                      buttonHeight + margins * 2
-                        height:                     gimbalSelectorContentGrid.childrenRect.height + margins * 2
-                        visible:                    gimbalSelectorButton.checked
-                        color:                      qgcPal.window
-                        radius:                     panelRadius
-                        // We only show border if the extended settings panel is visible
-                        border.color:               settingsPanelVisible ? qgcPal.windowShade : qgcPal.window
-                        border.width:               5
-
-                        anchors.top:                parent.bottom
-                        anchors.horizontalCenter:   parent.horizontalCenter
-                        anchors.topMargin:          margins
-
-                        property var buttonWidth:    width - margins * 2
-                        property var panelHeight:    gimbalSelectorContentGrid.childrenRect.height + margins * 2
-                        property var gridRowSpacing: margins
-                        property var buttonFontSize: ScreenTools.smallFontPointSize * 0.9
-
-                        GridLayout {
-                            id:               gimbalSelectorContentGrid
-                            width:            parent.width
-                            rowSpacing:       gimbalSelectorPanel.gridRowSpacing
-                            columns:          1
-
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            anchors.top:              parent.top
-                            anchors.topMargin:        margins
-
-                            Repeater {
-                                model: gimbalController && gimbalController.gimbals ? gimbalController.gimbals : undefined
-                                delegate: QGCButton {
-                                    Layout.preferredWidth:  Layout.preferredHeight
-                                    Layout.preferredHeight: buttonHeight
-                                    Layout.alignment:       Qt.AlignHCenter | Qt.AlignVCenter
-                                    fontWeight:             Font.DemiBold
-                                    pointSize:              ScreenTools.smallFontPointSize
-                                    backRadius:             panelRadius * 0.5
-                                    text:                   qsTr("Gimbal ") + object.deviceId.rawValue
-                                    checked:                activeGimbal === object
-                                    onClicked: {
-                                        gimbalController.activeGimbal = object
-                                        gimbalSelectorButton.checked = false
-                                    }
-                                }
-                            }
-                        }
+                    Layout.fillWidth:   true
+                    text:               activeGimbal.yawLock ? qsTr("Yaw Follow") : qsTr("Yaw Lock")
+                    visible:            activeGimbal.supportsYawLock
+                    onClicked: {
+                        gimbalController.setGimbalYawLock(!activeGimbal.yawLock)
+                        mainWindow.closeIndicatorDrawer()
                     }
                 }
 
-                // Separator
-                Rectangle {
-                    Layout.leftMargin:      margins
-                    Layout.preferredWidth:  2
-                    Layout.preferredHeight: separatorHeight
-                    color:                  qgcPal.windowShade
+                QGCButton {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Center")
+                    onClicked: {
+                        gimbalController.centerGimbal()
+                        mainWindow.closeIndicatorDrawer()
+                    }
                 }
 
-                // Show settings button. It is thought for persisting popup close actions, hence the visibility
-                // based on a control.settingsPanelVisible It is interesting as users calibrating onscreen controls 
-                // will be testing and adjusting these frequently, so this way it is handier for them
                 QGCButton {
-                    id:                     extendedOptionsButton
-                    Layout.leftMargin:      margins
-                    Layout.preferredWidth:  Layout.preferredHeight
-                    Layout.preferredHeight: buttonHeight
-                    Layout.alignment:       Qt.AlignHCenter | Qt.AlignBottom
-                    text:                   qsTr("Settings")
-                    fontWeight:             Font.DemiBold
-                    pointSize:              ScreenTools.smallFontPointSize
-                    backRadius:             panelRadius * 0.5
-                    checkable:              true
-                    checked:                control.settingsPanelVisible
-                    leftPadding:            squareButtonPadding
-                    rightPadding:           squareButtonPadding
-                    onCheckedChanged: {
-                        if (checked !== control.settingsPanelVisible) {
-                            control.settingsPanelVisible = checked
-                        }
+                    Layout.fillWidth:   true
+                    text:               qsTr("Tilt 90")
+                    onClicked: {
+                        gimbalController.sendPitchBodyYaw(-90, 0)
+                        mainWindow.closeIndicatorDrawer()
                     }
                 }
 
-                // Settings panel
-                GridLayout {
-                    Layout.row:         2
-                    Layout.columnSpan:  8
+                QGCButton {
                     Layout.fillWidth:   true
-                    height:             buttonHeight * 1.5
-                    visible:            settingsPanelVisible
-                    columns:            2
-                    rowSpacing:         margins
-
-                    // Click on screen settings
-                    FactCheckBox {
-                        id:                 enableOnScreenControlCheckbox
-                        text:               "  " + QGroundControl.settingsManager.gimbalControllerSettings.EnableOnScreenControl.shortDescription
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.EnableOnScreenControl
-                        checkedValue:       1
-                        uncheckedValue:     0
-                        Layout.columnSpan:  2
+                    text:               qsTr("Point Home")
+                    onClicked: {
+                        activeVehicle.guidedModeROI(activeVehicle.homePosition)
+                        mainWindow.closeIndicatorDrawer()
                     }
+                }
 
-                    QGCLabel {
-                        id:                 controlTypeLabel
-                        text:               qsTr("Control type: ")
-                        visible:            enableOnScreenControlCheckbox.checked
-                    }
-                    FactComboBox {
-                        id:                 controlTypeCombo
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.ControlType
-                        visible:            enableOnScreenControlCheckbox.checked
+                QGCButton {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Retract")
+                    visible:            activeGimbal.supportsRetract
+                    onClicked: {
+                        gimbalController.setGimbalRetract(true)
+                        mainWindow.closeIndicatorDrawer()
                     }
+                }
 
-                    QGCLabel {
-                        text:               qsTr("Horizontal FOV")
-                        visible:            enableOnScreenControlCheckbox.checked && QGroundControl.settingsManager.gimbalControllerSettings.ControlType.rawValue === 0
-                    }
-                    FactTextField {
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.CameraHFov
-                        visible:            enableOnScreenControlCheckbox.checked && QGroundControl.settingsManager.gimbalControllerSettings.ControlType.rawValue === 0
+                QGCButton {
+                    Layout.fillWidth:   true
+                    text:               activeGimbal.gimbalHaveControl ? qsTr("Release Control") : qsTr("Acquire Control")
+                    visible:            _gimbalControllerSettings.toolbarIndicatorShowAcquireReleaseControl.rawValue
+                    onClicked: {
+                        activeGimbal.gimbalHaveControl ? gimbalController.releaseGimbalControl() : gimbalController.acquireGimbalControl()
+                        mainWindow.closeIndicatorDrawer()
                     }
+                }
+            }
+        }
+    }
 
-                    QGCLabel {
-                        text:               qsTr("Vertical FOV")
-                        visible:            enableOnScreenControlCheckbox.checked && QGroundControl.settingsManager.gimbalControllerSettings.ControlType.rawValue === 0
-                    }
-                    FactTextField {
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.CameraVFov
-                        visible:            enableOnScreenControlCheckbox.checked && QGroundControl.settingsManager.gimbalControllerSettings.ControlType.rawValue === 0
-                    }
+    Component {
+        id: gimbalExpandedComponent
 
-                    QGCLabel {
-                        text:               qsTr("Max speed:")
-                        visible:            enableOnScreenControlCheckbox.checked && QGroundControl.settingsManager.gimbalControllerSettings.ControlType.rawValue === 1
-                    }
-                    FactTextField {
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.CameraSlideSpeed
-                        visible:            enableOnScreenControlCheckbox.checked && QGroundControl.settingsManager.gimbalControllerSettings.ControlType.rawValue === 1
-                    }
+        ColumnLayout {
+            spacing: ScreenTools.defaultFontPixelWidth / 2
 
-                    // Separator
-                    Rectangle {
-                        Layout.columnSpan:       2
-                        Layout.preferredHeight:  2
-                        Layout.preferredWidth:   gimbalAzimuthMapCheckbox.width
-                        Layout.margins:          margins
-                        color:                   qgcPal.windowShade
-                    }
+            SettingsGroupLayout {
+                heading:        qsTr("On-Screen Control")
+                showDividers:   false
 
-                    QGCLabel {
-                        text:               qsTr("Joystick buttons speed:")
-                        visible:            joystickButtonsAvailable && QGroundControl.settingsManager.gimbalControllerSettings.visible
-                    }
-                    FactTextField {
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.joystickButtonsSpeed
-                        visible:            joystickButtonsAvailable && QGroundControl.settingsManager.gimbalControllerSettings.visible
-                        showHelp:           true
-                    }
+                FactCheckBoxSlider {
+                    id:                 enableOnScreenControlCheckbox
+                    Layout.fillWidth:   true
+                    text:               qsTr("Enabled")
+                    fact:               _gimbalControllerSettings.EnableOnScreenControl
+                }
 
-                    // Separator
-                    Rectangle {
-                        Layout.columnSpan:       2
-                        Layout.preferredHeight:  2
-                        Layout.preferredWidth:   gimbalAzimuthMapCheckbox.width
-                        Layout.margins:          margins
-                        color:                   qgcPal.windowShade
-                        visible:                 joystickButtonsAvailable && QGroundControl.settingsManager.gimbalControllerSettings.visible
-                    }
+                LabelledFactComboBox {
+                    label:      qsTr("Control type")
+                    fact:       _gimbalControllerSettings.ControlType
+                    visible:    enableOnScreenControlCheckbox.checked
+                }
 
-                    FactCheckBox {
-                        id:                 gimbalAzimuthMapCheckbox
-                        text:               "  " + qsTr("Show gimbal Azimuth indicator in map")
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.showAzimuthIndicatorOnMap
-                        Layout.columnSpan:  2
-                        checkedValue:       1
-                        uncheckedValue:     0
-                    }
+                LabelledFactTextField {
+                    label:      qsTr("Horizontal FOV")
+                    fact:       _gimbalControllerSettings.CameraHFov
+                    visible:    enableOnScreenControlCheckbox.checked && _gimbalControllerSettings.ControlType.rawValue === 0
+                }
 
-                    FactCheckBox {
-                        id:                 gimbalAzimutIndicatorCheckbox
-                        text:               "  " + qsTr("Use Azimuth instead of local yaw on top toolbar indicator")
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.toolbarIndicatorShowAzimuth
-                        Layout.columnSpan:  2
-                        checkedValue:       1
-                        uncheckedValue:     0
-                    }
+                LabelledFactTextField {
+                    label:      qsTr("Vertical FOV")
+                    fact:       _gimbalControllerSettings.CameraVFov
+                    visible:    enableOnScreenControlCheckbox.checked && _gimbalControllerSettings.ControlType.rawValue === 0
+                }
 
-                    FactCheckBox {
-                        id:                 showAcquireControlCheckbox
-                        text:               "  " + qsTr("Show Acquire/Release control button")
-                        fact:               QGroundControl.settingsManager.gimbalControllerSettings.toolbarIndicatorShowAcquireReleaseControl
-                        Layout.columnSpan:  2
-                        checkedValue:       1
-                        uncheckedValue:     0
-                    }
+                LabelledFactTextField {
+                    label:      qsTr("Max speed")
+                    fact:       _gimbalControllerSettings.CameraSlideSpeed
+                    visible:    enableOnScreenControlCheckbox.checked && _gimbalControllerSettings.ControlType.rawValue === 1
                 }
             }
-        }
-    }
 
-    // Icon plus active instance indicator
-    QGCColoredImage {
-        id:                      gimbalIndicatorIcon
-        width:                   height
-        anchors.top:             parent.top
-        anchors.bottom:          parent.bottom
-        source:                  "/gimbal/payload.svg"
-        fillMode:                Image.PreserveAspectFit
-        sourceSize.height:       height
-        color:                   qgcPal.buttonText
-
-        // Current active gimbal indicator
-        QGCLabel {
-            id:                  gimbalInstanceIndicatorLabel
-            text:                activeGimbal ? activeGimbal.deviceId.rawValue : ""
-            visible:             multiGimbalSetup
-            anchors.top:         parent.top
-            anchors.topMargin:   -margins * 0.5
-            anchors.right:       parent.right
-            anchors.rightMargin: -margins * 0.5
-        }
-    }
+            SettingsGroupLayout {
+                LabelledFactTextField {
+                    label:      qsTr("Joystick buttons speed:")
+                    fact:       _gimbalControllerSettings.joystickButtonsSpeed
+                    enabled:    joystickButtonsAvailable && _gimbalControllerSettings.visible
+                }
 
-    // Telemetry and status indicator
-    GridLayout {
-        id:                        gimbalTelemetryLayout
-        anchors.left:              gimbalIndicatorIcon.right
-        anchors.leftMargin:        margins
-        anchors.verticalCenter:    parent.verticalCenter
-        columns:                   2
-        rows:                      2
-        rowSpacing:                0
-        columnSpacing:             margins
-        property bool showAzimuth: QGroundControl.settingsManager.gimbalControllerSettings.toolbarIndicatorShowAzimuth.rawValue
-
-        QGCLabel {
-            id:                     statusLabel
-            text:                   activeGimbal && activeGimbal.retracted ? 
-                                        qsTr("Retracted") :
-                                        (activeGimbal && activeGimbal.yawLock ? qsTr("Yaw locked") : qsTr("Yaw follow"))
-            Layout.columnSpan:      2
-            Layout.alignment:       Qt.AlignHCenter
-        }
-        QGCLabel {
-            id:                     pitchLabel
-            text:                   activeGimbal ? qsTr("P: ") + activeGimbal.absolutePitch.rawValue.toFixed(1) : ""
-        }
-        QGCLabel {
-            id:                     panLabel
-            text:                   activeGimbal ? 
-                                        gimbalTelemetryLayout.showAzimuth ? (qsTr("Az: ") + activeGimbal.absoluteYaw.rawValue.toFixed(1)) :
-                                            (qsTr("Y: ") + activeGimbal.bodyYaw.rawValue.toFixed(1)) :
-                                                ""
-        }
-    }
+                FactCheckBoxSlider {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Show gimbal Azimuth indicator in map")
+                    fact:               _gimbalControllerSettings.showAzimuthIndicatorOnMap
+                }
 
-    MouseArea {
-        anchors.fill:   parent
-        onClicked:      mainWindow.showIndicatorDrawer(gimbalControlsPage, control)
+                FactCheckBoxSlider {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Use Azimuth instead of local yaw on top toolbar indicator")
+                    fact:               _gimbalControllerSettings.toolbarIndicatorShowAzimuth
+                }
+
+                FactCheckBoxSlider {
+                    Layout.fillWidth:   true
+                    text:               qsTr("Show Acquire/Release control button")
+                    fact:               _gimbalControllerSettings.toolbarIndicatorShowAcquireReleaseControl
+                }
+            }
+        }
     }
 
     Connections {
diff --git a/src/UI/toolbar/JoystickIndicator.qml b/src/UI/toolbar/JoystickIndicator.qml
index d5e5a6330cdd..b94cf6ea85ed 100644
--- a/src/UI/toolbar/JoystickIndicator.qml
+++ b/src/UI/toolbar/JoystickIndicator.qml
@@ -13,17 +13,20 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
 // Joystick Indicator
 Item {
     id:             control
     width:          joystickRow.width * 1.1
     anchors.top:    parent.top
     anchors.bottom: parent.bottom
-    visible:        globals.activeVehicle ? globals.activeVehicle.sub : false
 
+    property bool showIndicator: _vehicleIsSub || _showJoystickIndicator
+
+    property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+    property bool _vehicleIsSub: _activeVehicle && _activeVehicle.sub
+    property bool _showJoystickIndicator: QGroundControl.settingsManager.flyViewSettings.showJoystickIndicatorInToolbar.rawValue
+
+    QGCPalette { id: qgcPal }
 
     Component {
         id: joystickInfoPage
@@ -69,7 +72,7 @@ Item {
                 if(globals.activeVehicle && joystickManager.activeJoystick) {
                     if(globals.activeVehicle.joystickEnabled) {
                         // Everything ready to use joystick
-                        return qgcPal.buttonText
+                        return qgcPal.windowTransparentText
                     }
                     // Joystick is not enabled in the joystick configuration page
                     return "yellow"
diff --git a/src/UI/toolbar/LinkIndicator.qml b/src/UI/toolbar/LinkIndicator.qml
deleted file mode 100644
index 305628d301c2..000000000000
--- a/src/UI/toolbar/LinkIndicator.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
- *
- * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-import QGroundControl
-import QGroundControl.Controls
-
-
-
-
-
-Item {
-    anchors.top:    parent.top
-    anchors.bottom: parent.bottom
-    width:          linkCombo.width
-
-    property bool showIndicator: false
-
-    property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
-    property var    _rgLinkNames:       _activeVehicle ? _activeVehicle.vehicleLinkManager.linkNames : [ ]
-    property var    _rgLinkStatus:      _activeVehicle ? _activeVehicle.vehicleLinkManager.linkStatuses : [ ]
-    property string _primaryLinkName:   _activeVehicle ? _activeVehicle.vehicleLinkManager.primaryLinkName : ""
-
-    function updateComboModel() {
-        var linkModel = []
-        for (var i = 0; i < _rgLinkNames.length; i++) {
-            var linkStatus = _rgLinkStatus[i]
-            linkModel.push(_rgLinkNames[i] + (linkStatus === "" ? "" : " " + _rgLinkStatus[i]))
-        }
-        linkCombo.model = linkModel
-        linkCombo.currentIndex = -1
-        showIndicator = _rgLinkNames.length > 1
-    }
-
-    Component.onCompleted:  updateComboModel()
-    on_RgLinkNamesChanged:  updateComboModel()
-    on_RgLinkStatusChanged: updateComboModel()
-
-    QGCComboBox {
-        id:             linkCombo
-        sizeToContents: true
-        alternateText:  _primaryLinkName
-        onActivated:    (index) => { _activeVehicle.vehicleLinkManager.primaryLinkName = _rgLinkNames[index]; currentIndex = -1 }
-    }
-}
diff --git a/src/UI/toolbar/RTKGPSIndicator.qml b/src/UI/toolbar/RTKGPSIndicator.qml
index 8004411e1b3d..f15118fe8419 100644
--- a/src/UI/toolbar/RTKGPSIndicator.qml
+++ b/src/UI/toolbar/RTKGPSIndicator.qml
@@ -13,9 +13,6 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
 GPSIndicator {
     property bool showIndicator: !_activeVehicle && _rtkConnected
 
diff --git a/src/UI/toolbar/RemoteIDIndicator.qml b/src/UI/toolbar/RemoteIDIndicator.qml
index 01b50cf02254..938949e94774 100644
--- a/src/UI/toolbar/RemoteIDIndicator.qml
+++ b/src/UI/toolbar/RemoteIDIndicator.qml
@@ -36,7 +36,7 @@ Item {
     property bool   emergencyDeclared:  activeVehicle && remoteIDManager ? remoteIDManager.emergencyDeclared  : false
     property bool   operatorIDFlag:     activeVehicle && remoteIDManager ? remoteIDManager.operatorIDGood     : false
     property int    remoteIDState:      getRemoteIDState()
-    
+
     property int    regionOperation:    QGroundControl.settingsManager.remoteIDSettings.region.value
 
     enum RIDState {
@@ -53,16 +53,16 @@ Item {
 
     function getRidColor() {
         switch (remoteIDState) {
-            case RemoteIDIndicator.RIDState.HEALTHY: 
+            case RemoteIDIndicator.RIDState.HEALTHY:
                 return qgcPal.colorGreen
                 break
-            case RemoteIDIndicator.RIDState.WARNING: 
+            case RemoteIDIndicator.RIDState.WARNING:
                 return qgcPal.colorYellow
                 break
-            case RemoteIDIndicator.RIDState.ERROR: 
+            case RemoteIDIndicator.RIDState.ERROR:
                 return qgcPal.colorRed
                 break
-            case RemoteIDIndicator.RIDState.UNAVAILABLE: 
+            case RemoteIDIndicator.RIDState.UNAVAILABLE:
                 return qgcPal.colorGrey
                 break
             default:
@@ -96,6 +96,8 @@ Item {
         }
     }
 
+    QGCPalette { id: qgcPal }
+
     QGCColoredImage {
         id:                 remoteIDIcon
         width:              height
diff --git a/src/UI/toolbar/VehicleGPSIndicator.qml b/src/UI/toolbar/VehicleGPSIndicator.qml
index f85fa5c5ebd0..3527f3cf00a9 100644
--- a/src/UI/toolbar/VehicleGPSIndicator.qml
+++ b/src/UI/toolbar/VehicleGPSIndicator.qml
@@ -13,9 +13,8 @@ import QtQuick.Layouts
 import QGroundControl
 import QGroundControl.Controls
 
-
-
-
 GPSIndicator {
-    property bool showIndicator: true
+    property bool showIndicator: _activeVehicle.gps.telemetryAvailable
+
+    property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
 }
diff --git a/src/UTMSP/CMakeLists.txt b/src/UTMSP/CMakeLists.txt
index b9881e9f1fc2..1b895583ce96 100644
--- a/src/UTMSP/CMakeLists.txt
+++ b/src/UTMSP/CMakeLists.txt
@@ -1,5 +1,13 @@
+# ============================================================================
+# UTMSP Module
+# Unmanned Traffic Management Service Provider integration
+# ============================================================================
+
 qt_add_library(UTMSPModule STATIC)
 
+# ----------------------------------------------------------------------------
+# Dummy UTMSP Module (when adapter is disabled)
+# ----------------------------------------------------------------------------
 if(NOT QGC_UTM_ADAPTER)
     set_source_files_properties(dummy/UTMSPStateStorage.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
 
@@ -21,6 +29,10 @@ if(NOT QGC_UTM_ADAPTER)
     return()
 endif()
 
+# ----------------------------------------------------------------------------
+# Full UTMSP Adapter Implementation
+# ----------------------------------------------------------------------------
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         services/dispatcher.h
@@ -49,6 +61,10 @@ target_sources(${CMAKE_PROJECT_NAME}
         UTMSPVehicle.h
 )
 
+# ----------------------------------------------------------------------------
+# Dependencies
+# ----------------------------------------------------------------------------
+# TODO: Enable nlohmann_json when needed
 # CPMFindPackage(
 #     NAME nlohmann_json
 #     VERSION 3.11.3
@@ -70,6 +86,9 @@ target_include_directories(${CMAKE_PROJECT_NAME}
 
 target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_UTM_ADAPTER)
 
+# ----------------------------------------------------------------------------
+# UTMSP QML Module
+# ----------------------------------------------------------------------------
 set_source_files_properties(UTMSPStateStorage.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
 
 qt_add_qml_module(UTMSPModule
diff --git a/src/UTMSP/UTMSPAircraft.cpp b/src/UTMSP/UTMSPAircraft.cpp
index 4696dd54f613..df26cfa6f02b 100644
--- a/src/UTMSP/UTMSPAircraft.cpp
+++ b/src/UTMSP/UTMSPAircraft.cpp
@@ -82,4 +82,3 @@ std::string UTMSPAircraft::aircraftType(const mavlink_message_t &message)
 
     return "Unknown Type";
 }
-
diff --git a/src/UTMSP/UTMSPNotificationSlider.qml b/src/UTMSP/UTMSPNotificationSlider.qml
index 1f7491abe951..3d16b8f2bb1b 100644
--- a/src/UTMSP/UTMSPNotificationSlider.qml
+++ b/src/UTMSP/UTMSPNotificationSlider.qml
@@ -179,5 +179,3 @@ Rectangle {
     }
 
 }
-
-
diff --git a/src/Utilities/Audio/AudioOutput.cc b/src/Utilities/Audio/AudioOutput.cc
index 1ad35299b8da..38846d82d5bd 100644
--- a/src/Utilities/Audio/AudioOutput.cc
+++ b/src/Utilities/Audio/AudioOutput.cc
@@ -16,7 +16,7 @@
 #include <QtCore/QApplicationStatic>
 #include <QtTextToSpeech/QTextToSpeech>
 
-QGC_LOGGING_CATEGORY(AudioOutputLog, "qgc.audio.audiooutput");
+QGC_LOGGING_CATEGORY(AudioOutputLog, "Utilities.AudioOutput");
 // qt.speech.tts.flite
 // qt.speech.tts.android
 
diff --git a/src/Utilities/Audio/CMakeLists.txt b/src/Utilities/Audio/CMakeLists.txt
index e06a49acd56c..58f78028be7c 100644
--- a/src/Utilities/Audio/CMakeLists.txt
+++ b/src/Utilities/Audio/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Audio Subsystem
+# Audio output and notification sounds
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         AudioOutput.cc
diff --git a/src/Utilities/CMakeLists.txt b/src/Utilities/CMakeLists.txt
index ae24b3454efd..8548bc1391fb 100644
--- a/src/Utilities/CMakeLists.txt
+++ b/src/Utilities/CMakeLists.txt
@@ -1,3 +1,11 @@
+# ============================================================================
+# Utilities Module
+# Core utilities, logging, file system helpers, and platform abstractions
+# ============================================================================
+
+# ----------------------------------------------------------------------------
+# Core Utility Sources
+# ----------------------------------------------------------------------------
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         DeviceInfo.cc
@@ -14,6 +22,8 @@ target_sources(${CMAKE_PROJECT_NAME}
         Platform.h
         QGC.cc
         QGC.h
+        QGCCommandLineParser.cc
+        QGCCommandLineParser.h
         QGCLogging.cc
         QGCLogging.h
         QGCLoggingCategory.cc
@@ -22,13 +32,20 @@ target_sources(${CMAKE_PROJECT_NAME}
         StateMachine.h
 )
 
-if(LINUX)
+# ----------------------------------------------------------------------------
+# Platform-Specific Sources
+# ----------------------------------------------------------------------------
+# Signal handling not available on mobile platforms
+if(NOT ANDROID AND NOT IOS)
     target_sources(${CMAKE_PROJECT_NAME}
         PRIVATE
             SignalHandler.cc
             SignalHandler.h
     )
-elseif(IOS)
+endif()
+
+# iOS-specific screen management
+if(IOS)
     target_sources(${CMAKE_PROJECT_NAME}
         PRIVATE
             MobileScreenMgr.mm
@@ -42,9 +59,11 @@ target_include_directories(${CMAKE_PROJECT_NAME}
         FileSystem
 )
 
-#===========================================================================#
+# ============================================================================
+# Utility Subdirectories
+# ============================================================================
 
 add_subdirectory(Audio)
 add_subdirectory(Compression)
 add_subdirectory(Geo)
-add_subdirectory(Shape)
+add_subdirectory(StateMachine)
diff --git a/src/Utilities/Compression/CMakeLists.txt b/src/Utilities/Compression/CMakeLists.txt
index 900010494534..cf4babfe6837 100644
--- a/src/Utilities/Compression/CMakeLists.txt
+++ b/src/Utilities/Compression/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Compression Subsystem
+# Compression and decompression utilities (ZIP, LZMA, ZLIB)
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         QGCLZMA.cc
@@ -10,8 +15,11 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-#===========================================================================#
+# ============================================================================
+# zlib Integration
+# ============================================================================
 
+# Platform-specific zlib options
 set(ZLIB_EXTRA_OPTIONS)
 if(WIN32)
     set(ZLIB_EXTRA_OPTIONS
@@ -35,7 +43,9 @@ CPMAddPackage(
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ZLIB::ZLIBSTATIC)
 
-#===========================================================================#
+# ============================================================================
+# XZ (LZMA) Integration
+# ============================================================================
 
 CPMAddPackage(
     NAME xz-embedded
@@ -47,6 +57,7 @@ CPMAddPackage(
         "BUILD_TESTING OFF"
 )
 
+# Build XZ library from source
 qt_add_library(xz STATIC
     ${xz-embedded_SOURCE_DIR}/linux/include/linux/xz.h
     ${xz-embedded_SOURCE_DIR}/linux/lib/xz/xz_crc32.c
diff --git a/src/Utilities/Compression/QGCLZMA.cc b/src/Utilities/Compression/QGCLZMA.cc
index d2d8065d4933..052a77927122 100644
--- a/src/Utilities/Compression/QGCLZMA.cc
+++ b/src/Utilities/Compression/QGCLZMA.cc
@@ -16,7 +16,7 @@
 
 #include <xz.h>
 
-QGC_LOGGING_CATEGORY(QGCLZMALog, "qgc.compression.qgclzma")
+QGC_LOGGING_CATEGORY(QGCLZMALog, "Utilities.Compression.QGCLZMA")
 
 namespace QGCLZMA {
 
diff --git a/src/Utilities/Compression/QGCZip.cc b/src/Utilities/Compression/QGCZip.cc
index 8ebf9e41a153..1294a9970d3a 100644
--- a/src/Utilities/Compression/QGCZip.cc
+++ b/src/Utilities/Compression/QGCZip.cc
@@ -5,7 +5,7 @@
 #include <QtCore/private/qzipreader_p.h>
 #include <QtCore/private/qzipwriter_p.h>
 
-QGC_LOGGING_CATEGORY(QGCZipLog, "qgc.utilities.compression.qgczip")
+QGC_LOGGING_CATEGORY(QGCZipLog, "Utilities.QGCZip")
 
 namespace QGCZip {
 
diff --git a/src/Utilities/Compression/QGCZlib.cc b/src/Utilities/Compression/QGCZlib.cc
index d8ac5bffb1fe..286be8539f23 100644
--- a/src/Utilities/Compression/QGCZlib.cc
+++ b/src/Utilities/Compression/QGCZlib.cc
@@ -14,7 +14,7 @@
 
 #include <zlib.h>
 
-QGC_LOGGING_CATEGORY(QGCZlibLog, "qgc.compression.qgczlib")
+QGC_LOGGING_CATEGORY(QGCZlibLog, "Utilities.Compression.QGCZlib")
 
 namespace QGCZlib
 {
diff --git a/src/Utilities/DeviceInfo.cc b/src/Utilities/DeviceInfo.cc
index b82f41c861df..ae206fe9ee3e 100644
--- a/src/Utilities/DeviceInfo.cc
+++ b/src/Utilities/DeviceInfo.cc
@@ -16,7 +16,7 @@
 #    include <QtBluetooth/QBluetoothLocalDevice>
 #endif
 
-QGC_LOGGING_CATEGORY(QGCDeviceInfoLog, "qgc.utilities.deviceinfo")
+QGC_LOGGING_CATEGORY(QGCDeviceInfoLog, "Utilities.QGCDeviceInfo")
 
 namespace QGCDeviceInfo
 {
diff --git a/src/Utilities/FileSystem/QGCCachedFileDownload.cc b/src/Utilities/FileSystem/QGCCachedFileDownload.cc
index ca63ee591234..288a429fd9ac 100644
--- a/src/Utilities/FileSystem/QGCCachedFileDownload.cc
+++ b/src/Utilities/FileSystem/QGCCachedFileDownload.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QDateTime>
 #include <QtNetwork/QNetworkDiskCache>
 
-QGC_LOGGING_CATEGORY(QGCCachedFileDownloadLog, "qgc.utilities.qgccachedfiledownload");
+QGC_LOGGING_CATEGORY(QGCCachedFileDownloadLog, "Utilities.QGCCachedFileDownload");
 
 QGCCachedFileDownload::QGCCachedFileDownload(const QString &cacheDirectory, QObject *parent)
     : QObject(parent)
diff --git a/src/Utilities/FileSystem/QGCFileDownload.cc b/src/Utilities/FileSystem/QGCFileDownload.cc
index 0383a11aefdf..d6ea0dd31748 100644
--- a/src/Utilities/FileSystem/QGCFileDownload.cc
+++ b/src/Utilities/FileSystem/QGCFileDownload.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QStandardPaths>
 #include <QtNetwork/QNetworkProxy>
 
-QGC_LOGGING_CATEGORY(QGCFileDownloadLog, "qgc.utilities.qgcfiledownload");
+QGC_LOGGING_CATEGORY(QGCFileDownloadLog, "Utilities.QGCFileDownload");
 
 QGCFileDownload::QGCFileDownload(QObject *parent)
     : QObject(parent)
diff --git a/src/Utilities/FileSystem/QGCTemporaryFile.cc b/src/Utilities/FileSystem/QGCTemporaryFile.cc
index a0701324f861..82aabdc804ce 100644
--- a/src/Utilities/FileSystem/QGCTemporaryFile.cc
+++ b/src/Utilities/FileSystem/QGCTemporaryFile.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QRandomGenerator>
 #include <QtCore/QStandardPaths>
 
-QGC_LOGGING_CATEGORY(QGCTemporaryFileLog, "qgc.utilities.qgctemporaryfile");
+QGC_LOGGING_CATEGORY(QGCTemporaryFileLog, "Utilities.QGCTemporaryFile");
 
 QGCTemporaryFile::QGCTemporaryFile(const QString &fileTemplate, QObject *parent)
     : QFile(parent)
diff --git a/src/Utilities/Geo/CMakeLists.txt b/src/Utilities/Geo/CMakeLists.txt
index adb84b120b59..3f1520954bcd 100644
--- a/src/Utilities/Geo/CMakeLists.txt
+++ b/src/Utilities/Geo/CMakeLists.txt
@@ -1,12 +1,29 @@
+# ============================================================================
+# Geo Subsystem
+# Geographic data handling (GeoJSON, KML, Shapefiles)
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
+        GeoJsonHelper.cc
+        GeoJsonHelper.h
+        KMLDomDocument.cc
+        KMLDomDocument.h
+        KMLHelper.cc
+        KMLHelper.h
         QGCGeo.cc
         QGCGeo.h
+        ShapeFileHelper.cc
+        ShapeFileHelper.h
+        SHPFileHelper.cc
+        SHPFileHelper.h
 )
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-#===========================================================================#
+# ============================================================================
+# GeographicLib Integration
+# ============================================================================
 
 CPMAddPackage(
     NAME geographiclib
@@ -32,6 +49,23 @@ CPMAddPackage(
     PATCHES geographiclib.patch
 )
 
+# Suppress MSVC warnings in GeographicLib
 target_compile_options(GeographicLib_STATIC PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd9025>)
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE GeographicLib::GeographicLib)
+
+# ============================================================================
+# Shapelib Integration
+# ============================================================================
+
+CPMAddPackage(
+    NAME Shapelib
+    VERSION 1.6.1
+    GITHUB_REPOSITORY OSGeo/shapelib
+    OPTIONS
+        "BUILD_SHAPELIB_CONTRIB OFF"
+        "BUILD_APPS OFF"
+        "BUILD_TESTING OFF"
+)
+
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE shp)
diff --git a/src/Utilities/Geo/GeoJsonHelper.cc b/src/Utilities/Geo/GeoJsonHelper.cc
new file mode 100644
index 000000000000..89aca9797198
--- /dev/null
+++ b/src/Utilities/Geo/GeoJsonHelper.cc
@@ -0,0 +1,157 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "GeoJsonHelper.h"
+#include "JsonHelper.h"
+#include "QGCLoggingCategory.h"
+
+#include <QtCore/QFile>
+#include <QtCore/QJsonValue>
+#include <QtLocation/private/qgeojson_p.h>
+#include <QtPositioning/QGeoCoordinate>
+#include <QtPositioning/QGeoPath>
+#include <QtPositioning/QGeoPolygon>
+
+QGC_LOGGING_CATEGORY(GeoJsonHelperLog, "Utilities.GeoJsonHelper")
+
+namespace GeoJsonHelper
+{
+    QJsonDocument _loadFile(const QString &filePath, QString &errorString);
+
+    constexpr const char *_errorPrefix = QT_TR_NOOP("GeoJson file load failed. %1");
+}
+
+QJsonDocument GeoJsonHelper::_loadFile(const QString &filePath, QString &errorString)
+{
+    errorString.clear();
+
+    QFile file(filePath);
+    if (!file.exists()) {
+        errorString = QString(_errorPrefix).arg(
+            QString(QT_TRANSLATE_NOOP("GeoJson", "File not found: %1")).arg(filePath));
+        return QJsonDocument();
+    }
+
+    if (!file.open(QIODevice::ReadOnly)) {
+        errorString = QString(_errorPrefix).arg(
+            QString(QT_TRANSLATE_NOOP("GeoJson", "Unable to open file: %1 error: %2"))
+                .arg(filePath, file.errorString()));
+        return QJsonDocument();
+    }
+
+    QJsonDocument jsonDoc;
+    const QByteArray bytes = file.readAll();
+    if (!JsonHelper::isJsonFile(bytes, jsonDoc, errorString)) {
+        errorString = QString(_errorPrefix).arg(errorString);
+    }
+
+    return jsonDoc;
+}
+
+ShapeFileHelper::ShapeType GeoJsonHelper::determineShapeType(const QString &filePath, QString &errorString)
+{
+    using ShapeType = ShapeFileHelper::ShapeType;
+
+    const QJsonDocument jsonDoc = GeoJsonHelper::_loadFile(filePath, errorString);
+    if (!errorString.isEmpty()) {
+        return ShapeType::Error;
+    }
+
+    const QVariantList shapes = QGeoJson::importGeoJson(jsonDoc);
+    if (shapes.isEmpty()) {
+        errorString = QString(_errorPrefix).arg(
+            QT_TRANSLATE_NOOP("GeoJson", "No shapes found in GeoJson file."));
+        return ShapeType::Error;
+    }
+
+    for (const QVariant &shapeVar : shapes) {
+        if (shapeVar.canConvert<QGeoShape>()) {
+            const QGeoShape shape = shapeVar.value<QGeoShape>();
+            if (shape.type() == QGeoShape::PathType) {
+                return ShapeType::Polyline;
+            } else if (shape.type() == QGeoShape::PolygonType) {
+                return ShapeType::Polygon;
+            }
+        }
+    }
+
+    errorString = QString(_errorPrefix).arg(
+        QT_TRANSLATE_NOOP("GeoJson", "No supported type found in GeoJson file."));
+    return ShapeType::Error;
+}
+
+bool GeoJsonHelper::loadPolygonFromFile(const QString &filePath, QList<QGeoCoordinate> &vertices, QString &errorString)
+{
+    errorString.clear();
+    vertices.clear();
+
+    const QJsonDocument jsonDoc = GeoJsonHelper::_loadFile(filePath, errorString);
+    if (!errorString.isEmpty()) {
+        return false;
+    }
+
+    const QVariantList shapes = QGeoJson::importGeoJson(jsonDoc);
+    if (shapes.isEmpty()) {
+        errorString = QString(_errorPrefix).arg(
+            QT_TRANSLATE_NOOP("GeoJson", "No polygon data found in GeoJson file."));
+        return false;
+    }
+
+    for (const QVariant &shapeVar : shapes) {
+        if (shapeVar.canConvert<QGeoPolygon>()) {
+            const QGeoPolygon poly = shapeVar.value<QGeoPolygon>();
+            vertices = poly.perimeter();
+            return true;
+        }
+    }
+
+    errorString = QString(_errorPrefix).arg(
+        QT_TRANSLATE_NOOP("GeoJson", "No polygon found in GeoJson file."));
+    return false;
+}
+
+bool GeoJsonHelper::loadPolylineFromFile(const QString &filePath, QList<QGeoCoordinate> &coords, QString &errorString)
+{
+    errorString.clear();
+    coords.clear();
+
+    const QJsonDocument jsonDoc = GeoJsonHelper::_loadFile(filePath, errorString);
+    if (!errorString.isEmpty()) {
+        return false;
+    }
+
+    const QVariantList shapes = QGeoJson::importGeoJson(jsonDoc);
+    if (shapes.isEmpty()) {
+        errorString = QString(_errorPrefix).arg(
+            QT_TRANSLATE_NOOP("GeoJson", "No polyline data found in GeoJson file."));
+        return false;
+    }
+
+    for (const QVariant &shapeVar : shapes) {
+        if (shapeVar.canConvert<QGeoPath>()) {
+            const QGeoPath path = shapeVar.value<QGeoPath>();
+            coords = path.path();
+            return true;
+        }
+    }
+
+    errorString = QString(_errorPrefix).arg(
+        QT_TRANSLATE_NOOP("GeoJson", "No polyline found in GeoJson file."));
+    return false;
+}
+
+bool GeoJsonHelper::loadGeoJsonCoordinate(const QJsonValue &jsonValue, bool altitudeRequired, QGeoCoordinate &coordinate, QString &errorString)
+{
+    return JsonHelper::loadGeoCoordinate(jsonValue, altitudeRequired, coordinate, errorString, true /* geoJsonFormat */);
+}
+
+void GeoJsonHelper::saveGeoJsonCoordinate(const QGeoCoordinate &coordinate, bool writeAltitude, QJsonValue &jsonValue)
+{
+    JsonHelper::saveGeoCoordinate(coordinate, writeAltitude, jsonValue, true /* geoJsonFormat */);
+}
diff --git a/src/Utilities/Geo/GeoJsonHelper.h b/src/Utilities/Geo/GeoJsonHelper.h
new file mode 100644
index 000000000000..6138481af236
--- /dev/null
+++ b/src/Utilities/Geo/GeoJsonHelper.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include <QtCore/QList>
+#include <QtCore/QLoggingCategory>
+#include <QtPositioning/QGeoCoordinate>
+
+#include "ShapeFileHelper.h"
+
+class QJsonValue;
+
+Q_DECLARE_LOGGING_CATEGORY(GeoJsonHelperLog)
+
+namespace GeoJsonHelper
+{
+    ShapeFileHelper::ShapeType determineShapeType(const QString &filePath, QString &errorString);
+    bool loadPolygonFromFile(const QString &filePath, QList<QGeoCoordinate> &vertices, QString &errorString);
+    bool loadPolylineFromFile(const QString &filePath, QList<QGeoCoordinate> &coords, QString &errorString);
+
+    /// Loads a QGeoCoordinate
+    ///     Stored as array [ lon, lat, alt ]
+    /// @return false: validation failed
+    bool loadGeoJsonCoordinate(const QJsonValue &jsonValue, ///< json value to load from
+                               bool altitudeRequired,       ///< true: altitude must be specified
+                               QGeoCoordinate &coordinate,  ///< returned QGeoCordinate
+                               QString &errorString);       ///< returned error string if load failure
+
+    /// Saves a QGeoCoordinate
+    ///     Stored as array [ lon, lat, alt ]
+    void saveGeoJsonCoordinate(const QGeoCoordinate &coordinate,    ///< QGeoCoordinate to save
+                               bool writeAltitude,                  ///< true: write altitude to json
+                               QJsonValue &jsonValue);              ///< json value to save to
+};
diff --git a/src/Utilities/Shape/KMLDomDocument.cc b/src/Utilities/Geo/KMLDomDocument.cc
similarity index 96%
rename from src/Utilities/Shape/KMLDomDocument.cc
rename to src/Utilities/Geo/KMLDomDocument.cc
index 6d7754913233..40eb85790792 100644
--- a/src/Utilities/Shape/KMLDomDocument.cc
+++ b/src/Utilities/Geo/KMLDomDocument.cc
@@ -8,8 +8,13 @@
  ****************************************************************************/
 
 #include "KMLDomDocument.h"
+#include "QGCLoggingCategory.h"
+
+#include <QtGui/QColor>
 #include <QtPositioning/QGeoCoordinate>
 
+QGC_LOGGING_CATEGORY(KMLDomDocumentLog, "Utilities.KMLDomDocument")
+
 KMLDomDocument::KMLDomDocument(const QString &name)
 {
     const QDomProcessingInstruction header = createProcessingInstruction(QStringLiteral("xml"), QStringLiteral("version=\"1.0\" encoding=\"UTF-8\""));
diff --git a/src/Utilities/Shape/KMLDomDocument.h b/src/Utilities/Geo/KMLDomDocument.h
similarity index 92%
rename from src/Utilities/Shape/KMLDomDocument.h
rename to src/Utilities/Geo/KMLDomDocument.h
index 18482bf222f9..ceca1d8090d9 100644
--- a/src/Utilities/Shape/KMLDomDocument.h
+++ b/src/Utilities/Geo/KMLDomDocument.h
@@ -9,12 +9,16 @@
 
 #pragma once
 
+#include <QtCore/QLoggingCategory>
+#include <QtGui/QColor>
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
-#include <QtGui/QColor>
 
+class QColor;
 class QGeoCoordinate;
 
+Q_DECLARE_LOGGING_CATEGORY(KMLDomDocumentLog)
+
 /// Used to convert a Plan to a KML document
 class KMLDomDocument : public QDomDocument
 {
diff --git a/src/Utilities/Shape/KMLHelper.cc b/src/Utilities/Geo/KMLHelper.cc
similarity index 98%
rename from src/Utilities/Shape/KMLHelper.cc
rename to src/Utilities/Geo/KMLHelper.cc
index 1d2cf035b340..3ae82c34f93f 100644
--- a/src/Utilities/Shape/KMLHelper.cc
+++ b/src/Utilities/Geo/KMLHelper.cc
@@ -8,10 +8,13 @@
  ****************************************************************************/
 
 #include "KMLHelper.h"
+#include "QGCLoggingCategory.h"
 
 #include <QtCore/QFile>
 #include <QtXml/QDomDocument>
 
+QGC_LOGGING_CATEGORY(KMLHelperLog, "Utilities.KMLHelper")
+
 namespace KMLHelper
 {
     QDomDocument _loadFile(const QString &kmlFile, QString &errorString);
diff --git a/src/Utilities/Shape/KMLHelper.h b/src/Utilities/Geo/KMLHelper.h
similarity index 87%
rename from src/Utilities/Shape/KMLHelper.h
rename to src/Utilities/Geo/KMLHelper.h
index c489141cc523..5d4786e83f18 100644
--- a/src/Utilities/Shape/KMLHelper.h
+++ b/src/Utilities/Geo/KMLHelper.h
@@ -10,13 +10,16 @@
 #pragma once
 
 #include <QtCore/QList>
+#include <QtCore/QLoggingCategory>
 #include <QtPositioning/QGeoCoordinate>
 
 #include "ShapeFileHelper.h"
 
+Q_DECLARE_LOGGING_CATEGORY(KMLHelperLog)
+
 namespace KMLHelper
 {
-    ShapeFileHelper::ShapeType determineShapeType(const QString &kmlFile, QString &errorString);
+    ShapeFileHelper::ShapeType determineShapeType(const QString &file, QString &errorString);
     bool loadPolygonFromFile(const QString &kmlFile, QList<QGeoCoordinate> &vertices, QString &errorString);
     bool loadPolylineFromFile(const QString &kmlFile, QList<QGeoCoordinate> &coords, QString &errorString);
 };
diff --git a/src/Utilities/Geo/QGCGeo.cc b/src/Utilities/Geo/QGCGeo.cc
index 47da63b1003c..5870179099e4 100644
--- a/src/Utilities/Geo/QGCGeo.cc
+++ b/src/Utilities/Geo/QGCGeo.cc
@@ -23,7 +23,7 @@
 
 #include <limits>
 
-QGC_LOGGING_CATEGORY(QGCGeoLog, "qgc.utilities.geo.qgcgeo")
+QGC_LOGGING_CATEGORY(QGCGeoLog, "Utilities.QGCGeo")
 
 namespace
 {
diff --git a/src/Utilities/Shape/SHPFileHelper.cc b/src/Utilities/Geo/SHPFileHelper.cc
similarity index 99%
rename from src/Utilities/Shape/SHPFileHelper.cc
rename to src/Utilities/Geo/SHPFileHelper.cc
index 5a041d2d58a8..0ff063916aa3 100644
--- a/src/Utilities/Shape/SHPFileHelper.cc
+++ b/src/Utilities/Geo/SHPFileHelper.cc
@@ -10,12 +10,13 @@
 #include "SHPFileHelper.h"
 #include "QGCGeo.h"
 #include "QGCLoggingCategory.h"
-#include "shapefil.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QRegularExpression>
 
-QGC_LOGGING_CATEGORY(SHPFileHelperLog, "qgc.utilities.shpfilehelper");
+#include "shapefil.h"
+
+QGC_LOGGING_CATEGORY(SHPFileHelperLog, "Utilities.SHPFileHelper")
 
 namespace SHPFileHelper
 {
diff --git a/src/Utilities/Shape/SHPFileHelper.h b/src/Utilities/Geo/SHPFileHelper.h
similarity index 96%
rename from src/Utilities/Shape/SHPFileHelper.h
rename to src/Utilities/Geo/SHPFileHelper.h
index f55dfa9b7bd2..86c41077c357 100644
--- a/src/Utilities/Shape/SHPFileHelper.h
+++ b/src/Utilities/Geo/SHPFileHelper.h
@@ -19,7 +19,7 @@ Q_DECLARE_LOGGING_CATEGORY(SHPFileHelperLog)
 
 namespace SHPFileHelper
 {
-    ShapeFileHelper::ShapeType determineShapeType(const QString &shpFile, QString &errorString);
+    ShapeFileHelper::ShapeType determineShapeType(const QString &file, QString &errorString);
     bool loadPolygonFromFile(const QString &shpFile, QList<QGeoCoordinate> &vertices, QString &errorString);
     bool loadPolylineFromFile(const QString &shpFile, QList<QGeoCoordinate> &coords, QString &errorString);
 };
diff --git a/src/Utilities/Shape/ShapeFileHelper.cc b/src/Utilities/Geo/ShapeFileHelper.cc
similarity index 96%
rename from src/Utilities/Shape/ShapeFileHelper.cc
rename to src/Utilities/Geo/ShapeFileHelper.cc
index 7ab7518e94e0..9140e8e3dfdb 100644
--- a/src/Utilities/Shape/ShapeFileHelper.cc
+++ b/src/Utilities/Geo/ShapeFileHelper.cc
@@ -10,6 +10,9 @@
 #include "ShapeFileHelper.h"
 #include "KMLHelper.h"
 #include "SHPFileHelper.h"
+#include "QGCLoggingCategory.h"
+
+QGC_LOGGING_CATEGORY(ShapeFileHelperLog, "Utilities.ShapeFileHelper")
 
 bool ShapeFileHelper::_fileIsKML(const QString &file, QString &errorString)
 {
diff --git a/src/Utilities/Shape/ShapeFileHelper.h b/src/Utilities/Geo/ShapeFileHelper.h
similarity index 96%
rename from src/Utilities/Shape/ShapeFileHelper.h
rename to src/Utilities/Geo/ShapeFileHelper.h
index 558f37c0a6d6..330f8e48f6cd 100644
--- a/src/Utilities/Shape/ShapeFileHelper.h
+++ b/src/Utilities/Geo/ShapeFileHelper.h
@@ -10,10 +10,13 @@
 #pragma once
 
 #include <QtCore/QList>
+#include <QtCore/QLoggingCategory>
 #include <QtCore/QObject>
 #include <QtPositioning/QGeoCoordinate>
 #include <QtQmlIntegration/QtQmlIntegration>
 
+Q_DECLARE_LOGGING_CATEGORY(ShapeFileHelperLog)
+
 /// Routines for loading polygons or polylines from KML or SHP files.
 class ShapeFileHelper : public QObject
 {
diff --git a/src/Utilities/Geo/geographiclib.patch b/src/Utilities/Geo/geographiclib.patch
index ceb15de7b244..b21d5c1ec300 100644
--- a/src/Utilities/Geo/geographiclib.patch
+++ b/src/Utilities/Geo/geographiclib.patch
@@ -4,7 +4,7 @@ index 40d0b206..738d6c83 100644
 +++ b/CMakeLists.txt
 @@ -452,32 +452,32 @@ if (WIN32)
  endif ()
- 
+
  # The list of tools (to be installed into, e.g., /usr/local/bin)
 -set (TOOLS CartConvert ConicProj GeodesicProj GeoConvert GeodSolve
 -  GeoidEval Gravity IntersectTool MagneticField Planimeter RhumbSolve
@@ -17,9 +17,9 @@ index 40d0b206..738d6c83 100644
 -  geographiclib-get-magnetic)
 +# set (SCRIPTS geographiclib-get-geoids geographiclib-get-gravity
 +#   geographiclib-get-magnetic)
- 
+
  set_property (GLOBAL PROPERTY USE_FOLDERS ON)
- 
+
  # The list of subdirectories to process
  add_subdirectory (src)
  add_subdirectory (include/GeographicLib)
@@ -50,6 +50,6 @@ index 40d0b206..738d6c83 100644
 +# if (NOT RELEASE)
 +#   add_subdirectory (develop)
 +# endif ()
- 
+
  # make exampleprograms does a fresh cmake configuration and so uses
  # find_package to find the just-built version of GeographicLib (via the
diff --git a/src/Utilities/JsonHelper.cc b/src/Utilities/JsonHelper.cc
index 7191ce37116e..75a9ca0ceb71 100644
--- a/src/Utilities/JsonHelper.cc
+++ b/src/Utilities/JsonHelper.cc
@@ -22,13 +22,13 @@
 #include <QtCore/QObject>
 #include <QtCore/QTranslator>
 
-QGC_LOGGING_CATEGORY(JsonHelperLog, "qgc.utilities.jsonhelper")
+QGC_LOGGING_CATEGORY(JsonHelperLog, "Utilities.JsonHelper")
+
+Q_APPLICATION_STATIC(QTranslator, s_jsonTranslator);
 
 namespace JsonHelper
 {
     QString _jsonValueTypeToString(QJsonValue::Type type);
-    bool _loadGeoCoordinate(const QJsonValue &jsonValue, bool altitudeRequired, QGeoCoordinate &coordinate, QString &errorString, bool geoJsonFormat);
-    void _saveGeoCoordinate(const QGeoCoordinate &coordinate, bool writeAltitude, QJsonValue &jsonValue, bool geoJsonFormat);
     QStringList _addDefaultLocKeys(QJsonObject &jsonObject);
     QJsonObject _translateRoot(QJsonObject &jsonObject, const QString &translateContext, const QStringList &translateKeys);
     QJsonObject _translateObject(QJsonObject &jsonObject, const QString &translateContext, const QStringList &translateKeys);
@@ -40,7 +40,116 @@ namespace JsonHelper
     constexpr const char *_jsonGroundStationValue = "QGroundControl";
 }
 
-Q_APPLICATION_STATIC(QTranslator, s_jsonTranslator);
+QString JsonHelper::_jsonValueTypeToString(QJsonValue::Type type)
+{
+    struct TypeToString {
+        QJsonValue::Type type;
+        const char *string;
+    };
+
+    static constexpr const TypeToString rgTypeToString[] = {
+        { QJsonValue::Null, "NULL" },
+        { QJsonValue::Bool, "Bool" },
+        { QJsonValue::Double, "Double" },
+        { QJsonValue::String, "String" },
+        { QJsonValue::Array, "Array" },
+        { QJsonValue::Object, "Object" },
+        { QJsonValue::Undefined, "Undefined" },
+    };
+
+    for (const TypeToString &conv : rgTypeToString) {
+        if (type == conv.type) {
+            return conv.string;
+        }
+    }
+
+    return QObject::tr("Unknown type: %1").arg(type);
+}
+
+QStringList JsonHelper::_addDefaultLocKeys(QJsonObject &jsonObject)
+{
+    QString translateKeys;
+    const QString fileType = jsonObject[jsonFileTypeKey].toString();
+    if (!fileType.isEmpty()) {
+        if (fileType == MissionCommandList::qgcFileType) {
+            if (jsonObject.contains(_translateKeysKey)) {
+                translateKeys = jsonObject[_translateKeysKey].toString();
+            } else {
+                translateKeys = QStringLiteral("label,enumStrings,friendlyName,description,category");
+                jsonObject[_translateKeysKey] = translateKeys;
+            }
+
+            if (!jsonObject.contains(_arrayIDKeysKey)) {
+                jsonObject[_arrayIDKeysKey] = QStringLiteral("rawName,comment");
+            }
+        } else if (fileType == FactMetaData::qgcFileType) {
+            if (jsonObject.contains(_translateKeysKey)) {
+                translateKeys = jsonObject[_translateKeysKey].toString();
+            } else {
+                translateKeys = QStringLiteral("shortDesc,longDesc,enumStrings");
+                jsonObject[_translateKeysKey] = translateKeys;
+            }
+
+            if (!jsonObject.contains(_arrayIDKeysKey)) {
+                jsonObject[_arrayIDKeysKey] = QStringLiteral("name");
+            }
+        }
+    }
+
+    return translateKeys.split(",");
+}
+
+QJsonObject JsonHelper::_translateRoot(QJsonObject &jsonObject, const QString &translateContext, const QStringList &translateKeys)
+{
+    return _translateObject(jsonObject, translateContext, translateKeys);
+}
+
+QJsonObject JsonHelper::_translateObject(QJsonObject &jsonObject, const QString &translateContext, const QStringList &translateKeys)
+{
+    for (const QString &key: jsonObject.keys()) {
+        if (jsonObject[key].isString()) {
+            QString locString = jsonObject[key].toString();
+            if (!translateKeys.contains(key)) {
+                continue;
+            }
+
+            QString disambiguation;
+            QString disambiguationPrefix("#loc.disambiguation#");
+
+            if (locString.startsWith(disambiguationPrefix)) {
+                locString = locString.right(locString.length() - disambiguationPrefix.length());
+                const int commentEndIndex = locString.indexOf("#");
+                if (commentEndIndex != -1) {
+                    disambiguation = locString.left(commentEndIndex);
+                    locString = locString.right(locString.length() - disambiguation.length() - 1);
+                }
+            }
+
+            const QString xlatString = translator()->translate(translateContext.toUtf8().constData(), locString.toUtf8().constData(), disambiguation.toUtf8().constData());
+            if (!xlatString.isNull()) {
+                jsonObject[key] = xlatString;
+            }
+        } else if (jsonObject[key].isArray()) {
+            QJsonArray childJsonArray = jsonObject[key].toArray();
+            jsonObject[key] = _translateArray(childJsonArray, translateContext, translateKeys);
+        } else if (jsonObject[key].isObject()) {
+            QJsonObject childJsonObject = jsonObject[key].toObject();
+            jsonObject[key] = _translateObject(childJsonObject, translateContext, translateKeys);
+        }
+    }
+
+    return jsonObject;
+}
+
+QJsonArray JsonHelper::_translateArray(QJsonArray &jsonArray, const QString &translateContext, const QStringList &translateKeys)
+{
+    for (qsizetype i = 0; i < jsonArray.count(); i++) {
+        QJsonObject childJsonObject = jsonArray[i].toObject();
+        jsonArray[i] = _translateObject(childJsonObject, translateContext, translateKeys);
+    }
+
+    return jsonArray;
+}
 
 QTranslator *JsonHelper::translator()
 {
@@ -68,7 +177,7 @@ bool JsonHelper::validateRequiredKeys(const QJsonObject &jsonObject, const QStri
     return true;
 }
 
-bool JsonHelper::_loadGeoCoordinate(const QJsonValue &jsonValue, bool altitudeRequired, QGeoCoordinate &coordinate, QString &errorString, bool geoJsonFormat)
+bool JsonHelper::loadGeoCoordinate(const QJsonValue &jsonValue, bool altitudeRequired, QGeoCoordinate &coordinate, QString &errorString, bool geoJsonFormat)
 {
     if (!jsonValue.isArray()) {
         errorString = QObject::tr("value for coordinate is not array");
@@ -102,7 +211,7 @@ bool JsonHelper::_loadGeoCoordinate(const QJsonValue &jsonValue, bool altitudeRe
     return true;
 }
 
-void JsonHelper::_saveGeoCoordinate(const QGeoCoordinate &coordinate, bool writeAltitude, QJsonValue &jsonValue, bool geoJsonFormat)
+void JsonHelper::saveGeoCoordinate(const QGeoCoordinate &coordinate, bool writeAltitude, QJsonValue &jsonValue, bool geoJsonFormat)
 {
     QJsonArray coordinateArray;
 
@@ -119,26 +228,6 @@ void JsonHelper::_saveGeoCoordinate(const QGeoCoordinate &coordinate, bool write
     jsonValue = QJsonValue(coordinateArray);
 }
 
-bool JsonHelper::loadGeoCoordinate(const QJsonValue &jsonValue, bool altitudeRequired, QGeoCoordinate &coordinate, QString &errorString, bool geoJsonFormat)
-{
-    return _loadGeoCoordinate(jsonValue, altitudeRequired, coordinate, errorString, geoJsonFormat);
-}
-
-void JsonHelper::saveGeoCoordinate(const QGeoCoordinate &coordinate, bool writeAltitude, QJsonValue &jsonValue)
-{
-    _saveGeoCoordinate(coordinate, writeAltitude, jsonValue, false /* geoJsonFormat */);
-}
-
-bool JsonHelper::loadGeoJsonCoordinate(const QJsonValue &jsonValue, bool altitudeRequired, QGeoCoordinate &coordinate, QString &errorString)
-{
-    return _loadGeoCoordinate(jsonValue, altitudeRequired, coordinate, errorString, true /* geoJsonFormat */);
-}
-
-void JsonHelper::saveGeoJsonCoordinate(const QGeoCoordinate &coordinate, bool writeAltitude, QJsonValue &jsonValue)
-{
-    _saveGeoCoordinate(coordinate, writeAltitude, jsonValue, true /* geoJsonFormat */);
-}
-
 bool JsonHelper::validateKeyTypes(const QJsonObject &jsonObject, const QStringList &keys, const QList<QJsonValue::Type> &types, QString & errorString)
 {
     for (qsizetype i = 0; i < types.count(); i++) {
@@ -234,91 +323,6 @@ bool JsonHelper::validateExternalQGCJsonFile(const QJsonObject &jsonObject, cons
     return validateInternalQGCJsonFile(jsonObject, expectedFileType, minSupportedVersion, maxSupportedVersion, version, errorString);
 }
 
-QStringList JsonHelper::_addDefaultLocKeys(QJsonObject &jsonObject)
-{
-    QString translateKeys;
-    const QString fileType = jsonObject[jsonFileTypeKey].toString();
-    if (!fileType.isEmpty()) {
-        if (fileType == MissionCommandList::qgcFileType) {
-            if (jsonObject.contains(_translateKeysKey)) {
-                translateKeys = jsonObject[_translateKeysKey].toString();
-            } else {
-                translateKeys = QStringLiteral("label,enumStrings,friendlyName,description,category");
-                jsonObject[_translateKeysKey] = translateKeys;
-            }
-
-            if (!jsonObject.contains(_arrayIDKeysKey)) {
-                jsonObject[_arrayIDKeysKey] = QStringLiteral("rawName,comment");
-            }
-        } else if (fileType == FactMetaData::qgcFileType) {
-            if (jsonObject.contains(_translateKeysKey)) {
-                translateKeys = jsonObject[_translateKeysKey].toString();
-            } else {
-                translateKeys = QStringLiteral("shortDesc,longDesc,enumStrings");
-                jsonObject[_translateKeysKey] = translateKeys;
-            }
-
-            if (!jsonObject.contains(_arrayIDKeysKey)) {
-                jsonObject[_arrayIDKeysKey] = QStringLiteral("name");
-            }
-        }
-    }
-
-    return translateKeys.split(",");
-}
-
-QJsonObject JsonHelper::_translateObject(QJsonObject &jsonObject, const QString &translateContext, const QStringList &translateKeys)
-{
-    for (const QString &key: jsonObject.keys()) {
-        if (jsonObject[key].isString()) {
-            QString locString = jsonObject[key].toString();
-            if (!translateKeys.contains(key)) {
-                continue;
-            }
-
-            QString disambiguation;
-            QString disambiguationPrefix("#loc.disambiguation#");
-
-            if (locString.startsWith(disambiguationPrefix)) {
-                locString = locString.right(locString.length() - disambiguationPrefix.length());
-                const int commentEndIndex = locString.indexOf("#");
-                if (commentEndIndex != -1) {
-                    disambiguation = locString.left(commentEndIndex);
-                    locString = locString.right(locString.length() - disambiguation.length() - 1);
-                }
-            }
-
-            const QString xlatString = translator()->translate(translateContext.toUtf8().constData(), locString.toUtf8().constData(), disambiguation.toUtf8().constData());
-            if (!xlatString.isNull()) {
-                jsonObject[key] = xlatString;
-            }
-        } else if (jsonObject[key].isArray()) {
-            QJsonArray childJsonArray = jsonObject[key].toArray();
-            jsonObject[key] = _translateArray(childJsonArray, translateContext, translateKeys);
-        } else if (jsonObject[key].isObject()) {
-            QJsonObject childJsonObject = jsonObject[key].toObject();
-            jsonObject[key] = _translateObject(childJsonObject, translateContext, translateKeys);
-        }
-    }
-
-    return jsonObject;
-}
-
-QJsonArray JsonHelper::_translateArray(QJsonArray &jsonArray, const QString &translateContext, const QStringList &translateKeys)
-{
-    for (qsizetype i = 0; i < jsonArray.count(); i++) {
-        QJsonObject childJsonObject = jsonArray[i].toObject();
-        jsonArray[i] = _translateObject(childJsonObject, translateContext, translateKeys);
-    }
-
-    return jsonArray;
-}
-
-QJsonObject JsonHelper::_translateRoot(QJsonObject &jsonObject, const QString &translateContext, const QStringList &translateKeys)
-{
-    return _translateObject(jsonObject, translateContext, translateKeys);
-}
-
 QJsonObject JsonHelper::openInternalQGCJsonFile(const QString &jsonFilename, const QString &expectedFileType, int minSupportedVersion, int maxSupportedVersion, int &version, QString &errorString)
 {
     QFile jsonFile(jsonFilename);
@@ -442,32 +446,6 @@ bool JsonHelper::validateKeys(const QJsonObject &jsonObject, const QList<JsonHel
     return validateKeyTypes(jsonObject, keyList, typeList, errorString);
 }
 
-QString JsonHelper::_jsonValueTypeToString(QJsonValue::Type type)
-{
-    struct TypeToString {
-        QJsonValue::Type type;
-        const char *string;
-    };
-
-    static constexpr const TypeToString rgTypeToString[] = {
-        { QJsonValue::Null, "NULL" },
-        { QJsonValue::Bool, "Bool" },
-        { QJsonValue::Double, "Double" },
-        { QJsonValue::String, "String" },
-        { QJsonValue::Array, "Array" },
-        { QJsonValue::Object, "Object" },
-        { QJsonValue::Undefined, "Undefined" },
-    };
-
-    for (const TypeToString &conv : rgTypeToString) {
-        if (type == conv.type) {
-            return conv.string;
-        }
-    }
-
-    return QObject::tr("Unknown type: %1").arg(type);
-}
-
 bool JsonHelper::loadPolygon(const QJsonArray &polygonArray, QmlObjectListModel &list, QObject *parent, QString &errorString)
 {
     for (const QJsonValue &pointValue : polygonArray) {
diff --git a/src/Utilities/JsonHelper.h b/src/Utilities/JsonHelper.h
index bf03db8e6b63..2009af5bea22 100644
--- a/src/Utilities/JsonHelper.h
+++ b/src/Utilities/JsonHelper.h
@@ -57,7 +57,6 @@ namespace JsonHelper
     /// Validates the standard parts of a internal QGC json file (FactMetaData, ...):
     ///     jsonFileTypeKey - Required and checked to be equal to expectedFileType
     ///     jsonVersionKey - Required and checked to be below supportedMajorVersion, supportedMinorVersion
-    ///     jsonGroundStationKey - Required and checked to be string type
     /// @return false: validation failed, errorString set
     bool validateInternalQGCJsonFile(const QJsonObject &jsonObject,      ///< json object to validate
                                      const QString &expectedFileType,    ///< correct file type for file
@@ -109,27 +108,8 @@ namespace JsonHelper
     ///     Stored as array [ lat, lon, alt ]
     void saveGeoCoordinate(const QGeoCoordinate &coordinate,    ///< QGeoCoordinate to save
                            bool writeAltitude,                  ///< true: write altitude to json
-                           QJsonValue &jsonValue);              ///< json value to save to
-
-    /// Loads a QGeoCoordinate
-    ///     Stored as array [ lon, lat, alt ]
-    /// @return false: validation failed
-    bool loadGeoJsonCoordinate(const QJsonValue &jsonValue, ///< json value to load from
-                               bool altitudeRequired,       ///< true: altitude must be specified
-                               QGeoCoordinate &coordinate,  ///< returned QGeoCordinate
-                               QString &errorString);       ///< returned error string if load failure
-
-    /// Saves a QGeoCoordinate
-    ///     Stored as array [ lon, lat, alt ]
-    void saveGeoJsonCoordinate(const QGeoCoordinate &coordinate,    ///< QGeoCoordinate to save
-                               bool writeAltitude,                  ///< true: write altitude to json
-                               QJsonValue &jsonValue);              ///< json value to save to
-
-    /// Loads a polygon from an array
-    bool loadPolygon(const QJsonArray &polygonArray,    ///< Array of coordinates
-                     QmlObjectListModel &list,          ///< Empty list to add vertices to
-                     QObject *parent,                   ///< parent for newly allocated QGCQGeoCoordinates
-                     QString &errorString);             ///< returned error string if load failure
+                           QJsonValue &jsonValue,               ///< json value to save to
+                           bool geoJsonFormat = false);
 
     /// Loads a list of QGeoCoordinates from a json array
     /// @return false: validation failed
@@ -150,6 +130,12 @@ namespace JsonHelper
                                 bool writeAltitude,                     ///< true: write altitide value
                                 QJsonValue &jsonValue);                 ///< json value to save to
 
+    /// Loads a polygon from an array
+    bool loadPolygon(const QJsonArray &polygonArray,    ///< Array of coordinates
+                     QmlObjectListModel &list,          ///< Empty list to add vertices to
+                     QObject *parent,                   ///< parent for newly allocated QGCQGeoCoordinates
+                     QString &errorString);             ///< returned error string if load failure
+
     /// Saves a polygon to a json array
     void savePolygon(const QmlObjectListModel &list, ///< List which contains vertices
                      QJsonArray &polygonArray);      ///< Array to save into
diff --git a/src/Utilities/Platform.cc b/src/Utilities/Platform.cc
index 2181743e1cb2..ebf110bfd91d 100644
--- a/src/Utilities/Platform.cc
+++ b/src/Utilities/Platform.cc
@@ -1,22 +1,180 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
 #include "Platform.h"
 
-#ifdef Q_OS_MAC
-#include <CoreFoundation/CoreFoundation.h>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QProcessEnvironment>
+
+#include "QGCCommandLineParser.h"
+
+#ifdef Q_OS_ANDROID
+    #include "AndroidInterface.h"
+#endif
+
+#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID)
+    #include "SignalHandler.h"
+#endif
+
+#if defined(Q_OS_MACOS)
+    #include <CoreFoundation/CoreFoundation.h>
+#elif defined(Q_OS_WIN)
+    #include <qt_windows.h>
+    #include <iostream>
+    #include <iterator>  // std::size
+    #include <cwchar>    // swprintf
+    #if defined(_MSC_VER)
+        #include <crtdbg.h>
+        #include <stdlib.h>
+        #include <cstdio> // _snwprintf_s
+    #endif
+#endif
 
-void Platform::disableAppNapViaInfoDict()
+namespace {
+
+#if defined(Q_OS_MACOS)
+void disableAppNapViaInfoDict()
 {
     CFBundleRef bundle = CFBundleGetMainBundle();
-    if (!bundle) return;
+    if (!bundle) {
+        return;
+    }
+    CFMutableDictionaryRef infoDict = const_cast<CFMutableDictionaryRef>(CFBundleGetInfoDictionary(bundle));
+    if (infoDict) {
+        CFDictionarySetValue(infoDict, CFSTR("NSAppSleepDisabled"), kCFBooleanTrue);
+    }
+}
+#endif // Q_OS_MACOS
 
-    // CFBundleGetInfoDictionary returns the dictionary the OS already
-    // parsed from Info.plist.  Cast it to mutable so we can tweak it.
-    CFMutableDictionaryRef infoDict = (CFMutableDictionaryRef) CFBundleGetInfoDictionary(bundle);
+#if defined(Q_OS_WIN)
 
-    // Inject the key → true
-    if (infoDict) {
-        CFDictionarySetValue(infoDict,
-                             CFSTR("NSAppSleepDisabled"),
-                             kCFBooleanTrue);
+#if defined(_MSC_VER)
+int __cdecl WindowsCrtReportHook(int reportType, char* message, int* returnValue)
+{
+    if (message) {
+        std::cerr << message << std::endl;
+    }
+    if (reportType == _CRT_ASSERT) {
+        if (returnValue) {
+            *returnValue = 0;
+        }
+        return 1; // handled
+    }
+    return 0; // let CRT continue
+}
+
+void __cdecl WindowsPurecallHandler()
+{
+    (void) OutputDebugStringW(L"QGC: _purecall\n");
+}
+
+void WindowsInvalidParameterHandler([[maybe_unused]] const wchar_t* expression,
+                                    [[maybe_unused]] const wchar_t* function,
+                                    [[maybe_unused]] const wchar_t* file,
+                                    [[maybe_unused]] unsigned int line,
+                                    [[maybe_unused]] uintptr_t pReserved)
+{
+
+}
+#endif // _MSC_VER
+
+LPTOP_LEVEL_EXCEPTION_FILTER g_prevUef = nullptr;
+
+LONG WINAPI WindowsUnhandledExceptionFilter(EXCEPTION_POINTERS* ep)
+{
+    const DWORD code = (ep && ep->ExceptionRecord) ? ep->ExceptionRecord->ExceptionCode : 0;
+    wchar_t buf[128] = {};
+#if defined(_MSC_VER)
+    (void) _snwprintf_s(buf, _TRUNCATE, L"QGC: unhandled SEH 0x%08lX\n", static_cast<unsigned long>(code));
+#else
+    (void) swprintf(buf, static_cast<int>(std::size(buf)), L"QGC: unhandled SEH 0x%08lX\n", static_cast<unsigned long>(code));
+#endif
+    (void) OutputDebugStringW(buf);
+
+    const HANDLE h = GetStdHandle(STD_ERROR_HANDLE);
+    if (h && (h != INVALID_HANDLE_VALUE)) {
+        DWORD ignored = 0;
+        const char narrow[] = "QGC: unhandled SEH\n";
+        (void) WriteFile(h, narrow, (DWORD)sizeof(narrow) - 1, &ignored, nullptr);
     }
+
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+
+void setWindowsErrorModes(bool quietWindowsAsserts)
+{
+    (void) SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
+    g_prevUef = SetUnhandledExceptionFilter(WindowsUnhandledExceptionFilter);
+
+#if defined(_MSC_VER)
+    (void) _set_invalid_parameter_handler(WindowsInvalidParameterHandler);
+    (void) _set_purecall_handler(WindowsPurecallHandler);
+
+    if (quietWindowsAsserts) {
+        (void) _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+        (void) _CrtSetReportMode(_CRT_ERROR,  _CRTDBG_MODE_DEBUG);
+        (void) _CrtSetReportMode(_CRT_WARN,   _CRTDBG_MODE_DEBUG);
+        (void) _CrtSetReportHook2(_CRT_RPTHOOK_INSTALL, WindowsCrtReportHook);
+        (void) _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+        (void) _set_error_mode(_OUT_TO_STDERR);
+    }
+#else
+    Q_UNUSED(quietWindowsAsserts);
+#endif
+}
+#endif // Q_OS_WIN
+
+} // namespace
+
+void Platform::setupPreApp(const QGCCommandLineParser::CommandLineParseResult &cli)
+{
+#ifdef Q_OS_UNIX
+    if (!qEnvironmentVariableIsSet("QT_ASSUME_STDERR_HAS_CONSOLE")) {
+        (void) qputenv("QT_ASSUME_STDERR_HAS_CONSOLE", "1");
+    }
+    if (!qEnvironmentVariableIsSet("QT_FORCE_STDERR_LOGGING")) {
+        (void) qputenv("QT_FORCE_STDERR_LOGGING", "1");
+    }
+#endif
+
+#ifdef Q_OS_WIN
+    // (void) qputenv("QT_OPENGL_BUGLIST", ":/opengl/resources/opengl/buglist.json");
+    if (!qEnvironmentVariableIsSet("QT_WIN_DEBUG_CONSOLE")) {
+        (void) qputenv("QT_WIN_DEBUG_CONSOLE", "attach");
+    }
+    setWindowsErrorModes(cli.quietWindowsAsserts);
+#endif
+
+#ifdef Q_OS_MACOS
+    disableAppNapViaInfoDict();
+#endif
+
+    if (cli.useDesktopGL) {
+        QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
+    }
+
+    if (cli.useSwRast) {
+        QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
+    }
+
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+    QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents);
 }
+
+void Platform::setupPostApp()
+{
+#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID)
+    SignalHandler* signalHandler = new SignalHandler(QCoreApplication::instance());
+    (void) signalHandler->setupSignalHandlers();
 #endif
+
+#ifdef Q_OS_ANDROID
+    AndroidInterface::checkStoragePermissions();
+#endif
+}
diff --git a/src/Utilities/Platform.h b/src/Utilities/Platform.h
index 09073af0312b..516931f894b6 100644
--- a/src/Utilities/Platform.h
+++ b/src/Utilities/Platform.h
@@ -1,11 +1,24 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
 #pragma once
 
-#include <QtCore/QtSystemDetection>
+namespace QGCCommandLineParser {
+    struct CommandLineParseResult;
+}
 
 namespace Platform {
-#ifdef Q_OS_MAC
-    /// Prevent Apple's app nap from screwing us over
-    /// tip: the domain can be cross-checked on the command line with <defaults domains>
-    void disableAppNapViaInfoDict();
-#endif
-}
+
+// Call before constructing Q(Core)Application.
+void setupPreApp(const QGCCommandLineParser::CommandLineParseResult &cli);
+
+// Call after Q(Core)Application exists and logging is installed.
+void setupPostApp();
+
+} // namespace Platform
diff --git a/src/Utilities/QGC.cc b/src/Utilities/QGC.cc
index 69a562b8043a..b56de6f63df5 100644
--- a/src/Utilities/QGC.cc
+++ b/src/Utilities/QGC.cc
@@ -126,4 +126,39 @@ bool fuzzyCompare(double value1, double value2)
     }
 }
 
+bool fuzzyCompare(double value1, double value2, double tolerance)
+{
+    if (qIsNaN(value1) && qIsNaN(value2)) {
+        return true;
+    } else if (qIsNaN(value1) || qIsNaN(value2)) {
+        return false;
+    } else {
+        return fabs(value1 - value2) <= tolerance;
+    }
+}
+
+bool fuzzyCompare(float value1, float value2)
+{
+    if (qIsNaN(value1) && qIsNaN(value2)) {
+        return true;
+    } else if (qIsNaN(value1) || qIsNaN(value2)) {
+        return false;
+    } else if (value1 == value2) {
+        return true;
+    } else {
+        return qFuzzyCompare(value1, value2);
+    }
+}
+
+bool fuzzyCompare(float value1, float value2, float tolerance)
+{
+    if (qIsNaN(value1) && qIsNaN(value2)) {
+        return true;
+    } else if (qIsNaN(value1) || qIsNaN(value2)) {
+        return false;
+    } else {
+        return fabsf(value1 - value2) <= tolerance;
+    }
+}
+
 }
diff --git a/src/Utilities/QGC.h b/src/Utilities/QGC.h
index 3c5f55d2b79c..e0161b030716 100644
--- a/src/Utilities/QGC.h
+++ b/src/Utilities/QGC.h
@@ -18,6 +18,9 @@ namespace QGC
 
     /// Returns true if the two values are equal or close. Correctly handles 0 and NaN values.
     bool fuzzyCompare(double value1, double value2);
+    bool fuzzyCompare(float value1, float value2);
+    bool fuzzyCompare(double value1, double value2, double tolerance);
+    bool fuzzyCompare(float value1, float value2, float tolerance);
 
     quint32 crc32(const quint8 *src, unsigned len, unsigned state);
 }
diff --git a/src/Utilities/QGCCommandLineParser.cc b/src/Utilities/QGCCommandLineParser.cc
new file mode 100644
index 000000000000..58b596ecb7cc
--- /dev/null
+++ b/src/Utilities/QGCCommandLineParser.cc
@@ -0,0 +1,269 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "QGCCommandLineParser.h"
+
+#include <QtCore/QCommandLineOption>
+#include <QtCore/QCoreApplication>
+
+namespace QGCCommandLineParser {
+
+static const QString kOptSystemId        = QStringLiteral("system-id");
+static const QString kOptClearSettings   = QStringLiteral("clear-settings");
+static const QString kOptClearCache      = QStringLiteral("clear-cache");
+static const QString kOptLogging         = QStringLiteral("logging");
+static const QString kOptLogOutput       = QStringLiteral("log-output");
+static const QString kOptSimpleBoot      = QStringLiteral("simple-boot-test");
+static const QString kOptFakeMobile      = QStringLiteral("fake-mobile");
+static const QString kOptAllowMultiple   = QStringLiteral("allow-multiple");
+static const QString kOptUnittest        = QStringLiteral("unittest");
+static const QString kOptUnittestStress  = QStringLiteral("unittest-stress");
+static const QString kOptDesktop         = QStringLiteral("desktop");
+static const QString kOptSwrast          = QStringLiteral("swrast");
+static const QString kOptNoWinAssertUI   = QStringLiteral("no-windows-assert-ui");
+
+static QStringList normalizeArgs(const QStringList &args)
+{
+    QStringList out;
+    out.reserve(args.size() + 4);
+    for (const QString &arg : args) {
+        if (arg == QStringLiteral("--unittest")) {
+            out << arg << QString(); // empty value token prevents "Missing value"
+            continue;
+        }
+
+        if (arg.startsWith("--") && arg.contains(':')) {
+            const int idx = arg.indexOf(':');
+            const QString opt = arg.left(idx);
+            const QString val = arg.mid(idx + 1);
+            out << opt;
+            if (!val.isEmpty()) {
+                out << val;
+            } else if (opt == QStringLiteral("--unittest")) {
+                out << QString();
+            }
+        } else {
+            out << arg;
+        }
+    }
+    return out;
+}
+
+CommandLineParseResult parseCommandLine()
+{
+    CommandLineParseResult out{};
+    out.parser = std::make_unique<QCommandLineParser>();
+
+    QCommandLineParser& parser = *out.parser;
+    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+    parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsOptions);
+    parser.setApplicationDescription(QStringLiteral(QGC_APP_DESCRIPTION));
+
+    const QCommandLineOption helpOption = parser.addHelpOption();
+    const QCommandLineOption versionOption = parser.addVersionOption();
+
+    const QCommandLineOption systemIdOpt(
+        kOptSystemId,
+        QCoreApplication::translate("main", "MAVLink GCS system id."),
+        QCoreApplication::translate("main", "id"));
+    (void) parser.addOption(systemIdOpt);
+
+    const QCommandLineOption clearSettingsOpt(
+        kOptClearSettings,
+        QCoreApplication::translate("main", "Clear stored application settings."));
+    (void) parser.addOption(clearSettingsOpt);
+
+    const QCommandLineOption clearCacheOpt(
+        kOptClearCache,
+        QCoreApplication::translate("main", "Clear parameter and airframe caches."));
+    (void) parser.addOption(clearCacheOpt);
+
+    const QCommandLineOption loggingOpt(
+        kOptLogging,
+        QCoreApplication::translate("main", "Enable logging with optional rules string."),
+        QCoreApplication::translate("main", "rules"));
+    (void) parser.addOption(loggingOpt);
+
+    const QCommandLineOption logOutputOpt(
+        kOptLogOutput,
+        QCoreApplication::translate("main", "Log to console."));
+    (void) parser.addOption(logOutputOpt);
+
+    const QCommandLineOption simpleBootOpt(
+        kOptSimpleBoot,
+        QCoreApplication::translate("main", "Initialize subsystems and exit."));
+    (void) parser.addOption(simpleBootOpt);
+
+#if defined(QGC_UNITTEST_BUILD)
+    const QCommandLineOption unittestOpt(
+        kOptUnittest,
+        QCoreApplication::translate("main", "Run unit tests (optional filter value)."),
+        QCoreApplication::translate("main", "filter"));
+    (void) parser.addOption(unittestOpt);
+
+    const QCommandLineOption unittestStressOpt(
+        kOptUnittestStress,
+        QCoreApplication::translate("main", "Stress unit tests."),
+        QCoreApplication::translate("main", "count"));
+    (void) parser.addOption(unittestStressOpt);
+#endif
+
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    const QCommandLineOption fakeMobileOpt(
+        kOptFakeMobile,
+        QCoreApplication::translate("main", "Run with mobile-style UI."));
+    (void) parser.addOption(fakeMobileOpt);
+
+    const QCommandLineOption allowMultipleOpt(
+        kOptAllowMultiple,
+        QCoreApplication::translate("main", "Bypass single-instance guard."));
+    (void) parser.addOption(allowMultipleOpt);
+#endif
+
+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
+    const QCommandLineOption swrastOpt(
+        kOptSwrast,
+        QCoreApplication::translate("main", "Force software OpenGL."));
+    (void) parser.addOption(swrastOpt);
+#endif
+
+#ifdef Q_OS_WIN
+    const QCommandLineOption desktopOpt(
+        kOptDesktop,
+        QCoreApplication::translate("main", "Force Desktop OpenGL."));
+    (void) parser.addOption(desktopOpt);
+
+    const QCommandLineOption quietWinAssertOpt(
+        kOptNoWinAssertUI,
+        QCoreApplication::translate("main", "Disable Windows assert dialog boxes."));
+    (void) parser.addOption(quietWinAssertOpt);
+#endif
+
+    const QStringList normalizedArgs = normalizeArgs(QCoreApplication::arguments());
+    parser.process(normalizedArgs);
+
+    out.unknownOptions = parser.unknownOptionNames();
+#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
+    if (out.unknownOptions.contains(kOptFakeMobile) || out.unknownOptions.contains(kOptAllowMultiple)) {
+        out.statusCode = CommandLineParseResult::Status::Error;
+        out.errorString = QCoreApplication::translate("main", "--%1/--%2 are not supported on this platform.").arg(kOptFakeMobile, kOptAllowMultiple);
+        return out;
+    }
+#endif
+#ifndef Q_OS_WIN
+    if (out.unknownOptions.contains(kOptDesktop) || out.unknownOptions.contains(kOptSwrast) || out.unknownOptions.contains(kOptNoWinAssertUI)) {
+        out.statusCode = CommandLineParseResult::Status::Error;
+        out.errorString = QCoreApplication::translate("main", "--%1/--%2/--%3 are only supported on Windows.").arg(kOptDesktop, kOptSwrast, kOptNoWinAssertUI);
+        return out;
+    }
+#endif
+#if !defined(QGC_UNITTEST_BUILD)
+    if (out.unknownOptions.contains(kOptUnittest) || out.unknownOptions.contains(kOptUnittestStress)) {
+        out.statusCode = CommandLineParseResult::Status::Error;
+        out.errorString = QCoreApplication::translate("main", "--%1/--%2 options are only available in unittest builds.").arg(kOptUnittest, kOptUnittestStress);
+        return out;
+    }
+#endif
+    if (!out.unknownOptions.isEmpty()) {
+        out.statusCode = CommandLineParseResult::Status::Error;
+        out.errorString = QCoreApplication::translate("main", "Unknown options: %1").arg(out.unknownOptions.join(", "));
+        return out;
+    }
+
+    out.positional = parser.positionalArguments();
+    if (!out.positional.isEmpty()) {
+        out.statusCode = CommandLineParseResult::Status::Error;
+        out.errorString = QCoreApplication::translate("main", "Unexpected positional arguments: %1").arg(out.positional.join(", "));
+        return out;
+    }
+
+    if (parser.isSet(helpOption)) {
+        out.statusCode = CommandLineParseResult::Status::HelpRequested;
+        out.helpText = parser.helpText();
+        return out;
+    }
+
+    if (parser.isSet(versionOption)) {
+        out.statusCode = CommandLineParseResult::Status::VersionRequested;
+        out.versionText = QCoreApplication::applicationVersion();
+        return out;
+    }
+
+    if (parser.isSet(systemIdOpt)) {
+        const QString systemIdStr = parser.value(systemIdOpt);
+        bool ok = false;
+        const uint systemId = systemIdStr.toUInt(&ok);
+        if (!ok || (systemId < 1) || (systemId > 255)) {
+            out.statusCode = CommandLineParseResult::Status::Error;
+            out.errorString = QCoreApplication::translate("main", "Invalid System ID (must be 1-255): %1").arg(systemIdStr);
+            return out;
+        }
+        out.systemId = static_cast<quint8>(systemId);
+    }
+
+    out.clearSettingsOptions = parser.isSet(clearSettingsOpt);
+    out.clearCache = parser.isSet(clearCacheOpt);
+    if (parser.isSet(loggingOpt)) {
+        out.loggingOptions = parser.value(loggingOpt);
+    }
+    out.logOutput = parser.isSet(logOutputOpt);
+    out.simpleBootTest = parser.isSet(simpleBootOpt);
+
+#if defined(QGC_UNITTEST_BUILD)
+    if (parser.isSet(unittestOpt)) {
+        out.runningUnitTests = true;
+        const QStringList vals = parser.values(unittestOpt);
+        if (vals.isEmpty()) { // || ((vals.size() == 1) && vals.first().isEmpty())
+            // No ":name" given → run all tests
+            out.unitTests.clear();
+        } else {
+            // One or more ":name" values provided
+            out.unitTests = vals;
+        }
+    }
+
+    if (parser.isSet(unittestStressOpt)) {
+        out.runningUnitTests = true;
+        out.stressUnitTests = true;
+        const QString stress = parser.value(unittestStressOpt);
+        if (stress.isEmpty()) {
+            out.stressUnitTestsCount = 20;
+        } else {
+            bool ok = false;
+            const uint count = stress.toUInt(&ok);
+            if (!ok || (count == 0)) {
+                out.statusCode = CommandLineParseResult::Status::Error;
+                out.errorString = QCoreApplication::translate("main", "Invalid stress unit test count: %1").arg(count);
+                return out;
+            }
+            out.stressUnitTestsCount = count;
+        }
+    }
+#endif
+
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    out.fakeMobile = parser.isSet(fakeMobileOpt);
+    out.allowMultiple = parser.isSet(allowMultipleOpt);
+#endif
+
+#ifdef Q_OS_WIN
+    out.useDesktopGL = parser.isSet(desktopOpt);
+    out.quietWindowsAsserts = parser.isSet(quietWinAssertOpt);
+#endif
+
+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
+    out.useSwRast = parser.isSet(swrastOpt);
+#endif
+
+    out.statusCode = CommandLineParseResult::Status::Ok;
+
+    return out;
+}
+
+} // namespace QGCCommandLineParser
diff --git a/src/Utilities/QGCCommandLineParser.h b/src/Utilities/QGCCommandLineParser.h
new file mode 100644
index 000000000000..749140b39184
--- /dev/null
+++ b/src/Utilities/QGCCommandLineParser.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include <optional>
+
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QStringList>
+
+namespace QGCCommandLineParser {
+
+struct CommandLineParseResult
+{
+    enum class Status {
+        Ok,
+        Error,
+        VersionRequested,
+        HelpRequested
+    } statusCode = Status::Ok;
+
+    std::unique_ptr<QCommandLineParser> parser;
+
+    std::optional<QString> errorString;
+    QString helpText;
+    QString versionText;
+
+    QStringList positional;
+    QStringList unknownOptions;
+
+    std::optional<quint8> systemId;
+    bool clearSettingsOptions = false;
+    bool clearCache = false;
+    std::optional<QString> loggingOptions;
+    bool logOutput = false;
+    bool simpleBootTest = false;
+
+    bool runningUnitTests = false;
+    QStringList unitTests;
+    bool stressUnitTests = false;
+    uint stressUnitTestsCount = 0;
+
+    bool fakeMobile = false;
+    bool allowMultiple = false;
+
+    bool useDesktopGL = false;
+    bool useSwRast = false;
+    bool quietWindowsAsserts = false;
+};
+
+/// Parse the application's command-line arguments into result.
+CommandLineParseResult parseCommandLine();
+
+} // namespace QGCCommandLineParser
diff --git a/src/Utilities/QGCLogging.cc b/src/Utilities/QGCLogging.cc
index cbe499eab503..d1f06c4cee5e 100644
--- a/src/Utilities/QGCLogging.cc
+++ b/src/Utilities/QGCLogging.cc
@@ -18,26 +18,7 @@
 #include <QtCore/QStringListModel>
 #include <QtCore/QTextStream>
 
-QGC_LOGGING_CATEGORY(QGCLoggingLog, "qgc.utilities.qgclogging")
-
-#ifdef Q_OS_WIN
-
-#include <crtdbg.h>
-#include <windows.h>
-#include <iostream>
-
-/// CRT Report Hook installed using _CrtSetReportHook. We install this hook when
-/// we don't want asserts to pop a dialog on windows.
-static int WindowsCrtReportHook(int reportType, char *message, int *returnValue)
-{
-    Q_UNUSED(reportType);
-
-    std::cerr << message << std::endl;  // Output message to stderr
-    *returnValue = 0;                   // Don't break into debugger
-    return true;                        // We handled this fully ourselves
-}
-
-#endif
+QGC_LOGGING_CATEGORY(QGCLoggingLog, "Utilities.QGCLogging")
 
 Q_GLOBAL_STATIC(QGCLogging, _qgcLogging)
 
@@ -88,18 +69,10 @@ QGCLogging::~QGCLogging()
     qCDebug(QGCLoggingLog) << this;
 }
 
-void QGCLogging::installHandler(bool quietWindowsAsserts)
+void QGCLogging::installHandler()
 {
-#ifdef Q_OS_WIN
-    if (quietWindowsAsserts) {
-        _CrtSetReportHook(WindowsCrtReportHook);
-    }
-#else
-    Q_UNUSED(quietWindowsAsserts)
-#endif
-
     // Define the format for qDebug/qWarning/etc output
-    qSetMessagePattern(QStringLiteral("%{category}:: %{time process} - %{type}: %{message} (%{function}:%{line})"));
+    qSetMessagePattern(QStringLiteral("%{time process}%{if-warning} Warning:%{endif}%{if-critical} Critical:%{endif} %{message} - %{category} - (%{function}:%{line})"));
 
     // Install our custom handler
     defaultHandler = qInstallMessageHandler(msgHandler);
@@ -117,10 +90,8 @@ void QGCLogging::_threadsafeLog(const QString &message)
 {
     // Notify view of new row
     const int line = rowCount();
-    beginInsertRows(QModelIndex(), line, line);
     (void) QStringListModel::insertRows(line, 1);
     (void) setData(index(line, 0), message, Qt::DisplayRole);
-    endInsertRows();
 
     // Trim old entries to cap memory usage
     static constexpr const int kMaxLogRows = kMaxLogFileSize / 100;
diff --git a/src/Utilities/QGCLogging.h b/src/Utilities/QGCLogging.h
index eab624d0a25f..746712aac58c 100644
--- a/src/Utilities/QGCLogging.h
+++ b/src/Utilities/QGCLogging.h
@@ -28,7 +28,7 @@ class QGCLogging : public QStringListModel
     static QGCLogging *instance();
 
     /// Install Qt message handler to route logs through this class
-    static void installHandler(bool quietWindowsAsserts);
+    static void installHandler();
 
     /// Write current log messages to a file asynchronously
     Q_INVOKABLE void writeMessages(const QString &destFile);
diff --git a/src/Utilities/QGCLoggingCategory.cc b/src/Utilities/QGCLoggingCategory.cc
index d26b3c7e1480..5322fac09c4d 100644
--- a/src/Utilities/QGCLoggingCategory.cc
+++ b/src/Utilities/QGCLoggingCategory.cc
@@ -12,110 +12,193 @@
 #include <QtCore/QGlobalStatic>
 #include <QtCore/QSettings>
 
-QGC_LOGGING_CATEGORY(QGCLoggingCategoryRegisterLog, "qgc.utilities.qgcloggingcategory")
+QGC_LOGGING_CATEGORY(QGCLoggingCategoryRegisterLog, "Utilities.QGCLoggingCategoryManager")
 
-Q_GLOBAL_STATIC(QGCLoggingCategoryRegister, _QGCLoggingCategoryRegisterInstance);
+Q_GLOBAL_STATIC(QGCLoggingCategoryManager, _QGCLoggingCategoryManagerInstance);
 
-static QLoggingCategory::CategoryFilter defaultCategoryFilter = nullptr;
-
-static void qgcCategoryFilter(QLoggingCategory *category)
+QGCLoggingCategoryManager *QGCLoggingCategoryManager::instance()
 {
-    if (defaultCategoryFilter) {
-        defaultCategoryFilter(category);
-    }
-
-    // const QString categoryName = QString(category->categoryName());
-    // if (qstrncmp(category->categoryName(), "qgc.", 4) == 0) {
-        // QGCLoggingCategoryRegister::instance()->registerCategory(category->categoryName());
-        // category->setEnabled(QtDebugMsg, true);
-    // }
+    return _QGCLoggingCategoryManagerInstance();
 }
 
-QGCLoggingCategoryRegister *QGCLoggingCategoryRegister::instance()
+void QGCLoggingCategoryManager::_insertSorted(QmlObjectListModel* model, QGCLoggingCategoryItem* item)
 {
-    return _QGCLoggingCategoryRegisterInstance();
+    for (int i=0; i<model->count(); i++) {
+        auto existingItem = qobject_cast<QGCLoggingCategoryItem*>(model->get(i));
+        if (item->fullCategory < existingItem->fullCategory) {
+            model->insert(i, item);
+            return;
+        }
+    }
+    model->append(item);
 }
 
-QStringList QGCLoggingCategoryRegister::registeredCategories()
+void QGCLoggingCategoryManager::registerCategory(const QString &fullCategory)
 {
-    _registeredCategories.sort();
-    return _registeredCategories;
+    //qDebug() << "Registering logging full category" << fullCategory;
+
+    QString parentCategory;
+    QString childCategory(fullCategory);
+    auto currentParentModel = &_treeCategoryModel;
+
+    auto hierarchyIndex = fullCategory.indexOf(".");
+    if (hierarchyIndex != -1) {
+        parentCategory = fullCategory.left(hierarchyIndex);
+        childCategory = fullCategory.mid(hierarchyIndex + 1);
+        QString fullParentCategory = parentCategory + ".";
+        //qDebug() << "  Parent category" << parentCategory << "child category" << childCategory << "full parent category" << fullParentCategory;
+
+        bool found = false;
+        for (int j=0; j<currentParentModel->count(); j++) {
+            auto item = qobject_cast<QGCLoggingCategoryItem*>(currentParentModel->get(j));
+            if (item->fullCategory == fullParentCategory && item->children) {
+                //qDebug() << "  Found existing parent full category" << item->fullCategory;
+                currentParentModel = item->children;
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            auto newParentItem = new QGCLoggingCategoryItem(parentCategory, fullParentCategory, false /* enabled */, currentParentModel);
+            newParentItem->children = new QmlObjectListModel(newParentItem);
+            _insertSorted(&_flatCategoryModel, newParentItem);
+            _insertSorted(currentParentModel, newParentItem);
+            currentParentModel = newParentItem->children;
+            //qDebug() << "  New parent full category" << newParentItem->fullCategory;
+        }
+    }
+
+    auto categoryItem = new QGCLoggingCategoryItem(childCategory, fullCategory, false /* enabled */, currentParentModel);
+    _insertSorted(&_flatCategoryModel, categoryItem);
+    _insertSorted(currentParentModel, categoryItem);
+    //qDebug() << "  New category full category" << categoryItem->fullCategory << "childCategory" << childCategory;
 }
 
-void QGCLoggingCategoryRegister::setCategoryLoggingOn(const QString &category, bool enable)
+void QGCLoggingCategoryManager::setCategoryLoggingOn(const QString &fullCategoryName, bool enable)
 {
-    QSettings settings;
+    qCDebug(QGCLoggingCategoryRegisterLog) << "Set category logging" << fullCategoryName << enable;
 
+    QSettings settings;
     settings.beginGroup(kFilterRulesSettingsGroup);
-    settings.setValue(category, enable);
+    if (enable) {
+        settings.setValue(fullCategoryName, enable);
+    } else {
+        settings.remove(fullCategoryName);
+    }
 
-    settings.endGroup();
+    setFilterRulesFromSettings(QString());
 }
 
-bool QGCLoggingCategoryRegister::categoryLoggingOn(const QString &category)
+bool QGCLoggingCategoryManager::categoryLoggingOn(const QString &fullCategoryName)
 {
     QSettings settings;
 
     settings.beginGroup(kFilterRulesSettingsGroup);
-    return settings.value(category, false).toBool();
+    return settings.value(fullCategoryName, false).toBool();
 }
 
-void QGCLoggingCategoryRegister::setFilterRulesFromSettings(const QString &commandLineLoggingOptions) const
+void QGCLoggingCategoryManager::setFilterRulesFromSettings(const QString &commandLineLoggingOptions)
 {
-    static const QString filterRuleFormat = QStringLiteral("%1.debug=true\n");
-    bool videoAllLogSet = false;
-
     QString filterRules;
-    filterRules += QStringLiteral("*Log.debug=false\n");
-    filterRules += QStringLiteral("qgc.*.debug=false\n");
-
-    // Set up filters defined in settings
-    for (const QString &category : std::as_const(_registeredCategories)) {
-        if (categoryLoggingOn(category)) {
-            filterRules += filterRuleFormat.arg(category);
-            if (category == kVideoAllLogCategory) {
-                videoAllLogSet = true;
+    QString filterRuleFormat("%1.debug=true\n");
+
+    QSettings settings;
+    settings.beginGroup(kFilterRulesSettingsGroup);
+    for (const QString &fullCategoryName : settings.childKeys()) {
+        QString parentCategory;
+        QString childCategory;
+        _splitFullCategoryName(fullCategoryName, parentCategory, childCategory);
+
+        qCDebug(QGCLoggingCategoryRegisterLog) << "Setting filter rule for saved settings" << fullCategoryName << parentCategory << childCategory << settings.value(fullCategoryName).toBool();
+
+        auto categoryItem = _findLoggingCategory(fullCategoryName);
+        if (categoryItem) {
+            categoryItem->setEnabled(settings.value(fullCategoryName).toBool());
+            if (categoryItem->enabled()) {
+                if (childCategory.isEmpty()) {
+                    // Wildcard parent category
+                    filterRules += filterRuleFormat.arg(fullCategoryName + "*");
+                } else {
+                    filterRules += filterRuleFormat.arg(fullCategoryName);
+                }
             }
+        } else {
+            qCWarning(QGCLoggingCategoryRegisterLog) << "Category not found for saved settings" << fullCategoryName;
         }
     }
 
     // Command line rules take precedence, so they go last in the list
     if (!commandLineLoggingOptions.isEmpty()) {
-        const QStringList logList = commandLineLoggingOptions.split(",");
+        const QStringList categoryList = commandLineLoggingOptions.split(",");
 
-        if (logList[0] == QStringLiteral("full")) {
-            filterRules += QStringLiteral("*Log.debug=true\n");
-            for (const QString &log : logList) {
-                filterRules += filterRuleFormat.arg(log);
-            }
+        if (categoryList[0] == QStringLiteral("full")) {
+            filterRules += filterRuleFormat.arg("*");
         } else {
-            for (const QString &category: logList) {
+            for (const QString &category: categoryList) {
                 filterRules += filterRuleFormat.arg(category);
-                if (category == kVideoAllLogCategory) {
-                    videoAllLogSet = true;
-                }
             }
         }
     }
 
-    if (videoAllLogSet) {
-        filterRules += filterRuleFormat.arg("qgc.videomanager.videomanager");
-        filterRules += filterRuleFormat.arg("qgc.videomanager.subtitlewriter");
-        filterRules += filterRuleFormat.arg("qgc.videomanager.videoreceiver.gstreamer");
-        filterRules += filterRuleFormat.arg("qgc.videomanager.videoreceiver.gstreamer.gstvideoreceiver");
-        filterRules += filterRuleFormat.arg("qgc.videomanager.videoreceiver.qtmultimedia.qtmultimediareceiver");
-        filterRules += filterRuleFormat.arg("qgc.videomanager.videoreceiver.qtmultimedia.uvcreceiver");
+    filterRules += QStringLiteral("qt.qml.connections=false");
+
+    qCDebug(QGCLoggingCategoryRegisterLog) << "Filter rules" << filterRules;
+    QLoggingCategory::setFilterRules(filterRules);
+}
+
+void QGCLoggingCategoryManager::_splitFullCategoryName(const QString &fullCategoryName, QString &parentCategory, QString &childCategory)
+{
+    const int hierarchyIndex = fullCategoryName.indexOf(".");
+    if (hierarchyIndex == -1) {
+        parentCategory = QString();
+        childCategory = fullCategoryName;
+    } else {
+        parentCategory = fullCategoryName.left(hierarchyIndex);
+        childCategory = fullCategoryName.mid(hierarchyIndex + 1);
+    }
+}
+
+void QGCLoggingCategoryManager::disableAllCategories()
+{
+    QSettings settings;
+    settings.beginGroup(kFilterRulesSettingsGroup);
+    settings.remove("");
+
+    for (int i=0; i<_flatCategoryModel.count(); i++) {
+        auto item = qobject_cast<QGCLoggingCategoryItem*>(_flatCategoryModel.get(i));
+        item->setEnabled(false);
+    }
+
+    setFilterRulesFromSettings(QString());
+}
+
+QGCLoggingCategoryItem *QGCLoggingCategoryManager::_findLoggingCategory(const QString &fullCategoryName)
+{
+    for (int i=0; i<_flatCategoryModel.count(); i++) {
+        auto item = qobject_cast<QGCLoggingCategoryItem*>(_flatCategoryModel.get(i));
+        if (item->fullCategory == fullCategoryName) {
+            return item;
+        }
     }
 
-    // Logging from GStreamer library itself controlled by gstreamer debug levels is always turned on
-    filterRules += filterRuleFormat.arg("qgc.videomanager.videoreceiver.gstreamer.api");
+    return nullptr;
+}
 
-    filterRules += QStringLiteral("qt.qml.connections=false");
+QGCLoggingCategoryItem::QGCLoggingCategoryItem(const QString& _shortCategory, const QString& _fullCategory, bool _enabled, QObject* parent)
+    : QObject(parent)
+    , shortCategory(_shortCategory)
+    , fullCategory(_fullCategory)
+    , _enabled(_enabled)
+{
+    connect(this, &QGCLoggingCategoryItem::enabledChanged, this, [this]() {
+        QGCLoggingCategoryManager::instance()->setCategoryLoggingOn(this->fullCategory, this->_enabled);
+    });
+}
 
-    qCDebug(QGCLoggingCategoryRegisterLog) << "Filter rules" << filterRules;
-    const QLoggingCategory::CategoryFilter categoryFilter = QLoggingCategory::installFilter(qgcCategoryFilter);
-    if (!defaultCategoryFilter) {
-        defaultCategoryFilter = categoryFilter;
+void QGCLoggingCategoryItem::setEnabled(bool enabled)
+{
+    if (enabled != _enabled) {
+        _enabled = enabled;
+        emit enabledChanged();
     }
-    QLoggingCategory::setFilterRules(filterRules);
 }
diff --git a/src/Utilities/QGCLoggingCategory.h b/src/Utilities/QGCLoggingCategory.h
index 89a08a302d95..1489dd2a7eb2 100644
--- a/src/Utilities/QGCLoggingCategory.h
+++ b/src/Utilities/QGCLoggingCategory.h
@@ -9,44 +9,63 @@
 
 #pragma once
 
+#include "QmlObjectListModel.h"
+
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
+#include <QtCore/QMap>
+
+class QGCLoggingCategoryItem;
 
 /// This is a QGC specific replacement for Q_LOGGING_CATEGORY. It will register the category name into a
 /// global list. It's usage is the same as Q_LOGGING_CATEOGRY.
-#define QGC_LOGGING_CATEGORY(name, ...) \
-    static QGCLoggingCategory qgcCategory ## name (__VA_ARGS__); \
-    Q_LOGGING_CATEGORY(name, __VA_ARGS__)
+#define QGC_LOGGING_CATEGORY(name, categoryStr) \
+    static QGCLoggingCategory qgcCategory ## name (categoryStr); \
+    Q_LOGGING_CATEGORY(name, categoryStr, QtWarningMsg)
+
+#define QGC_LOGGING_CATEGORY_ON(name, categoryStr) \
+    static QGCLoggingCategory qgcCategory ## name (categoryStr); \
+    Q_LOGGING_CATEGORY(name, categoryStr, QtInfoMsg)
 
-class QGCLoggingCategoryRegister : public QObject
+class QGCLoggingCategoryManager : public QObject
 {
     Q_GADGET
 
 public:
-    static QGCLoggingCategoryRegister *instance();
+    static QGCLoggingCategoryManager *instance();
 
     /// Registers the specified logging category to the system.
-    void registerCategory(const QString &category) { _registeredCategories << category; }
+    void registerCategory(const QString &category);
 
-    /// Returns the list of available logging category names.
-    Q_INVOKABLE QStringList registeredCategories();
+    /// Returns the hierarchical list of available logging category names.
+    QmlObjectListModel *treeCategoryModel() { return &_treeCategoryModel; }
 
-    /// Turns on/off logging for the specified category. State is saved in app settings.
-    Q_INVOKABLE static void setCategoryLoggingOn(const QString &category, bool enable);
+    /// Returns the flat list of available logging category names.
+    QmlObjectListModel *flatCategoryModel() { return &_flatCategoryModel; }
 
     /// Returns true if logging is turned on for the specified category.
-    Q_INVOKABLE static bool categoryLoggingOn(const QString &category);
+    static bool categoryLoggingOn(const QString &fullCategroryName);
 
     /// Sets the logging filters rules from saved settings.
     ///     @param commandLineLogggingOptions Logging options which were specified on the command line
-    void setFilterRulesFromSettings(const QString &commandLineLoggingOptions) const;
+    void setFilterRulesFromSettings(const QString &commandLineLoggingOptions);
+
+    void disableAllCategories();
+
+public slots:
+    /// Turns on/off logging for the specified category. State is saved in app settings.
+    void setCategoryLoggingOn(const QString &fullCategoryName, bool enable);
 
 private:
-    QStringList _registeredCategories;
+    static void _splitFullCategoryName(const QString &fullCategoryName, QString &parentCategory, QString &childCategory);
+    QGCLoggingCategoryItem *_findLoggingCategory(const QString &fullCategoryName);
+    void _insertSorted(QmlObjectListModel* model, QGCLoggingCategoryItem* item);
+
+    QmlObjectListModel _treeCategoryModel;
+    QmlObjectListModel _flatCategoryModel;
 
     static constexpr const char *kFilterRulesSettingsGroup = "LoggingFilters";
-    static constexpr const char *kVideoAllLogCategory = "VideoAllLog";
 };
 
 /*===========================================================================*/
@@ -54,5 +73,32 @@ class QGCLoggingCategoryRegister : public QObject
 class QGCLoggingCategory
 {
 public:
-    QGCLoggingCategory(const QString &category) { QGCLoggingCategoryRegister::instance()->registerCategory(category); }
+    QGCLoggingCategory(const QString &category) { QGCLoggingCategoryManager::instance()->registerCategory(category); }
+};
+
+class QGCLoggingCategoryItem : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString  shortCategory   MEMBER shortCategory   CONSTANT)
+    Q_PROPERTY(QString  fullCategory    MEMBER fullCategory    CONSTANT)
+    Q_PROPERTY(bool     enabled         READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(bool     expanded        MEMBER expanded        NOTIFY expandedChanged)
+    Q_PROPERTY(QmlObjectListModel* children MEMBER children CONSTANT)
+
+public:
+    QGCLoggingCategoryItem(const QString& shortCategory, const QString& fullCategory, bool enabled, QObject* parent = nullptr);
+
+    bool enabled() const { return _enabled; }
+    void setEnabled(bool enabled);
+
+    QString shortCategory;
+    QString fullCategory;
+    bool _enabled = false;
+    bool expanded = false;
+    QmlObjectListModel* children = nullptr;
+
+signals:
+    void enabledChanged();
+    void expandedChanged();
 };
diff --git a/src/Utilities/Shape/CMakeLists.txt b/src/Utilities/Shape/CMakeLists.txt
deleted file mode 100644
index 7dde5199c7d7..000000000000
--- a/src/Utilities/Shape/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-target_sources(${CMAKE_PROJECT_NAME}
-    PRIVATE
-        KMLDomDocument.cc
-        KMLDomDocument.h
-        KMLHelper.cc
-        KMLHelper.h
-        ShapeFileHelper.cc
-        ShapeFileHelper.h
-        SHPFileHelper.cc
-        SHPFileHelper.h
-)
-
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-#===========================================================================#
-
-CPMAddPackage(
-    NAME Shapelib
-    VERSION 1.6.1
-    GITHUB_REPOSITORY OSGeo/shapelib
-    OPTIONS
-        "BUILD_SHAPELIB_CONTRIB OFF"
-        "BUILD_APPS OFF"
-        "BUILD_TESTING OFF"
-)
-
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE shp)
diff --git a/src/Utilities/SignalHandler.cc b/src/Utilities/SignalHandler.cc
index cc378b1ed433..eee6f40c0a75 100644
--- a/src/Utilities/SignalHandler.cc
+++ b/src/Utilities/SignalHandler.cc
@@ -8,119 +8,241 @@
  ****************************************************************************/
 
 #include "SignalHandler.h"
-#include "QGCApplication.h"
-#include "QGCLoggingCategory.h"
 
-#include <QtCore/QGlobalStatic>
+#include <QtCore/QCoreApplication>
+#ifdef Q_OS_WIN
+#include <QtCore/QWinEventNotifier>
+#else
 #include <QtCore/QSocketNotifier>
-#include <QtQuick/QQuickWindow>
+#endif
 
-#include <sys/signal.h>
-#include <sys/socket.h>
+#include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(SignalHandlerLog, "qgc.utilities.signalhandler")
+QGC_LOGGING_CATEGORY(SignalHandlerLog, "Utilities.SignalHandler")
 
-int SignalHandler::sigIntFd[2] = {0, 0};
-int SignalHandler::sigTermFd[2] = {0, 0};
+std::atomic<SignalHandler*> SignalHandler::s_current{nullptr};
 
-Q_GLOBAL_STATIC(SignalHandler, _signalHandlerInstance);
+SignalHandler::SignalHandler(QObject* parent)
+    : QObject(parent)
+{
+    s_current.store(this, std::memory_order_release);
+    qCDebug(SignalHandlerLog) << this;
+}
 
-SignalHandler *SignalHandler::instance()
+#ifdef Q_OS_WIN
+
+#include <QtCore/QWinEventNotifier>
+#include <qt_windows.h>
+
+/// Plain C thunk with Windows signature. Delegates to class static.
+static BOOL WINAPI _consoleCtrlHandler(DWORD evt)
 {
-    return _signalHandlerInstance();
+    return SignalHandler::consoleCtrlHandler(static_cast<unsigned long>(evt)) ? TRUE : FALSE;
 }
 
-SignalHandler::SignalHandler(QObject *parent)
-    : QObject(parent)
+int SignalHandler::consoleCtrlHandler(unsigned long evt)
 {
-    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigIntFd)) {
-       qCFatal(SignalHandlerLog) << "Couldn't create INT socketpair";
+    switch (evt) {
+    case CTRL_C_EVENT:
+    case CTRL_BREAK_EVENT:
+    case CTRL_CLOSE_EVENT:
+    case CTRL_LOGOFF_EVENT:
+    case CTRL_SHUTDOWN_EVENT: {
+        SignalHandler* self = SignalHandler::current();
+        if (!self || !self->_signalEvent || (self->_signalEvent == reinterpret_cast<Qt::HANDLE>(INVALID_HANDLE_VALUE))) {
+            return 0;
+        }
+        (void) SetEvent(static_cast<HANDLE>(self->_signalEvent)); // non-blocking
+        return 1;
     }
-    _notifierInt = new QSocketNotifier(sigIntFd[1], QSocketNotifier::Read, this);
-    (void) connect(_notifierInt, &QSocketNotifier::activated, this, &SignalHandler::_onSigInt);
-
-    if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigTermFd)) {
-       qCFatal(SignalHandlerLog) << "Couldn't create TERM socketpair";
+    default:
+        return 0;
     }
-    _notifierTerm = new QSocketNotifier(sigTermFd[1], QSocketNotifier::Read, this);
-    (void) connect(_notifierTerm, &QSocketNotifier::activated, this, &SignalHandler::_onSigTerm);
 }
 
-void SignalHandler::_onSigInt()
+SignalHandler::~SignalHandler()
 {
-    _notifierInt->setEnabled(false);
-    char b;
-    (void) ::read(sigIntFd[1], &b, sizeof(b));
-
-    _sigIntCount++;
-
-    if (_sigIntCount == 1) {
-        qCDebug(SignalHandlerLog) << "Caught SIGINT—press Ctrl+C again to exit immediately";
+    if (_notifier) {
+        _notifier->setEnabled(false);
+    }
 
-        if (qgcApp() && qgcApp()->mainRootWindow()) {
-            (void) qgcApp()->mainRootWindow()->close();
-            QEvent ev(QEvent::Quit);
-            (void) qgcApp()->event(&ev);
-        }
-    } else {
-        qCDebug(SignalHandlerLog) << "Caught second SIGINT—exiting immediately";
-        _exit(0);
+    if (_signalEvent && (_signalEvent != reinterpret_cast<Qt::HANDLE>(INVALID_HANDLE_VALUE))) {
+        (void) CloseHandle(static_cast<HANDLE>(_signalEvent));
+        _signalEvent = reinterpret_cast<Qt::HANDLE>(INVALID_HANDLE_VALUE);
     }
 
-    _notifierInt->setEnabled(true);
+    (void) SetConsoleCtrlHandler(&_consoleCtrlHandler, FALSE);
+    s_current.store(nullptr, std::memory_order_release);
+
+    qCDebug(SignalHandlerLog) << this;
 }
 
-void SignalHandler::_onSigTerm()
+int SignalHandler::setupSignalHandlers()
 {
-    _notifierTerm->setEnabled(false);
-    char b;
-    (void) ::read(sigTermFd[1], &b, sizeof(b));
+    // Create auto-reset event. Initial state = non-signaled.
+    _signalEvent = reinterpret_cast<Qt::HANDLE>(CreateEventW(/*lpEventAttributes*/ nullptr, /*bManualReset*/ FALSE, /*bInitialState*/ FALSE, /*lpName*/ nullptr));
+    if (!_signalEvent || (_signalEvent == reinterpret_cast<Qt::HANDLE>(INVALID_HANDLE_VALUE))) {
+        return 1;
+    }
 
-    qCDebug(SignalHandlerLog) << "Caught SIGTERM—shutting down gracefully";
-    if (qgcApp() && qgcApp()->mainRootWindow()) {
-        (void) qgcApp()->mainRootWindow()->close();
-        QEvent ev(QEvent::Quit);
-        (void) qgcApp()->event(&ev);
+    _notifier = new QWinEventNotifier(static_cast<HANDLE>(_signalEvent), this);
+    (void) connect(_notifier, &QWinEventNotifier::activated, this, [this]([[maybe_unused]] HANDLE handle) {
+        // Auto-reset event already consumed. No drain needed.
+        if (!std::exchange(_sigIntTriggered, true)) {
+            qCDebug(SignalHandlerLog) << "Console event—press Ctrl+C again to exit immediately";
+            QCoreApplication::quit();
+        } else {
+            qCDebug(SignalHandlerLog) << "Caught second SIGINT—exiting immediately";
+            _exit(0);
+        }
+    });
+
+    if (!SetConsoleCtrlHandler(&_consoleCtrlHandler, TRUE)) {
+        return 2;
     }
 
-    _notifierTerm->setEnabled(true);
+    return 0;
 }
 
-void SignalHandler::intSignalHandler(int signum)
-{
-    Q_ASSERT(signum == SIGINT);
+#else // POSIX
 
-    char b = 1;
-    (void) ::write(sigIntFd[0], &b, sizeof(b));
-}
+#include <signal.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include <QtCore/QSocketNotifier>
 
-void SignalHandler::termSignalHandler(int signum)
+SignalHandler::~SignalHandler()
 {
-    Q_ASSERT(signum == SIGTERM);
+    struct sigaction sa{};
+    sa.sa_handler = SIG_DFL;
+    (void) sigaction(SIGINT, &sa, nullptr);
+    (void) sigaction(SIGTERM, &sa, nullptr);
 
-    char b = 1;
-    (void) ::write(sigTermFd[0], &b, sizeof(b));
+    if (_notifierInt) {
+        _notifierInt->setEnabled(false);
+    }
+    if (_notifierTerm) {
+        _notifierTerm->setEnabled(false);
+    }
+
+    if (_sigIntFd[0] >= 0) {
+        (void) ::close(_sigIntFd[0]);
+        _sigIntFd[0] = -1;
+    }
+    if (_sigIntFd[1] >= 0) {
+        (void) ::close(_sigIntFd[1]);
+        _sigIntFd[1] = -1;
+    }
+    if (_sigTermFd[0] >= 0) {
+        (void) ::close(_sigTermFd[0]);
+        _sigTermFd[0] = -1;
+    }
+    if (_sigTermFd[1] >= 0) {
+        (void) ::close(_sigTermFd[1]);
+        _sigTermFd[1] = -1;
+    }
+
+    s_current.store(nullptr, std::memory_order_release);
+    qCDebug(SignalHandlerLog) << this;
 }
 
 int SignalHandler::setupSignalHandlers()
 {
+    // Datagram socketpairs: read end = [0], write end = [1]
+    if (::socketpair(AF_UNIX, SOCK_DGRAM, 0, _sigIntFd)) {
+        qCCritical(SignalHandlerLog) << "Failed to create SIGINT socketpair:" << strerror(errno);
+        return 1;
+    }
+    if (::socketpair(AF_UNIX, SOCK_DGRAM, 0, _sigTermFd)) {
+        qCCritical(SignalHandlerLog) << "Failed to create SIGTERM socketpair:" << strerror(errno);
+        return 2;
+    }
+
+    // Close-on-exec to prevent fd leaks into children
+    (void) fcntl(_sigIntFd[0],  F_SETFD, fcntl(_sigIntFd[0],  F_GETFD, 0) | FD_CLOEXEC);
+    (void) fcntl(_sigIntFd[1],  F_SETFD, fcntl(_sigIntFd[1],  F_GETFD, 0) | FD_CLOEXEC);
+    (void) fcntl(_sigTermFd[0], F_SETFD, fcntl(_sigTermFd[0], F_GETFD, 0) | FD_CLOEXEC);
+    (void) fcntl(_sigTermFd[1], F_SETFD, fcntl(_sigTermFd[1], F_GETFD, 0) | FD_CLOEXEC);
+
+    // Non-blocking read ends
+    (void) fcntl(_sigIntFd[0],  F_SETFL, fcntl(_sigIntFd[0],  F_GETFL, 0) | O_NONBLOCK);
+    (void) fcntl(_sigTermFd[0], F_SETFL, fcntl(_sigTermFd[0], F_GETFL, 0) | O_NONBLOCK);
+
+    _notifierInt  = new QSocketNotifier(_sigIntFd[0],  QSocketNotifier::Read, this);
+    _notifierTerm = new QSocketNotifier(_sigTermFd[0], QSocketNotifier::Read, this);
+    (void) connect(_notifierInt,  &QSocketNotifier::activated, this, &SignalHandler::_onSigInt);
+    (void) connect(_notifierTerm, &QSocketNotifier::activated, this, &SignalHandler::_onSigTerm);
+
     struct sigaction sa_int{};
-    sa_int.sa_handler = SignalHandler::intSignalHandler;
-    (void) sigemptyset(&sa_int.sa_mask);
+    sigemptyset(&sa_int.sa_mask);
     sa_int.sa_flags = 0;
-    sa_int.sa_flags |= SA_RESTART;
+    sa_int.sa_handler = SignalHandler::_intSignalHandler;
     if (sigaction(SIGINT, &sa_int, nullptr)) {
-        return 1;
+        return 3;
     }
 
     struct sigaction sa_term{};
-    sa_term.sa_handler = SignalHandler::termSignalHandler;
-    (void) sigemptyset(&sa_term.sa_mask);
+    sigemptyset(&sa_term.sa_mask);
     sa_term.sa_flags = 0;
-    sa_term.sa_flags |= SA_RESTART;
+    sa_term.sa_handler = SignalHandler::_termSignalHandler;
     if (sigaction(SIGTERM, &sa_term, nullptr)) {
-        return 2;
+        return 4;
     }
 
     return 0;
 }
+
+void SignalHandler::_onSigInt()
+{
+    char b;
+    [[maybe_unused]] const ssize_t n = ::read(_sigIntFd[0], &b, 1); // single-byte drain
+
+    if (!std::exchange(_sigIntTriggered, true)) {
+        qCInfo(SignalHandlerLog) << "Caught SIGINT—press Ctrl+C again to exit immediately";
+        QCoreApplication::quit();
+    } else {
+        qCDebug(SignalHandlerLog) << "Caught second SIGINT—exiting immediately";
+        _exit(0);
+    }
+}
+
+void SignalHandler::_onSigTerm()
+{
+    char b;
+    [[maybe_unused]] const ssize_t n = ::read(_sigTermFd[0], &b, 1); // single-byte drain
+
+    qCDebug(SignalHandlerLog) << "Caught SIGTERM—shutting down gracefully";
+    QCoreApplication::quit();
+}
+
+void SignalHandler::_intSignalHandler(int signum)
+{
+    if (signum != SIGINT) {
+        return;
+    }
+    const SignalHandler* self = current();
+    if (!self) {
+        return;
+    }
+    const char b = 1;
+    [[maybe_unused]] const ssize_t n = ::write(self->_sigIntFd[1], &b, sizeof(b)); // no logging from signal handler
+}
+
+void SignalHandler::_termSignalHandler(int signum)
+{
+    if (signum != SIGTERM) {
+        return;
+    }
+    const SignalHandler* self = current();
+    if (!self) {
+        return;
+    }
+    const char b = 1;
+    [[maybe_unused]] const ssize_t n = ::write(self->_sigTermFd[1], &b, sizeof(b)); // no logging from signal handler
+}
+
+#endif // POSIX
diff --git a/src/Utilities/SignalHandler.h b/src/Utilities/SignalHandler.h
index 9a2f84529947..cb43dc86f74f 100644
--- a/src/Utilities/SignalHandler.h
+++ b/src/Utilities/SignalHandler.h
@@ -9,36 +9,53 @@
 
 #pragma once
 
+#include <atomic>
+
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QObject>
 
-class QSocketNotifier;
+#ifdef Q_OS_WIN
+    class QWinEventNotifier;
+#else
+    class QSocketNotifier;
+#endif
 
 Q_DECLARE_LOGGING_CATEGORY(SignalHandlerLog)
 
-class SignalHandler : public QObject
+class SignalHandler final : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit SignalHandler(QObject *parent = nullptr);
+    explicit SignalHandler(QObject* parent = nullptr);
+    ~SignalHandler() override;
 
-    static SignalHandler *instance();
+    int setupSignalHandlers();
 
-    static int setupSignalHandlers();
-    static void intSignalHandler(int signum);
-    static void termSignalHandler(int signum);
+    static SignalHandler* current() { return s_current.load(std::memory_order_acquire); }
 
+#ifdef Q_OS_WIN
+    static int consoleCtrlHandler(unsigned long evt);
+#else
 private slots:
     void _onSigInt();
     void _onSigTerm();
+#endif
 
 private:
-    static int sigIntFd[2];
-    static int sigTermFd[2];
-
-    QSocketNotifier *_notifierInt = nullptr;
-    QSocketNotifier *_notifierTerm = nullptr;
-
-    int _sigIntCount = 0;
+#ifdef Q_OS_WIN
+    QWinEventNotifier* _notifier{nullptr};
+    Qt::HANDLE _signalEvent{nullptr};
+#else
+    static void _intSignalHandler(int signum);
+    static void _termSignalHandler(int signum);
+
+    int _sigIntFd[2] = {-1, -1};   // socketpair read=0, write=1
+    int _sigTermFd[2] = {-1, -1};
+    QSocketNotifier* _notifierInt{nullptr};
+    QSocketNotifier* _notifierTerm{nullptr};
+#endif
+
+    bool _sigIntTriggered{false};
+    static std::atomic<SignalHandler*> s_current;
 };
diff --git a/src/Utilities/StateMachine.cc b/src/Utilities/StateMachine.cc
index 9b1f79ef476c..b9e2e920e543 100644
--- a/src/Utilities/StateMachine.cc
+++ b/src/Utilities/StateMachine.cc
@@ -10,7 +10,7 @@
 #include "StateMachine.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(StateMachineLog, "qgc.utilities.statemachine");
+QGC_LOGGING_CATEGORY(StateMachineLog, "Utilities.StateMachine");
 
 StateMachine::StateMachine(QObject *parent)
     : QObject(parent)
diff --git a/src/Utilities/StateMachine/CMakeLists.txt b/src/Utilities/StateMachine/CMakeLists.txt
new file mode 100644
index 000000000000..5f9b93201e74
--- /dev/null
+++ b/src/Utilities/StateMachine/CMakeLists.txt
@@ -0,0 +1,27 @@
+# ============================================================================
+# State Machine Subsystem
+# ============================================================================
+
+target_sources(${CMAKE_PROJECT_NAME}
+    PRIVATE
+        QGCFinalState.cc
+        QGCFinalState.h
+        QGCState.cc
+        QGCState.h
+        QGCStateMachine.cc
+        QGCStateMachine.h
+        DelayState.cc
+        DelayState.h
+        FunctionState.cc
+        FunctionState.h
+        SendMavlinkCommandState.cc
+        SendMavlinkCommandState.h
+        SendMavlinkMessageState.cc
+        SendMavlinkMessageState.h
+        ShowAppMessageState.cc
+        ShowAppMessageState.h
+        WaitForMavlinkMessageState.cc
+        WaitForMavlinkMessageState.h
+)
+
+target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/Utilities/StateMachine/DelayState.cc b/src/Utilities/StateMachine/DelayState.cc
new file mode 100644
index 000000000000..472c4ce4c1dd
--- /dev/null
+++ b/src/Utilities/StateMachine/DelayState.cc
@@ -0,0 +1,30 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "DelayState.h"
+
+DelayState::DelayState(QState* parentState, int delayMsecs)
+    : QGCState("DelayState", parentState)
+{
+    _delayTimer.setSingleShot(true);
+    _delayTimer.setInterval(delayMsecs);
+
+    connect(&_delayTimer, &QTimer::timeout, this, &DelayState::delayComplete);
+
+    connect(this, &QState::entered, this, [this, delayMsecs] ()
+        {
+            qCDebug(QGCStateMachineLog) << stateName() << QStringLiteral("Starting delay for %1 secs").arg(delayMsecs / 1000.0) << " - " << Q_FUNC_INFO;
+            _delayTimer.start();
+        });
+
+    connect(this, &QGCState::exited, this, [this] ()
+        {
+            _delayTimer.stop();
+        });
+}
diff --git a/src/Utilities/StateMachine/DelayState.h b/src/Utilities/StateMachine/DelayState.h
new file mode 100644
index 000000000000..b699fd9ed970
--- /dev/null
+++ b/src/Utilities/StateMachine/DelayState.h
@@ -0,0 +1,29 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "QGCState.h"
+
+#include <QTimer>
+
+/// Delays that state machine for the specified time in milliseconds
+class DelayState : public QGCState
+{
+    Q_OBJECT
+
+public:
+    DelayState(QState* parentState, int delayMsecs);
+
+signals:
+    void delayComplete();
+
+private:
+    QTimer _delayTimer;
+};
diff --git a/src/Utilities/StateMachine/FunctionState.cc b/src/Utilities/StateMachine/FunctionState.cc
new file mode 100644
index 000000000000..c56423b8429a
--- /dev/null
+++ b/src/Utilities/StateMachine/FunctionState.cc
@@ -0,0 +1,23 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "FunctionState.h"
+
+#include <QTimer>
+
+/// Executes a function when the state is entered
+FunctionState::FunctionState(const QString& stateName, QState* parentState, std::function<void()> function)
+    : QGCState   (stateName, parentState)
+    , _function     (function)
+{
+    connect(this, &QState::entered, this, [this] () {
+        _function();
+        emit advance();
+    });
+}
diff --git a/src/Utilities/StateMachine/FunctionState.h b/src/Utilities/StateMachine/FunctionState.h
new file mode 100644
index 000000000000..cddaad6aae31
--- /dev/null
+++ b/src/Utilities/StateMachine/FunctionState.h
@@ -0,0 +1,25 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "QGCState.h"
+
+#include <functional>
+
+class FunctionState : public QGCState
+{
+    Q_OBJECT
+
+public:
+    FunctionState(const QString& stateName, QState* parentState, std::function<void()>);
+
+private:
+    std::function<void()> _function;
+};
diff --git a/src/Utilities/StateMachine/QGCFinalState.cc b/src/Utilities/StateMachine/QGCFinalState.cc
new file mode 100644
index 000000000000..f50929006681
--- /dev/null
+++ b/src/Utilities/StateMachine/QGCFinalState.cc
@@ -0,0 +1,23 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "QGCFinalState.h"
+#include "QGCState.h"
+#include "QGCStateMachine.h"
+
+QGCFinalState::QGCFinalState(QState* parent)
+    : QFinalState(parent)
+{
+    connect(this, &QFinalState::entered, this, [this] () {
+        qCDebug(QGCStateMachineLog) << "Entered Final State" << qobject_cast<QGCStateMachine*>(this->machine())->machineName();
+    });
+    connect(this, &QState::exited, this, [this] () {
+        qCDebug(QGCStateMachineLog) << "Exited Final State" << qobject_cast<QGCStateMachine*>(this->machine())->machineName();
+    });
+}
diff --git a/src/Utilities/StateMachine/QGCFinalState.h b/src/Utilities/StateMachine/QGCFinalState.h
new file mode 100644
index 000000000000..ee89e916ed07
--- /dev/null
+++ b/src/Utilities/StateMachine/QGCFinalState.h
@@ -0,0 +1,22 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+ #pragma once
+
+#include <QFinalState>
+
+/// Final state for a QGCStateMachine
+///     Same as QFinalState but with logging
+class QGCFinalState : public QFinalState
+{
+    Q_OBJECT
+
+public:
+    QGCFinalState(QState* parent = nullptr);
+};
diff --git a/src/Utilities/StateMachine/QGCState.cc b/src/Utilities/StateMachine/QGCState.cc
new file mode 100644
index 000000000000..30fadd3989ef
--- /dev/null
+++ b/src/Utilities/StateMachine/QGCState.cc
@@ -0,0 +1,45 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "QGCStateMachine.h"
+#include "QGCLoggingCategory.h"
+
+QGC_LOGGING_CATEGORY(QGCStateMachineLog, "Utilities.QGCStateMachine")
+
+QGCState::QGCState(const QString& stateName, QState* parentState)
+    : QState(QState::ExclusiveStates, parentState)
+{
+    setObjectName(stateName);
+
+    connect(this, &QState::entered, this, [this] () {
+        qCDebug(QGCStateMachineLog) << "Entered" << this->stateName();
+    });
+    connect(this, &QState::exited, this, [this] () {
+        qCDebug(QGCStateMachineLog) << "Exited" << this->stateName();
+    });
+}
+
+QGCStateMachine* QGCState::machine() const
+{
+    return qobject_cast<QGCStateMachine*>(QState::machine());
+}
+
+Vehicle *QGCState::vehicle()
+{
+    return machine()->vehicle();
+}
+
+QString QGCState::stateName() const
+{
+    if (machine()) {
+        return QStringLiteral("%1:%2").arg(objectName(), machine()->machineName());
+    } else {
+        return objectName();
+    }
+}
diff --git a/src/Utilities/StateMachine/QGCState.h b/src/Utilities/StateMachine/QGCState.h
new file mode 100644
index 000000000000..7d59cd585aa2
--- /dev/null
+++ b/src/Utilities/StateMachine/QGCState.h
@@ -0,0 +1,40 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include <QState>
+#include <QString>
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(QGCStateMachineLog)
+
+class QGCStateMachine;
+class Vehicle;
+
+/// Base class for all QGroundControl state machine states
+class QGCState : public QState
+{
+    Q_OBJECT
+
+public:
+    QGCState(const QString& stateName, QState* parentState);
+
+    /// Simpler version of QState::addTransition which assumes the sender is this
+    template <typename PointerToMemberFunction> QSignalTransition *addThisTransition(PointerToMemberFunction signal, QAbstractState *target)
+        { return QState::addTransition(this, signal, target); };
+
+    QGCStateMachine* machine() const;
+    Vehicle *vehicle();
+    QString stateName() const;
+
+signals:
+    void advance();     ///< Signal to indicate state is complete and machine should advance to next state
+    void error();       ///< Signal to indicate an error has occurred
+};
diff --git a/src/Utilities/StateMachine/QGCStateMachine.cc b/src/Utilities/StateMachine/QGCStateMachine.cc
new file mode 100644
index 000000000000..ec5b14c584ef
--- /dev/null
+++ b/src/Utilities/StateMachine/QGCStateMachine.cc
@@ -0,0 +1,33 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "QGCStateMachine.h"
+#include "QGCApplication.h"
+#include "AudioOutput.h"
+#include "MultiVehicleManager.h"
+#include "Vehicle.h"
+#include "AudioOutput.h"
+
+#include <QFinalState>
+
+QGCStateMachine::QGCStateMachine(const QString& machineName, Vehicle *vehicle, QObject* parent)
+    : QStateMachine (parent)
+    , _vehicle      (vehicle)
+{
+    setObjectName(machineName);
+
+    connect(this, &QGCStateMachine::started, this, [this] () {
+        qCDebug(QGCStateMachineLog) << "State machine started:" << objectName();
+    });
+    connect(this, &QGCStateMachine::stopped, this, [this] () {
+        qCDebug(QGCStateMachineLog) << "State machine finished:" << objectName();
+    });
+
+    connect(this, &QGCStateMachine::stopped, this, [this] () { this->deleteLater(); });
+}
diff --git a/src/Utilities/StateMachine/QGCStateMachine.h b/src/Utilities/StateMachine/QGCStateMachine.h
new file mode 100644
index 000000000000..d47b62c6205e
--- /dev/null
+++ b/src/Utilities/StateMachine/QGCStateMachine.h
@@ -0,0 +1,43 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "DelayState.h"
+#include "FunctionState.h"
+#include "SendMavlinkCommandState.h"
+#include "SendMavlinkMessageState.h"
+#include "WaitForMavlinkMessageState.h"
+#include "ShowAppMessageState.h"
+#include "QGCFinalState.h"
+
+#include <QStateMachine>
+#include <QFinalState>
+#include <QString>
+
+#include <functional>
+
+class Vehicle;
+
+/// QGroundControl specific state machine
+class QGCStateMachine : public QStateMachine
+{
+    Q_OBJECT
+public:
+    QGCStateMachine(const QString& machineName, Vehicle* vehicle, QObject* parent = nullptr);
+
+    Vehicle *vehicle() const { return _vehicle; }
+    QString machineName() const { return objectName(); }
+
+signals:
+    void error();
+
+private:
+    Vehicle *_vehicle = nullptr;
+};
diff --git a/src/Utilities/StateMachine/SendMavlinkCommandState.cc b/src/Utilities/StateMachine/SendMavlinkCommandState.cc
new file mode 100644
index 000000000000..98057361477a
--- /dev/null
+++ b/src/Utilities/StateMachine/SendMavlinkCommandState.cc
@@ -0,0 +1,104 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "SendMavlinkCommandState.h"
+#include "MultiVehicleManager.h"
+#include "MissionCommandTree.h"
+#include "Vehicle.h"
+
+SendMavlinkCommandState::SendMavlinkCommandState(QState* parentState, MAV_CMD command, double param1, double param2, double param3, double param4, double param5, double param6, double param7)
+    : QGCState("SendMavlinkCommandState", parentState)
+{
+    setup(command, param1, param2, param3, param4, param5, param6, param7);
+}
+
+SendMavlinkCommandState::SendMavlinkCommandState(QState* parentState)
+    : QGCState("SendMavlinkCommandState", parentState)
+{
+
+}
+
+void SendMavlinkCommandState::setup(MAV_CMD command, double param1, double param2, double param3, double param4, double param5, double param6, double param7)
+{
+    _command = command;
+    _param1 = param1;
+    _param2 = param2;
+    _param3 = param3;
+    _param4 = param4;
+    _param5 = param5;
+    _param6 = param6;
+    _param7 = param7;
+
+    connect(this, &QState::entered, this, [this] ()
+        {
+            qCDebug(QGCStateMachineLog) << QStringLiteral("Sending %1 command").arg(MissionCommandTree::instance()->friendlyName(_command)) << " - " << Q_FUNC_INFO;
+            _sendMavlinkCommand();
+        });
+
+    connect(this, &QState::exited, this, &SendMavlinkCommandState::_disconnectAll);
+}
+
+void SendMavlinkCommandState::_sendMavlinkCommand()
+{
+    connect(vehicle(), &Vehicle::mavCommandResult, this, &SendMavlinkCommandState::_mavCommandResult);
+    vehicle()->sendMavCommand(MAV_COMP_ID_AUTOPILOT1,
+                                _command,
+                                false /* showError */,
+                                static_cast<float>(_param1),
+                                static_cast<float>(_param2),
+                                static_cast<float>(_param3),
+                                static_cast<float>(_param4),
+                                static_cast<float>(_param5),
+                                static_cast<float>(_param6),
+                                static_cast<float>(_param7));
+}
+
+void SendMavlinkCommandState::_mavCommandResult(int vehicleId, int targetComponent, int command, int ackResult, int failureCode)
+{
+    Q_UNUSED(vehicleId);
+    Q_UNUSED(targetComponent);
+
+    Vehicle* senderVehicle = dynamic_cast<Vehicle*>(sender());
+    if (!senderVehicle) {
+        qWarning() << "Vehicle dynamic cast on sender() failed!" << " - " << Q_FUNC_INFO;
+        return;
+    }
+    if (senderVehicle != vehicle()) {
+        qCWarning(QGCStateMachineLog) << "Received mavCommandResult from unexpected vehicle" << " - " << Q_FUNC_INFO;
+        return;
+    }
+    if (command != _command) {
+        qCWarning(QGCStateMachineLog) << "Received mavCommandResult for unexpected command - expected:actual" << _command << command << " - " << Q_FUNC_INFO;
+        return;
+    }
+
+    _disconnectAll();
+
+    QString commandName = MissionCommandTree::instance()->friendlyName(_command);
+
+    if (failureCode == Vehicle::MavCmdResultFailureNoResponseToCommand) {
+        qCDebug(QGCStateMachineLog) << QStringLiteral("%1 Command - No response from vehicle").arg(commandName);
+        emit error();
+    } else if (failureCode == Vehicle::MavCmdResultFailureDuplicateCommand) {
+        qCWarning(QGCStateMachineLog) << QStringLiteral("%1 Command - Duplicate command pending").arg(commandName);
+        emit error();
+    } else if (ackResult != MAV_RESULT_ACCEPTED) {
+        qCWarning(QGCStateMachineLog) << QStringLiteral("%1 Command failed = ack.result: %2").arg(commandName).arg(ackResult);
+        emit error();
+    } else {
+        // MAV_RESULT_ACCEPTED
+        qCDebug(QGCStateMachineLog) << QStringLiteral("%1 Command succeeded").arg(commandName);
+        emit advance();
+    }
+}
+
+void SendMavlinkCommandState::_disconnectAll()
+{
+    disconnect(vehicle(), &Vehicle::mavCommandResult, this, &SendMavlinkCommandState::_mavCommandResult);
+}
diff --git a/src/Utilities/StateMachine/SendMavlinkCommandState.h b/src/Utilities/StateMachine/SendMavlinkCommandState.h
new file mode 100644
index 000000000000..910b3cbfbf6e
--- /dev/null
+++ b/src/Utilities/StateMachine/SendMavlinkCommandState.h
@@ -0,0 +1,46 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "QGCState.h"
+#include "QGCMAVLink.h"
+
+class Vehicle;
+
+/// Sends the specified MAVLink command to the vehicle
+class SendMavlinkCommandState : public QGCState
+{
+    Q_OBJECT
+
+public:
+    SendMavlinkCommandState(QState* parent, MAV_CMD command, double param1 = 0.0, double param2 = 0.0, double param3 = 0.0, double param4 = 0.0, double param5 = 0.0, double param6 = 0.0, double param7 = 0.0);
+    SendMavlinkCommandState(QState* parent);
+
+    void setup(MAV_CMD command, double param1 = 0.0, double param2 = 0.0, double param3 = 0.0, double param4 = 0.0, double param5 = 0.0, double param6 = 0.0, double param7 = 0.0);
+
+signals:
+    void success();
+
+private slots:
+    void _mavCommandResult(int vehicleId, int targetComponent, int command, int ackResult, int failureCode);
+    void _disconnectAll();
+
+private:
+    void _sendMavlinkCommand();
+
+    MAV_CMD     _command;
+    double      _param1 = 0.0;
+    double      _param2 = 0.0;
+    double      _param3 = 0.0;
+    double      _param4 = 0.0;
+    double      _param5 = 0.0;
+    double      _param6 = 0.0;
+    double      _param7 = 0.0;
+};
diff --git a/src/Utilities/StateMachine/SendMavlinkMessageState.cc b/src/Utilities/StateMachine/SendMavlinkMessageState.cc
new file mode 100644
index 000000000000..e751458e18b4
--- /dev/null
+++ b/src/Utilities/StateMachine/SendMavlinkMessageState.cc
@@ -0,0 +1,60 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "SendMavlinkMessageState.h"
+#include "MAVLinkProtocol.h"
+#include "MultiVehicleManager.h"
+#include "Vehicle.h"
+#include "VehicleLinkManager.h"
+#include "QGCLoggingCategory.h"
+
+SendMavlinkMessageState::SendMavlinkMessageState(QState *parent, MessageEncoder encoder, int retryCount)
+    : QGCState(QStringLiteral("SendMavlinkMessageState"), parent)
+    , _encoder(std::move(encoder))
+    , _retryCount(retryCount)
+{
+    connect(this, &QState::entered, this, &SendMavlinkMessageState::_sendMessage);
+}
+
+void SendMavlinkMessageState::_sendMessage()
+{
+    if (++_runCount > _retryCount + 1  /* +1 for initial attempt */) {
+        qCDebug(QGCStateMachineLog) << "Exceeded maximum retries" << stateName();
+        emit error();
+        return;
+    }
+
+    if (!_encoder) {
+        qCDebug(QGCStateMachineLog) << "No MAVLink message encoder configured" << stateName();
+        emit error();
+        return;
+    }
+
+    SharedLinkInterfacePtr sharedLink = vehicle()->vehicleLinkManager()->primaryLink().lock();
+    if (!sharedLink) {
+        qCWarning(QGCStateMachineLog) << "No active link available to send MAVLink message" << stateName();
+        emit error();
+        return;
+    }
+
+    mavlink_message_t message{};
+
+    const uint8_t systemId = MAVLinkProtocol::instance()->getSystemId();
+    const uint8_t componentId = MAVLinkProtocol::getComponentId();
+    const uint8_t channel = sharedLink->mavlinkChannel();
+
+    _encoder(systemId, channel, &message);
+    if (!vehicle()->sendMessageOnLinkThreadSafe(sharedLink.get(), message)) {
+        qCWarning(QGCStateMachineLog) << "Failed to send MAVLink message" << stateName();
+        emit error();
+        return;
+    }
+
+    emit advance();
+}
diff --git a/src/Utilities/StateMachine/SendMavlinkMessageState.h b/src/Utilities/StateMachine/SendMavlinkMessageState.h
new file mode 100644
index 000000000000..379858c96e10
--- /dev/null
+++ b/src/Utilities/StateMachine/SendMavlinkMessageState.h
@@ -0,0 +1,39 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "QGCState.h"
+#include "QGCMAVLink.h"
+
+#include <cstdint>
+#include <functional>
+
+class Vehicle;
+
+/// Sends the specified MAVLink message to the vehicle
+class SendMavlinkMessageState : public QGCState
+{
+    Q_OBJECT
+
+public:
+    using MessageEncoder = std::function<void (uint8_t systemId, uint8_t channel, mavlink_message_t *message)>;
+
+    /// @param encoder Function which encodes the MAVLink message to send
+    /// @param retryCount Number of times to retry sending the message on failure
+    SendMavlinkMessageState(QState *parent, MessageEncoder encoder, int retryCount);
+
+private slots:
+    void _sendMessage();
+
+private:
+    MessageEncoder _encoder;
+    int _retryCount = 0;
+    int _runCount = 0;
+};
diff --git a/src/Utilities/StateMachine/ShowAppMessageState.cc b/src/Utilities/StateMachine/ShowAppMessageState.cc
new file mode 100644
index 000000000000..4df9762f3353
--- /dev/null
+++ b/src/Utilities/StateMachine/ShowAppMessageState.cc
@@ -0,0 +1,22 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "ShowAppMessageState.h"
+#include "QGCApplication.h"
+
+ShowAppMessageState::ShowAppMessageState(QState* parentState, const QString& appMessage)
+    : QGCState("ShowAppMessageState", parentState)
+    , _appMessage(appMessage)
+{
+    connect(this, &QState::entered, this, [this] () {
+        qCDebug(QGCStateMachineLog) << _appMessage << stateName();
+        qgcApp()->showAppMessage(_appMessage);
+        emit advance();
+    });
+}
diff --git a/src/Utilities/StateMachine/ShowAppMessageState.h b/src/Utilities/StateMachine/ShowAppMessageState.h
new file mode 100644
index 000000000000..3b9733280d1e
--- /dev/null
+++ b/src/Utilities/StateMachine/ShowAppMessageState.h
@@ -0,0 +1,27 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "QGCState.h"
+
+#include <QString>
+
+/// Display an application message to the user
+
+class ShowAppMessageState : public QGCState
+{
+    Q_OBJECT
+
+public:
+    ShowAppMessageState(QState* parentState, const QString& appMessage);
+
+private:
+    QString _appMessage;
+};
diff --git a/src/Utilities/StateMachine/WaitForMavlinkMessageState.cc b/src/Utilities/StateMachine/WaitForMavlinkMessageState.cc
new file mode 100644
index 000000000000..94d38c199e61
--- /dev/null
+++ b/src/Utilities/StateMachine/WaitForMavlinkMessageState.cc
@@ -0,0 +1,70 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#include "WaitForMavlinkMessageState.h"
+
+#include "MultiVehicleManager.h"
+#include "Vehicle.h"
+
+#include "QGCLoggingCategory.h"
+
+#include <QString>
+#include <utility>
+WaitForMavlinkMessageState::WaitForMavlinkMessageState(QState *parent, uint32_t messageId, int timeoutMsecs, Predicate predicate)
+    : QGCState(QStringLiteral("WaitForMavlinkMessageState"), parent)
+    , _messageId(messageId)
+    , _predicate(std::move(predicate))
+    , _timeoutMsecs(timeoutMsecs > 0 ? timeoutMsecs : 0)
+{
+    connect(this, &QState::entered, this, &WaitForMavlinkMessageState::_onEntered);
+    connect(this, &QState::exited, this, &WaitForMavlinkMessageState::_onExited);
+    _timeoutTimer.setSingleShot(true);
+    connect(&_timeoutTimer, &QTimer::timeout, this, &WaitForMavlinkMessageState::_onTimeout);
+}
+
+void WaitForMavlinkMessageState::_onEntered()
+{
+    connect(vehicle(), &Vehicle::mavlinkMessageReceived, this, &WaitForMavlinkMessageState::_messageReceived, Qt::UniqueConnection);
+
+    if (_timeoutMsecs > 0) {
+        _timeoutTimer.start(_timeoutMsecs);
+    }
+}
+
+void WaitForMavlinkMessageState::_onExited()
+{
+    disconnect(vehicle(), &Vehicle::mavlinkMessageReceived, this, &WaitForMavlinkMessageState::_messageReceived);
+
+    _timeoutTimer.stop();
+}
+
+void WaitForMavlinkMessageState::_messageReceived(const mavlink_message_t &message)
+{
+    if (message.msgid != _messageId) {
+        return;
+    }
+    if (_predicate && !_predicate(message)) {
+        return;
+    }
+
+    qCDebug(QGCStateMachineLog) << "Received expected message id" << _messageId << stateName();
+
+    disconnect(vehicle(), &Vehicle::mavlinkMessageReceived, this, &WaitForMavlinkMessageState::_messageReceived);
+    _timeoutTimer.stop();
+
+    emit advance();
+}
+
+void WaitForMavlinkMessageState::_onTimeout()
+{
+    qCDebug(QGCStateMachineLog) << "Timeout waiting for message id" << _messageId << stateName();
+    disconnect(vehicle(), &Vehicle::mavlinkMessageReceived, this, &WaitForMavlinkMessageState::_messageReceived);
+
+    emit timeout();
+}
diff --git a/src/Utilities/StateMachine/WaitForMavlinkMessageState.h b/src/Utilities/StateMachine/WaitForMavlinkMessageState.h
new file mode 100644
index 000000000000..86536af50daf
--- /dev/null
+++ b/src/Utilities/StateMachine/WaitForMavlinkMessageState.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+ *
+ * (c) 2009-2024 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+#pragma once
+
+#include "QGCState.h"
+#include "QGCMAVLink.h"
+
+#include <QtCore/QTimer>
+
+#include <cstdint>
+#include <functional>
+
+class Vehicle;
+
+/// Waits for the specified MAVLink message from the vehicle
+///     signals timeout() - if the message is not received within the specified timeout period
+class WaitForMavlinkMessageState : public QGCState
+{
+    Q_OBJECT
+
+public:
+    using Predicate = std::function<bool(const mavlink_message_t &message)>;
+
+    /// @param messageId MAVLink message ID to wait for
+    /// @param timeoutMsecs Timeout in milliseconds to wait for message, 0 to wait forever
+    /// @param predicate Optional predicate which further filters received messages
+    WaitForMavlinkMessageState(QState *parent, uint32_t messageId, int timeoutMsecs, Predicate predicate = Predicate());
+
+signals:
+    void timeout();
+
+private slots:
+    void _onEntered();
+    void _onExited();
+    void _messageReceived(const mavlink_message_t &message);
+    void _onTimeout();
+
+private:
+    uint32_t _messageId = 0U;
+    Predicate _predicate;
+    Vehicle *_vehicle = nullptr;
+    int _timeoutMsecs = 0;
+    QTimer _timeoutTimer;
+};
diff --git a/src/Vehicle/Actuators/Actuators.h b/src/Vehicle/Actuators/Actuators.h
index ba7314ded36b..63e8c362a37c 100644
--- a/src/Vehicle/Actuators/Actuators.h
+++ b/src/Vehicle/Actuators/Actuators.h
@@ -124,4 +124,3 @@ private slots:
     Vehicle* _vehicle{nullptr};
     QMap<int, QString> _usedMixerLabels;
 };
-
diff --git a/src/Vehicle/Actuators/CMakeLists.txt b/src/Vehicle/Actuators/CMakeLists.txt
index 7b1e40e42b8e..109a56af55d1 100644
--- a/src/Vehicle/Actuators/CMakeLists.txt
+++ b/src/Vehicle/Actuators/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Actuators Subsystem
+# Motor, servo, and actuator configuration and testing
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ActuatorActions.cc
diff --git a/src/Vehicle/Actuators/Common.cc b/src/Vehicle/Actuators/Common.cc
index a2ee18d2f6ed..879202f52a9c 100644
--- a/src/Vehicle/Actuators/Common.cc
+++ b/src/Vehicle/Actuators/Common.cc
@@ -11,7 +11,7 @@
 #include "ParameterManager.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(ActuatorsConfigLog, "ActuatorsConfigLog")
+QGC_LOGGING_CATEGORY(ActuatorsConfigLog, "Vehicle.ActuatorsConfig")
 
 
 void Parameter::parse(const QJsonValue& jsonValue)
@@ -186,4 +186,3 @@ ActuatorGeometry::Type ActuatorGeometry::typeFromStr(const QString &type)
     }
     return ActuatorGeometry::Type::Other;
 }
-
diff --git a/src/Vehicle/Actuators/Common.h b/src/Vehicle/Actuators/Common.h
index 09c4cbf5b9aa..056e992ca387 100644
--- a/src/Vehicle/Actuators/Common.h
+++ b/src/Vehicle/Actuators/Common.h
@@ -154,4 +154,3 @@ struct ActuatorGeometry
 
     RenderOptions renderOptions{};
 };
-
diff --git a/src/Vehicle/Actuators/GeometryImage.h b/src/Vehicle/Actuators/GeometryImage.h
index 119c1edcff8f..52c814a81221 100644
--- a/src/Vehicle/Actuators/GeometryImage.h
+++ b/src/Vehicle/Actuators/GeometryImage.h
@@ -58,4 +58,3 @@ class VehicleGeometryImageProvider : public QQuickImageProvider
 };
 
 } // namespace GeometryImage
-
diff --git a/src/Vehicle/Actuators/MotorAssignment.h b/src/Vehicle/Actuators/MotorAssignment.h
index 08661b3cffbb..ddc9cfa76fac 100644
--- a/src/Vehicle/Actuators/MotorAssignment.h
+++ b/src/Vehicle/Actuators/MotorAssignment.h
@@ -87,4 +87,3 @@ private slots:
     QList<QList<Fact*>> _functionFacts;
     QString _message; ///< current message to show to the user after initializing
 };
-
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index 3137d08937d8..22328ccab81d 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Vehicle Module
+# Core vehicle state management and MAVLink communication
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         Autotune.cpp
@@ -28,6 +33,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Vehicle Subsystems
+# ----------------------------------------------------------------------------
 add_subdirectory(Actuators)
 add_subdirectory(ComponentInformation)
 add_subdirectory(FactGroups)
diff --git a/src/Vehicle/ComponentInformation/CMakeLists.txt b/src/Vehicle/ComponentInformation/CMakeLists.txt
index 13c261ec5a05..fac80f5db656 100644
--- a/src/Vehicle/ComponentInformation/CMakeLists.txt
+++ b/src/Vehicle/ComponentInformation/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Component Information Subsystem
+# MAVLink component metadata and capabilities
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         CompInfo.cc
diff --git a/src/Vehicle/ComponentInformation/CompInfoActuators.cc b/src/Vehicle/ComponentInformation/CompInfoActuators.cc
index 640ba976bc05..616638e9e04e 100644
--- a/src/Vehicle/ComponentInformation/CompInfoActuators.cc
+++ b/src/Vehicle/ComponentInformation/CompInfoActuators.cc
@@ -22,4 +22,3 @@ void CompInfoActuators::setJson(const QString& metadataJsonFileName)
         vehicle->setActuatorsMetadata(compId, metadataJsonFileName);
     }
 }
-
diff --git a/src/Vehicle/ComponentInformation/CompInfoEvents.cc b/src/Vehicle/ComponentInformation/CompInfoEvents.cc
index eb4251ead88f..e1a2a40eabf6 100644
--- a/src/Vehicle/ComponentInformation/CompInfoEvents.cc
+++ b/src/Vehicle/ComponentInformation/CompInfoEvents.cc
@@ -20,4 +20,3 @@ void CompInfoEvents::setJson(const QString& metadataJsonFileName)
 {
     vehicle->setEventsMetadata(compId, metadataJsonFileName);
 }
-
diff --git a/src/Vehicle/ComponentInformation/CompInfoGeneral.cc b/src/Vehicle/ComponentInformation/CompInfoGeneral.cc
index d75612fcb877..74a10194b414 100644
--- a/src/Vehicle/ComponentInformation/CompInfoGeneral.cc
+++ b/src/Vehicle/ComponentInformation/CompInfoGeneral.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
 
-QGC_LOGGING_CATEGORY(CompInfoGeneralLog, "CompInfoGeneralLog")
+QGC_LOGGING_CATEGORY(CompInfoGeneralLog, "ComponentInformation.CompInfoGeneral")
 
 CompInfoGeneral::CompInfoGeneral(uint8_t compId, Vehicle* vehicle, QObject* parent)
     : CompInfo(COMP_METADATA_TYPE_GENERAL, compId, vehicle, parent)
diff --git a/src/Vehicle/ComponentInformation/CompInfoParam.cc b/src/Vehicle/ComponentInformation/CompInfoParam.cc
index f0d501161e27..ec35c59ee0f3 100644
--- a/src/Vehicle/ComponentInformation/CompInfoParam.cc
+++ b/src/Vehicle/ComponentInformation/CompInfoParam.cc
@@ -22,7 +22,7 @@
 #include <QtCore/QRegularExpressionMatch>
 #include <QtCore/QDir>
 
-QGC_LOGGING_CATEGORY(CompInfoParamLog, "CompInfoParamLog")
+QGC_LOGGING_CATEGORY(CompInfoParamLog, "ComponentInformation.CompInfoParam")
 
 CompInfoParam::CompInfoParam(uint8_t compId, Vehicle* vehicle, QObject* parent)
     : CompInfo(COMP_METADATA_TYPE_PARAMETER, compId, vehicle, parent)
diff --git a/src/Vehicle/ComponentInformation/ComponentInformationCache.cc b/src/Vehicle/ComponentInformation/ComponentInformationCache.cc
index f1884b78b34b..987740cb8dfd 100644
--- a/src/Vehicle/ComponentInformation/ComponentInformationCache.cc
+++ b/src/Vehicle/ComponentInformation/ComponentInformationCache.cc
@@ -14,7 +14,7 @@
 #include <QtCore/QDirIterator>
 #include <QtCore/QStandardPaths>
 
-QGC_LOGGING_CATEGORY(ComponentInformationCacheLog, "ComponentInformationCacheLog")
+QGC_LOGGING_CATEGORY(ComponentInformationCacheLog, "ComponentInformation.ComponentInformationCache")
 
 ComponentInformationCache::ComponentInformationCache(const QDir& path, int maxNumFiles)
     : _path(path), _maxNumFiles(maxNumFiles)
diff --git a/src/Vehicle/ComponentInformation/ComponentInformationManager.cc b/src/Vehicle/ComponentInformation/ComponentInformationManager.cc
index 4f262f632afd..dc891e7cf89b 100644
--- a/src/Vehicle/ComponentInformation/ComponentInformationManager.cc
+++ b/src/Vehicle/ComponentInformation/ComponentInformationManager.cc
@@ -23,7 +23,7 @@
 
 #include <QtCore/QStandardPaths>
 
-QGC_LOGGING_CATEGORY(ComponentInformationManagerLog, "qgc.vehicle.components.componentinformationmanager")
+QGC_LOGGING_CATEGORY(ComponentInformationManagerLog, "Vehicle.ComponentInformationManager")
 
 ComponentInformationManager::ComponentInformationManager(Vehicle *vehicle, QObject *parent)
     : StateMachine(parent)
diff --git a/src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc b/src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc
index dc679e301e14..bfabfe03873e 100644
--- a/src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc
+++ b/src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc
@@ -20,7 +20,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QXmlStreamReader>
 
-QGC_LOGGING_CATEGORY(ComponentInformationTranslationLog, "ComponentInformationTranslationLog")
+QGC_LOGGING_CATEGORY(ComponentInformationTranslationLog, "ComponentInformation.ComponentInformationTranslation")
 
 ComponentInformationTranslation::ComponentInformationTranslation(QObject* parent,
                                                                  QGCCachedFileDownload* cachedFileDownload)
diff --git a/src/Vehicle/ComponentInformation/ComponentInformationTranslation.h b/src/Vehicle/ComponentInformation/ComponentInformationTranslation.h
index 6b07b5ae6ca3..ceb00610f20e 100644
--- a/src/Vehicle/ComponentInformation/ComponentInformationTranslation.h
+++ b/src/Vehicle/ComponentInformation/ComponentInformationTranslation.h
@@ -22,7 +22,7 @@ class QGCCachedFileDownload;
 class ComponentInformationTranslation : public QObject
 {
     Q_OBJECT
-    
+
 public:
     ComponentInformationTranslation(QObject* parent, QGCCachedFileDownload* cachedFileDownload);
 
diff --git a/src/Vehicle/FTPManager.cc b/src/Vehicle/FTPManager.cc
index 156a8c3883ca..deed2698dbf1 100644
--- a/src/Vehicle/FTPManager.cc
+++ b/src/Vehicle/FTPManager.cc
@@ -16,7 +16,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 
-QGC_LOGGING_CATEGORY(FTPManagerLog, "FTPManagerLog")
+QGC_LOGGING_CATEGORY(FTPManagerLog, "Vehicle.FTPManager")
 
 FTPManager::FTPManager(Vehicle* vehicle)
     : QObject   (vehicle)
@@ -26,7 +26,7 @@ FTPManager::FTPManager(Vehicle* vehicle)
     // Mock link responds immediately if at all, speed up unit tests with faster timoue
     _ackOrNakTimeoutTimer.setInterval(qgcApp()->runningUnitTests() ? 10 : _ackOrNakTimeoutMsecs);
     connect(&_ackOrNakTimeoutTimer, &QTimer::timeout, this, &FTPManager::_ackOrNakTimeout);
-    
+
     // Make sure we don't have bad structure packing
     Q_ASSERT(sizeof(MavlinkFTP::RequestHeader) == 12);
 }
@@ -180,7 +180,7 @@ void FTPManager::_terminateComplete(void)
 void FTPManager::_downloadComplete(const QString& errorMsg)
 {
     qCDebug(FTPManagerLog) << QString("_downloadComplete: errorMsg(%1)").arg(errorMsg);
-    
+
     QString downloadFilePath    = _downloadState.toDir.absoluteFilePath(_downloadState.fileName);
     QString error               = errorMsg;
 
@@ -202,7 +202,7 @@ void FTPManager::_downloadComplete(const QString& errorMsg)
 void FTPManager::_listDirectoryComplete(const QString& errorMsg)
 {
     qCDebug(FTPManagerLog) << QString("_listDirectoryComplete: errorMsg(%1)").arg(errorMsg);
-    
+
     _ackOrNakTimeoutTimer.stop();
     _rgStateMachine.clear();
     _currentStateMachineIndex = -1;
@@ -234,7 +234,7 @@ void FTPManager::_mavlinkMessageReceived(const mavlink_message_t& message)
     if (data.target_system != qgcId) {
         return;
     }
-    
+
     MavlinkFTP::Request* request = (MavlinkFTP::Request*)&data.payload[0];
 
     // Ignore old/reordered packets (handle wrap-around properly)
@@ -482,7 +482,7 @@ void FTPManager::_listDirectoryWorker(bool firstRequest)
     request.hdr.offset  = _listDirectoryState.expectedOffset;
     request.hdr.size    = sizeof(request.data);
     _fillRequestDataWithString(&request, _listDirectoryState.fullPathOnVehicle);
-    
+
     if (firstRequest) {
         _listDirectoryState.retryCount = 0;
     } else {
@@ -729,7 +729,7 @@ void FTPManager::_resetSessionsTimeout(void)
 void FTPManager::_sendRequestExpectAck(MavlinkFTP::Request* request)
 {
     _ackOrNakTimeoutTimer.start();
-    
+
     SharedLinkInterfacePtr sharedLink = _vehicle->vehicleLinkManager()->primaryLink().lock();
     if (sharedLink) {
         request->hdr.seqNumber = _expectedIncomingSeqNumber + 1;    // Outgoing is 1 past last incoming
diff --git a/src/Vehicle/FTPManager.h b/src/Vehicle/FTPManager.h
index 8eba6ae414b0..6482e05692ac 100644
--- a/src/Vehicle/FTPManager.h
+++ b/src/Vehicle/FTPManager.h
@@ -25,7 +25,7 @@ class FTPManager : public QObject
     Q_OBJECT
 
     friend class Vehicle;
-    
+
 public:
     FTPManager(Vehicle* vehicle);
 
@@ -65,7 +65,7 @@ class FTPManager : public QObject
     /// Signalled during a lengthy command to show progress
     ///     @param value Amount of progress: 0.0 = none, 1.0 = complete
     void commandProgress(float value);
-	
+
 private slots:
     void _ackOrNakTimeout(void);
 
@@ -175,8 +175,7 @@ private slots:
     QTimer                  _ackOrNakTimeoutTimer;
     int                     _currentStateMachineIndex   = -1;
     uint16_t                _expectedIncomingSeqNumber  = 0;
-    
+
     static const int _ackOrNakTimeoutMsecs  = 1000;
     static const int _maxRetry              = 3;
 };
-
diff --git a/src/Vehicle/FactGroups/CMakeLists.txt b/src/Vehicle/FactGroups/CMakeLists.txt
index 0b6c026f708c..d69785d883a6 100644
--- a/src/Vehicle/FactGroups/CMakeLists.txt
+++ b/src/Vehicle/FactGroups/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Vehicle Fact Groups Subsystem
+# Vehicle telemetry data organization and binding
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         BatteryFactGroupListModel.cc
@@ -40,7 +45,9 @@ target_sources(${CMAKE_PROJECT_NAME}
         VehicleHygrometerFactGroup.h
 )
 
-# Add JSON files
+# ----------------------------------------------------------------------------
+# Fact Group Definition Resources
+# ----------------------------------------------------------------------------
 set(JSON_FILES
     RPMFact.json
     TemperatureFact.json
@@ -66,7 +73,7 @@ qt_add_resources(${CMAKE_PROJECT_NAME} json_vehicle_fact_group
     FILES ${JSON_FILES}
 )
 
-# Alias
+# Create alias for LocalPositionSetpointFact.json
 set_source_files_properties(LocalPositionFact.json PROPERTIES QT_RESOURCE_ALIAS LocalPositionSetpointFact.json)
 qt_add_resources(${CMAKE_PROJECT_NAME} json_vehicle_fact_group_alias
     PREFIX "/json/Vehicle"
diff --git a/src/Vehicle/FactGroups/EFIFact.json b/src/Vehicle/FactGroups/EFIFact.json
index e7c7f3d3a56f..6d2658fd9fea 100644
--- a/src/Vehicle/FactGroups/EFIFact.json
+++ b/src/Vehicle/FactGroups/EFIFact.json
@@ -119,4 +119,4 @@
     "decimalPlaces":    1
 }
 ]
-}
\ No newline at end of file
+}
diff --git a/src/Vehicle/FactGroups/GPSFact.json b/src/Vehicle/FactGroups/GPSFact.json
index a563f7cb8dd9..989eb1b53688 100644
--- a/src/Vehicle/FactGroups/GPSFact.json
+++ b/src/Vehicle/FactGroups/GPSFact.json
@@ -50,7 +50,7 @@
     "name":             "lock",
     "shortDesc": "GPS Lock",
     "type":             "uint32",
-    "enumStrings":      "None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)",
+    "enumStrings":      "None,No Fix,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)",
     "enumValues":       "0,1,2,3,4,5,6,7",
     "decimalPlaces":    0
 },
diff --git a/src/Vehicle/FactGroups/GeneratorFact.json b/src/Vehicle/FactGroups/GeneratorFact.json
index d5f8e6f68b52..2095c0b96a2d 100644
--- a/src/Vehicle/FactGroups/GeneratorFact.json
+++ b/src/Vehicle/FactGroups/GeneratorFact.json
@@ -74,4 +74,4 @@
     "units":            "sec"
 }
 ]
-}
\ No newline at end of file
+}
diff --git a/src/Vehicle/FactGroups/RPMFact.json b/src/Vehicle/FactGroups/RPMFact.json
index ae5aeab6a35d..294d5058210a 100644
--- a/src/Vehicle/FactGroups/RPMFact.json
+++ b/src/Vehicle/FactGroups/RPMFact.json
@@ -32,4 +32,4 @@
             "units":            "rpm"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/src/Vehicle/FactGroups/VehicleDistanceSensorFactGroup.cc b/src/Vehicle/FactGroups/VehicleDistanceSensorFactGroup.cc
index 9791f3089fbd..5954ea3529a0 100644
--- a/src/Vehicle/FactGroups/VehicleDistanceSensorFactGroup.cc
+++ b/src/Vehicle/FactGroups/VehicleDistanceSensorFactGroup.cc
@@ -63,6 +63,7 @@ void VehicleDistanceSensorFactGroup::handleMessage(Vehicle *vehicle, const mavli
         }
     }
 
+    minDistance()->setRawValue(distanceSensor.min_distance / 100.0);
     maxDistance()->setRawValue(distanceSensor.max_distance / 100.0);
 
     _setTelemetryAvailable(true);
diff --git a/src/Vehicle/FactGroups/VehicleFactGroup.cc b/src/Vehicle/FactGroups/VehicleFactGroup.cc
index 0bc4d4fb2cc7..9ea23471dd57 100644
--- a/src/Vehicle/FactGroups/VehicleFactGroup.cc
+++ b/src/Vehicle/FactGroups/VehicleFactGroup.cc
@@ -49,7 +49,7 @@ VehicleFactGroup::VehicleFactGroup(QObject *parent)
     _addFact(&_throttlePctFact);
     _addFact(&_imuTempFact);
 
-    _hobbsFact.setRawValue(QStringLiteral("0000:00:00"));
+    _hobbsFact.setRawValue(QStringLiteral("----:--:--"));
 }
 
 void VehicleFactGroup::handleMessage(Vehicle *vehicle, const mavlink_message_t &message)
diff --git a/src/Vehicle/InitialConnectStateMachine.cc b/src/Vehicle/InitialConnectStateMachine.cc
index 47b936f5fc16..2bc35b831f79 100644
--- a/src/Vehicle/InitialConnectStateMachine.cc
+++ b/src/Vehicle/InitialConnectStateMachine.cc
@@ -20,7 +20,7 @@
 #include "RallyPointManager.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(InitialConnectStateMachineLog, "qgc.vehicle.initialconnectstatemachine")
+QGC_LOGGING_CATEGORY(InitialConnectStateMachineLog, "Vehicle.InitialConnectStateMachine")
 
 InitialConnectStateMachine::InitialConnectStateMachine(Vehicle *vehicle, QObject *parent)
     : StateMachine(parent)
@@ -174,11 +174,7 @@ void InitialConnectStateMachine::_autopilotVersionRequestMessageHandler(void* re
 
     if (failureCode != Vehicle::RequestMessageNoFailure) {
         qCDebug(InitialConnectStateMachineLog) << "REQUEST_MESSAGE:AUTOPILOT_VERSION failed. Setting no capabilities";
-        uint64_t assumedCapabilities = 0;
-        if (vehicle->_mavlinkProtocolRequestMaxProtoVersion >= 200) {
-            // Link already running mavlink 2
-            assumedCapabilities |= MAV_PROTOCOL_CAPABILITY_MAVLINK2;
-        }
+        uint64_t assumedCapabilities = MAV_PROTOCOL_CAPABILITY_MAVLINK2;
         if (vehicle->px4Firmware() || vehicle->apmFirmware()) {
             // We make some assumptions for known firmware
             assumedCapabilities |= MAV_PROTOCOL_CAPABILITY_MISSION_INT | MAV_PROTOCOL_CAPABILITY_COMMAND_INT | MAV_PROTOCOL_CAPABILITY_MISSION_FENCE | MAV_PROTOCOL_CAPABILITY_MISSION_RALLY;
@@ -189,74 +185,6 @@ void InitialConnectStateMachine::_autopilotVersionRequestMessageHandler(void* re
     connectMachine->advance();
 }
 
-void InitialConnectStateMachine::_stateRequestProtocolVersion(StateMachine* stateMachine)
-{
-    InitialConnectStateMachine* connectMachine  = static_cast<InitialConnectStateMachine*>(stateMachine);
-    Vehicle*                    vehicle         = connectMachine->_vehicle;
-    SharedLinkInterfacePtr      sharedLink      = vehicle->vehicleLinkManager()->primaryLink().lock();
-
-    if (!sharedLink) {
-        qCDebug(InitialConnectStateMachineLog) << "Skipping REQUEST_MESSAGE:PROTOCOL_VERSION request due to no primary link";
-        connectMachine->advance();
-    } else {
-        if (sharedLink->linkConfiguration()->isHighLatency() || sharedLink->isLogReplay()) {
-            qCDebug(InitialConnectStateMachineLog) << "Skipping REQUEST_MESSAGE:PROTOCOL_VERSION request due to link type";
-            connectMachine->advance();
-        } else if (vehicle->apmFirmware()) {
-            qCDebug(InitialConnectStateMachineLog) << "Skipping REQUEST_MESSAGE:PROTOCOL_VERSION request due to Ardupilot firmware";
-            connectMachine->advance();
-        } else {
-            qCDebug(InitialConnectStateMachineLog) << "Sending REQUEST_MESSAGE:PROTOCOL_VERSION";
-            vehicle->requestMessage(_protocolVersionRequestMessageHandler,
-                                    connectMachine,
-                                    MAV_COMP_ID_AUTOPILOT1,
-                                    MAVLINK_MSG_ID_PROTOCOL_VERSION);
-        }
-    }
-}
-
-void InitialConnectStateMachine::_protocolVersionRequestMessageHandler(void* resultHandlerData, MAV_RESULT commandResult, Vehicle::RequestMessageResultHandlerFailureCode_t failureCode, const mavlink_message_t& message)
-{
-    InitialConnectStateMachine* connectMachine  = static_cast<InitialConnectStateMachine*>(resultHandlerData);
-    Vehicle*                    vehicle         = connectMachine->_vehicle;
-
-    switch (failureCode) {
-    case Vehicle::RequestMessageNoFailure:
-    {
-        mavlink_protocol_version_t protoVersion;
-        mavlink_msg_protocol_version_decode(&message, &protoVersion);
-
-        qCDebug(InitialConnectStateMachineLog) << "PROTOCOL_VERSION received mav_version:" << protoVersion.max_version;
-        vehicle->_mavlinkProtocolRequestMaxProtoVersion = protoVersion.max_version;
-        vehicle->_mavlinkProtocolRequestComplete = true;
-        vehicle->_setMaxProtoVersionFromBothSources();
-    }
-        break;
-    case Vehicle::RequestMessageFailureCommandError:
-        qCDebug(InitialConnectStateMachineLog) << QStringLiteral("REQUEST_MESSAGE PROTOCOL_VERSION command error(%1)").arg(commandResult);
-        break;
-    case Vehicle::RequestMessageFailureCommandNotAcked:
-        qCDebug(InitialConnectStateMachineLog) << "REQUEST_MESSAGE PROTOCOL_VERSION command never acked";
-        break;
-    case Vehicle::RequestMessageFailureMessageNotReceived:
-        qCDebug(InitialConnectStateMachineLog) << "REQUEST_MESSAGE PROTOCOL_VERSION command acked but message never received";
-        break;
-    case Vehicle::RequestMessageFailureDuplicateCommand:
-        qCDebug(InitialConnectStateMachineLog) << "REQUEST_MESSAGE PROTOCOL_VERSION Internal Error: Duplicate command";
-        break;
-    }
-
-    if (failureCode != Vehicle::RequestMessageNoFailure) {
-        // Either the PROTOCOL_VERSION message didn't make it through the pipe from Vehicle->QGC because the pipe is mavlink 1.
-        // Or the PROTOCOL_VERSION message was lost on a noisy connection. Either way the best we can do is fall back to mavlink 1.
-        qCDebug(InitialConnectStateMachineLog) << QStringLiteral("Setting _maxProtoVersion to 100 due to timeout on receiving PROTOCOL_VERSION message.");
-        vehicle->_mavlinkProtocolRequestMaxProtoVersion = 100;
-        vehicle->_mavlinkProtocolRequestComplete = true;
-        vehicle->_setMaxProtoVersionFromBothSources();
-    }
-
-    connectMachine->advance();
-}
 void InitialConnectStateMachine::_stateRequestCompInfo(StateMachine* stateMachine)
 {
     InitialConnectStateMachine* connectMachine  = static_cast<InitialConnectStateMachine*>(stateMachine);
@@ -401,4 +329,3 @@ void InitialConnectStateMachine::_stateSignalInitialConnectComplete(StateMachine
     qCDebug(InitialConnectStateMachineLog) << "Signalling initialConnectComplete";
     emit vehicle->initialConnectComplete();
 }
-
diff --git a/src/Vehicle/InitialConnectStateMachine.h b/src/Vehicle/InitialConnectStateMachine.h
index 0a133cecb244..fd71586d8a36 100644
--- a/src/Vehicle/InitialConnectStateMachine.h
+++ b/src/Vehicle/InitialConnectStateMachine.h
@@ -41,7 +41,6 @@ private slots:
 
 private:
     static void _stateRequestAutopilotVersion           (StateMachine* stateMachine);
-    static void _stateRequestProtocolVersion            (StateMachine* stateMachine);
     static void _stateRequestCompInfo                   (StateMachine* stateMachine);
     static void _stateRequestStandardModes              (StateMachine* stateMachine);
     static void _stateRequestCompInfoComplete           (void* requestAllCompleteFnData);
@@ -52,7 +51,6 @@ private slots:
     static void _stateSignalInitialConnectComplete      (StateMachine* stateMachine);
 
     static void _autopilotVersionRequestMessageHandler  (void* resultHandlerData, MAV_RESULT commandResult, Vehicle::RequestMessageResultHandlerFailureCode_t failureCode, const mavlink_message_t& message);
-    static void _protocolVersionRequestMessageHandler   (void* resultHandlerData, MAV_RESULT commandResult, Vehicle::RequestMessageResultHandlerFailureCode_t failureCode, const mavlink_message_t& message);
 
     float _progress(float subProgress = 0.f);
 
@@ -62,7 +60,6 @@ private slots:
 
     static constexpr const StateMachine::StateFn _rgStates[] = {
         _stateRequestAutopilotVersion,
-        _stateRequestProtocolVersion,
         _stateRequestStandardModes,
         _stateRequestCompInfo,
         _stateRequestParameters,
@@ -73,8 +70,7 @@ private slots:
     };
 
     static constexpr const int _rgProgressWeights[] = {
-        1, //_stateRequestCapabilities
-        1, //_stateRequestProtocolVersion
+        1, //_stateRequestAutopilotVersion
         1, //_stateRequestStandardModes
         5, //_stateRequestCompInfo
         5, //_stateRequestParameters
diff --git a/src/Vehicle/MAVLinkLogManager.cc b/src/Vehicle/MAVLinkLogManager.cc
index 5eb6fada630f..bb2869b27203 100644
--- a/src/Vehicle/MAVLinkLogManager.cc
+++ b/src/Vehicle/MAVLinkLogManager.cc
@@ -21,7 +21,7 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QNetworkReply>
 
-QGC_LOGGING_CATEGORY(MAVLinkLogManagerLog, "qgc.vehicle.mavlinklogmanager")
+QGC_LOGGING_CATEGORY(MAVLinkLogManagerLog, "Vehicle.MAVLinkLogManager")
 
 static constexpr const char *kSidecarExtension = ".uploaded";
 
diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index 8d544dbab718..c944545ff825 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -31,7 +31,7 @@
 #include <QtCore/QApplicationStatic>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "qgc.vehicle.multivehiclemanager")
+QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "Vehicle.MultiVehicleManager")
 
 Q_APPLICATION_STATIC(MultiVehicleManager, _multiVehicleManagerInstance);
 
@@ -127,7 +127,6 @@ void MultiVehicleManager::_vehicleHeartbeatInfo(LinkInterface* link, int vehicle
     }
 
     Vehicle *const vehicle = new Vehicle(link, vehicleId, componentId, (MAV_AUTOPILOT)vehicleFirmwareType, (MAV_TYPE)vehicleType, this);
-    (void) connect(vehicle, &Vehicle::requestProtocolVersion, this, &MultiVehicleManager::_requestProtocolVersion);
     (void) connect(vehicle->vehicleLinkManager(), &VehicleLinkManager::allLinksRemoved, this, &MultiVehicleManager::_deleteVehiclePhase1);
     (void) connect(vehicle->parameterManager(), &ParameterManager::parametersReadyChanged, this, &MultiVehicleManager::_vehicleParametersReadyChanged);
 
@@ -158,26 +157,6 @@ void MultiVehicleManager::_vehicleHeartbeatInfo(LinkInterface* link, int vehicle
 #endif
 }
 
-void MultiVehicleManager::_requestProtocolVersion(unsigned version) const
-{
-    if (_vehicles->count() == 0) {
-        MAVLinkProtocol::instance()->setVersion(version);
-        return;
-    }
-
-    unsigned maxversion = 0;
-    for (int i = 0; i < _vehicles->count(); i++) {
-        const Vehicle *const vehicle = qobject_cast<const Vehicle*>(_vehicles->get(i));
-        if (vehicle && (vehicle->maxProtoVersion() > maxversion)) {
-            maxversion = vehicle->maxProtoVersion();
-        }
-    }
-
-    if (MAVLinkProtocol::instance()->getCurrentVersion() != maxversion) {
-        MAVLinkProtocol::instance()->setVersion(maxversion);
-    }
-}
-
 void MultiVehicleManager::_deleteVehiclePhase1(Vehicle *vehicle)
 {
     qCDebug(MultiVehicleManagerLog) << Q_FUNC_INFO << vehicle;
@@ -193,6 +172,7 @@ void MultiVehicleManager::_deleteVehiclePhase1(Vehicle *vehicle)
 
     if (!found) {
         qCWarning(MultiVehicleManagerLog) << "Vehicle not found in map!";
+        return;
     }
 
     deselectVehicle(vehicle->id());
@@ -200,7 +180,6 @@ void MultiVehicleManager::_deleteVehiclePhase1(Vehicle *vehicle)
     _setActiveVehicleAvailable(false);
     _setParameterReadyVehicleAvailable(false);
     emit vehicleRemoved(vehicle);
-    vehicle->prepareDelete();
 
 #if defined(Q_OS_ANDROID) || defined (Q_OS_IOS)
     if (_vehicles->count() == 0) {
diff --git a/src/Vehicle/MultiVehicleManager.h b/src/Vehicle/MultiVehicleManager.h
index a9dd80f6d4ec..e74840df118e 100644
--- a/src/Vehicle/MultiVehicleManager.h
+++ b/src/Vehicle/MultiVehicleManager.h
@@ -71,7 +71,6 @@ private slots:
     void _vehicleParametersReadyChanged(bool parametersReady);
     void _sendGCSHeartbeat();
     void _vehicleHeartbeatInfo(LinkInterface *link, int vehicleId, int componentId, int vehicleFirmwareType, int vehicleType);
-    void _requestProtocolVersion(unsigned version) const; /// This slot is connected to the Vehicle::requestProtocolVersion signal such that the vehicle manager tries to switch MAVLink to v2 if all vehicles support it
 
 private:
     bool _vehicleExists(int vehicleId);
diff --git a/src/Vehicle/RemoteIDManager.cc b/src/Vehicle/RemoteIDManager.cc
index c16538585c7a..ff3ebc5f6521 100644
--- a/src/Vehicle/RemoteIDManager.cc
+++ b/src/Vehicle/RemoteIDManager.cc
@@ -15,7 +15,7 @@
 #include "MAVLinkProtocol.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(RemoteIDManagerLog, "RemoteIDManagerLog")
+QGC_LOGGING_CATEGORY(RemoteIDManagerLog, "Vehicle.RemoteIDManager")
 
 #define AREA_COUNT 1
 #define AREA_RADIUS 0
@@ -66,11 +66,11 @@ RemoteIDManager::RemoteIDManager(Vehicle* vehicle)
     _targetSystem = _vehicle->id();
     _targetComponent = _vehicle->compId();
 
-    if (_settings->operatorIDValid()->rawValue() == true) {
+    if (_settings->operatorIDValid()->rawValue() == true || (_settings->region()->rawValue().toInt() != Region::EU && _settings->operatorID()->rawValue().toString().length() > 0)) {
         // If it was already checked, we can flag this as good to go.
         // We don't do a fresh verification because we don't store the private part of the ID.
         _operatorIDGood = true;
-        operatorIDGoodChanged();
+        emit operatorIDGoodChanged();
     }
 }
 
diff --git a/src/Vehicle/StandardModes.cc b/src/Vehicle/StandardModes.cc
index 4a031dc8367c..af6e88ba245c 100644
--- a/src/Vehicle/StandardModes.cc
+++ b/src/Vehicle/StandardModes.cc
@@ -11,7 +11,7 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(StandardModesLog, "StandardModesLog")
+QGC_LOGGING_CATEGORY(StandardModesLog, "Vehicle.StandardModes")
 
 static void requestMessageResultHandler(void *resultHandlerData, MAV_RESULT result,
                                         [[maybe_unused]] Vehicle::RequestMessageResultHandlerFailureCode_t failureCode,
@@ -48,6 +48,7 @@ void StandardModes::gotMessage(MAV_RESULT result, const mavlink_message_t &messa
                 break;
             case MAV_STANDARD_MODE_ORBIT:
                 name = "Orbit";
+                cannotBeSet = true; // These are exposed in the UI as separate buttons
                 break;
             case MAV_STANDARD_MODE_CRUISE:
                 name = "Cruise";
@@ -69,10 +70,6 @@ void StandardModes::gotMessage(MAV_RESULT result, const mavlink_message_t &messa
                 break;
         }
 
-        if (name == "Takeoff" || name == "VTOL Takeoff" || name == "Orbit" || name == "Land" || name == "Return") { // These are exposed in the UI as separate buttons
-            cannotBeSet = true;
-        }
-
         qCDebug(StandardModesLog) << "Available mode received - name:" << name <<
             "index:" << availableModes.mode_index <<
             "standard_mode:" << availableModes.standard_mode <<
diff --git a/src/Vehicle/StandardModes.h b/src/Vehicle/StandardModes.h
index ed1123131dbb..3363d4bcacda 100644
--- a/src/Vehicle/StandardModes.h
+++ b/src/Vehicle/StandardModes.h
@@ -59,4 +59,3 @@ Q_OBJECT
 
     FlightModeList _modeList;
 };
-
diff --git a/src/Vehicle/TerrainProtocolHandler.cc b/src/Vehicle/TerrainProtocolHandler.cc
index 05f7aa0414fc..f9550ca96053 100644
--- a/src/Vehicle/TerrainProtocolHandler.cc
+++ b/src/Vehicle/TerrainProtocolHandler.cc
@@ -15,7 +15,7 @@
 
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(TerrainProtocolHandlerLog, "qgc.vehicle.terrainprotocolhandler")
+QGC_LOGGING_CATEGORY(TerrainProtocolHandlerLog, "Vehicle.TerrainProtocolHandler")
 
 TerrainProtocolHandler::TerrainProtocolHandler(Vehicle *vehicle, TerrainFactGroup *terrainFactGroup, QObject *parent)
     : QObject(parent)
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 842f53fd2ca3..88a72443cd0f 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -68,7 +68,7 @@
 
 #include <QtCore/QDateTime>
 
-QGC_LOGGING_CATEGORY(VehicleLog, "VehicleLog")
+QGC_LOGGING_CATEGORY(VehicleLog, "Vehicle.Vehicle")
 
 #define UPDATE_TIMER 50
 #define DEFAULT_LAT  38.965767f
@@ -77,7 +77,7 @@ QGC_LOGGING_CATEGORY(VehicleLog, "VehicleLog")
 #define SET_HOME_TERRAIN_ALT_MIN -500
 
 // After a second GCS has requested control and we have given it permission to takeover, we will remove takeover permission automatically after this timeout
-// If the second GCS didn't get control 
+// If the second GCS didn't get control
 #define REQUEST_OPERATOR_CONTROL_ALLOW_TAKEOVER_TIMEOUT_MSECS 10000
 
 const QString guided_mode_not_supported_by_vehicle = QObject::tr("Guided mode not supported by Vehicle.");
@@ -120,8 +120,6 @@ Vehicle::Vehicle(LinkInterface*             link,
     connect(JoystickManager::instance(), &JoystickManager::activeJoystickChanged, this, &Vehicle::_loadJoystickSettings);
     connect(MultiVehicleManager::instance(), &MultiVehicleManager::activeVehicleChanged, this, &Vehicle::_activeVehicleChanged);
 
-    qCDebug(VehicleLog) << "Link started with Mavlink " << (MAVLinkProtocol::instance()->getCurrentVersion() >= 200 ? "V2" : "V1");
-
     connect(MAVLinkProtocol::instance(), &MAVLinkProtocol::messageReceived,        this, &Vehicle::_mavlinkMessageReceived);
     connect(MAVLinkProtocol::instance(), &MAVLinkProtocol::mavlinkMessageStatus,   this, &Vehicle::_mavlinkMessageStatus);
 
@@ -138,9 +136,7 @@ Vehicle::Vehicle(LinkInterface*             link,
 
     connect(this, &Vehicle::remoteControlRSSIChanged,   this, &Vehicle::_remoteControlRSSIChanged);
 
-    _commonInit();
-
-    _vehicleLinkManager->_addLink(link);
+    _commonInit(link);
 
     // Set video stream to udp if running ArduSub and Video is disabled
     if (sub() && SettingsManager::instance()->videoSettings()->videoSource()->rawValue() == VideoSettings::videoDisabled) {
@@ -202,8 +198,6 @@ Vehicle::Vehicle(MAV_AUTOPILOT              firmwareType,
     , _vehicleType                      (vehicleType)
     , _defaultCruiseSpeed               (SettingsManager::instance()->appSettings()->offlineEditingCruiseSpeed()->rawValue().toDouble())
     , _defaultHoverSpeed                (SettingsManager::instance()->appSettings()->offlineEditingHoverSpeed()->rawValue().toDouble())
-    , _mavlinkProtocolRequestComplete   (true)
-    , _maxProtoVersion                  (200)
     , _capabilityBitsKnown              (true)
     , _capabilityBits                   (MAV_PROTOCOL_CAPABILITY_MISSION_FENCE | MAV_PROTOCOL_CAPABILITY_MISSION_RALLY)
     , _trajectoryPoints                 (new TrajectoryPoints(this, this))
@@ -223,7 +217,7 @@ Vehicle::Vehicle(MAV_AUTOPILOT              firmwareType,
         trackFirmwareVehicleTypeChanges();
     }
 
-    _commonInit();
+    _commonInit(nullptr /* link */);
 
     connect(SettingsManager::instance()->appSettings()->offlineEditingCruiseSpeed(),   &Fact::rawValueChanged, this, &Vehicle::_offlineCruiseSpeedSettingChanged);
     connect(SettingsManager::instance()->appSettings()->offlineEditingHoverSpeed(),    &Fact::rawValueChanged, this, &Vehicle::_offlineHoverSpeedSettingChanged);
@@ -247,21 +241,17 @@ void Vehicle::stopTrackingFirmwareVehicleTypeChanges(void)
     disconnect(SettingsManager::instance()->appSettings()->offlineEditingVehicleClass(),  &Fact::rawValueChanged, this, &Vehicle::_offlineVehicleTypeSettingChanged);
 }
 
-void Vehicle::_commonInit()
+void Vehicle::_commonInit(LinkInterface* link)
 {
     _firmwarePlugin = FirmwarePluginManager::instance()->firmwarePluginForAutopilot(_firmwareType, _vehicleType);
 
     connect(_firmwarePlugin, &FirmwarePlugin::toolIndicatorsChanged, this, &Vehicle::toolIndicatorsChanged);
-    connect(_firmwarePlugin, &FirmwarePlugin::modeIndicatorsChanged, this, &Vehicle::modeIndicatorsChanged);
 
     connect(this, &Vehicle::coordinateChanged,      this, &Vehicle::_updateDistanceHeadingHome);
     connect(this, &Vehicle::coordinateChanged,      this, &Vehicle::_updateDistanceHeadingGCS);
     connect(this, &Vehicle::homePositionChanged,    this, &Vehicle::_updateDistanceHeadingHome);
     connect(this, &Vehicle::hobbsMeterChanged,      this, &Vehicle::_updateHobbsMeter);
     connect(this, &Vehicle::coordinateChanged,      this, &Vehicle::_updateAltAboveTerrain);
-    // Initialize alt above terrain to Nan so frontend can display it correctly in case the terrain query had no response
-    _altitudeAboveTerrFact.setRawValue(qQNaN());
-
     connect(this, &Vehicle::vehicleTypeChanged,     this, &Vehicle::inFwdFlightChanged);
     connect(this, &Vehicle::vtolInFwdFlightChanged, this, &Vehicle::inFwdFlightChanged);
 
@@ -284,13 +274,23 @@ void Vehicle::_commonInit()
     _initialConnectStateMachine     = new InitialConnectStateMachine    (this, this);
     _ftpManager                     = new FTPManager                    (this);
 
-    _vehicleLinkManager             = new VehicleLinkManager            (this);
+    _vehicleLinkManager = new VehicleLinkManager(this);
+    if (link) {
+        _vehicleLinkManager->_addLink(link);
+    }
 
     connect(_standardModes, &StandardModes::modesUpdated, this, &Vehicle::flightModesChanged);
+    // Re-emit flightModeChanged after available modes mapping updates so UI refreshes
+    // the human-readable mode name even if HEARTBEAT arrived earlier.
+    connect(_standardModes, &StandardModes::modesUpdated, this, [this]() {
+        emit flightModeChanged(flightMode());
+    });
 
     _parameterManager = new ParameterManager(this);
     connect(_parameterManager, &ParameterManager::parametersReadyChanged, this, &Vehicle::_parametersReady);
-
+    connect(_parameterManager, &ParameterManager::parametersReadyChanged, this, [this](bool) {
+        emit hasGripperChanged();
+    });
     connect(_initialConnectStateMachine, &InitialConnectStateMachine::progressUpdate,
             this, &Vehicle::_gotProgressUpdate);
     connect(_parameterManager, &ParameterManager::loadProgressChanged, this, &Vehicle::_gotProgressUpdate);
@@ -344,8 +344,6 @@ void Vehicle::_commonInit()
         }
     }
 
-    _flightDistanceFact.setRawValue(0);
-    _flightTimeFact.setRawValue(0);
     _flightTimeUpdater.setInterval(1000);
     _flightTimeUpdater.setSingleShot(false);
     connect(&_flightTimeUpdater, &QTimer::timeout, this, &Vehicle::_updateFlightTime);
@@ -361,8 +359,7 @@ void Vehicle::_commonInit()
 
     _gimbalController = new GimbalController(this);
 
-    // Create camera manager instance
-    _cameraManager = _firmwarePlugin->createCameraManager(this);
+    _createCameraManager();
 }
 
 Vehicle::~Vehicle()
@@ -376,21 +373,7 @@ Vehicle::~Vehicle()
     _autopilotPlugin = nullptr;
 }
 
-void Vehicle::prepareDelete()
-{
-    // Clean up camera manager to stop all timers and prevent crashes during destruction
-    if(_cameraManager) {
-        // because of _cameraManager QML bindings check for nullptr won't work in the binding pipeline
-        // the dangling pointer access will cause a runtime fault
-        auto tmpCameras = _cameraManager;
-        _cameraManager = nullptr;
-        delete tmpCameras;
-        emit cameraManagerChanged();
-        // Note: Removed qApp->processEvents() to prevent MAVLink crashes during destruction
-    }
-}
-
-void Vehicle::deleteCameraManager()
+void Vehicle::_deleteCameraManager()
 {
     if(_cameraManager) {
         delete _cameraManager;
@@ -398,7 +381,7 @@ void Vehicle::deleteCameraManager()
     }
 }
 
-void Vehicle::deleteGimbalController()
+void Vehicle::_deleteGimbalController()
 {
     if (_gimbalController) {
         delete _gimbalController;
@@ -453,13 +436,6 @@ void Vehicle::resetCounters()
 
 void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t message)
 {
-    // If the link is already running at Mavlink V2 set our max proto version to it.
-    unsigned mavlinkVersion = MAVLinkProtocol::instance()->getCurrentVersion();
-    if (_maxProtoVersion != mavlinkVersion && mavlinkVersion >= 200) {
-        _maxProtoVersion = mavlinkVersion;
-        qCDebug(VehicleLog) << "_mavlinkMessageReceived Link already running Mavlink v2. Setting _maxProtoVersion" << _maxProtoVersion;
-    }
-
     if (message.sysid != _id && message.sysid != 0) {
         // We allow RADIO_STATUS messages which come from a link the vehicle is using to pass through and be handled
         if (!(message.msgid == MAVLINK_MSG_ID_RADIO_STATUS && _vehicleLinkManager->containsLink(link))) {
@@ -651,7 +627,7 @@ void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t mes
     }
     case MAVLINK_MSG_ID_CONTROL_STATUS:
         _handleControlStatus(message);
-        break;   
+        break;
     case MAVLINK_MSG_ID_COMMAND_LONG:
         _handleCommandLong(message);
         break;
@@ -894,31 +870,6 @@ void Vehicle::_setCapabilities(uint64_t capabilityBits)
     qCDebug(VehicleLog) << QString("Vehicle %1 GeoFence").arg(_capabilityBits & MAV_PROTOCOL_CAPABILITY_MISSION_FENCE ? supports : doesNotSupport);
     qCDebug(VehicleLog) << QString("Vehicle %1 RallyPoints").arg(_capabilityBits & MAV_PROTOCOL_CAPABILITY_MISSION_RALLY ? supports : doesNotSupport);
     qCDebug(VehicleLog) << QString("Vehicle %1 Terrain").arg(_capabilityBits & MAV_PROTOCOL_CAPABILITY_TERRAIN ? supports : doesNotSupport);
-
-    _setMaxProtoVersionFromBothSources();
-}
-
-void Vehicle::_setMaxProtoVersion(unsigned version) {
-
-    // Set only once or if we need to reduce the max version
-    if (_maxProtoVersion == 0 || version < _maxProtoVersion) {
-        qCDebug(VehicleLog) << "_setMaxProtoVersion before:after" << _maxProtoVersion << version;
-        _maxProtoVersion = version;
-        emit requestProtocolVersion(_maxProtoVersion);
-    }
-}
-
-void Vehicle::_setMaxProtoVersionFromBothSources()
-{
-    if (_mavlinkProtocolRequestComplete && _capabilityBitsKnown) {
-        if (_mavlinkProtocolRequestMaxProtoVersion != 0) {
-            qCDebug(VehicleLog) << "_setMaxProtoVersionFromBothSources using protocol version message";
-            _setMaxProtoVersion(_mavlinkProtocolRequestMaxProtoVersion);
-        } else {
-            qCDebug(VehicleLog) << "_setMaxProtoVersionFromBothSources using capability bits";
-            _setMaxProtoVersion(capabilityBits() & MAV_PROTOCOL_CAPABILITY_MAVLINK2 ? 200 : 100);
-        }
-    }
 }
 
 QString Vehicle::vehicleUIDStr()
@@ -1917,7 +1868,7 @@ void Vehicle::virtualTabletJoystickValue(double roll, double pitch, double yaw,
                     static_cast<float>(pitch),
                     static_cast<float>(yaw),
                     static_cast<float>(thrust),
-                    0, 0);
+                    0, 0, NAN, NAN);
     }
 }
 
@@ -1946,6 +1897,11 @@ bool Vehicle::sub() const
     return QGCMAVLink::isSub(vehicleType());
 }
 
+bool Vehicle::spacecraft() const
+{
+    return QGCMAVLink::isSpacecraft(vehicleType());
+}
+
 bool Vehicle::multiRotor() const
 {
     return QGCMAVLink::isMultiRotor(vehicleType());
@@ -2127,8 +2083,8 @@ double Vehicle::minimumEquivalentAirspeed()
     return _firmwarePlugin->minimumEquivalentAirspeed(this);
 }
 
-bool Vehicle::hasGripper()  const 
-{ 
+bool Vehicle::hasGripper()  const
+{
     return _firmwarePlugin->hasGripper(this);
 }
 
@@ -2600,7 +2556,6 @@ bool Vehicle::_sendMavCommandShouldRetry(MAV_CMD command)
         // links where commands could be lost. Also these commands tend to just be requesting status so if they end up being delayed
         // there are no safety concerns that could occur.
     case MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES:
-    case MAV_CMD_REQUEST_PROTOCOL_VERSION:
     case MAV_CMD_REQUEST_MESSAGE:
     case MAV_CMD_PREFLIGHT_STORAGE:
     case MAV_CMD_RUN_PREARM_CHECKS:
@@ -2627,12 +2582,12 @@ bool Vehicle::_commandCanBeDuplicated(MAV_CMD command)
 }
 
 void Vehicle::_sendMavCommandWorker(
-    bool        commandInt, 
-    bool        showError, 
+    bool        commandInt,
+    bool        showError,
     const MavCmdAckHandlerInfo_t* ackHandlerInfo,
-    int         targetCompId, 
-    MAV_CMD     command, 
-    MAV_FRAME   frame, 
+    int         targetCompId,
+    MAV_CMD     command,
+    MAV_FRAME   frame,
     float param1, float param2, float param3, float param4, double param5, double param6, float param7)
 {
     // We can't send commands to compIdAll using this method. The reason being that we would get responses back possibly from multiple components
@@ -2698,7 +2653,8 @@ void Vehicle::_sendMavCommandFromList(int index)
 {
     MavCommandListEntry_t commandEntry = _mavCommandList[index];
 
-    QString rawCommandName  = MissionCommandTree::instance()->rawName(commandEntry.command);
+    QString rawCommandName = MissionCommandTree::instance()->rawName(commandEntry.command);
+    QString friendlyName = MissionCommandTree::instance()->friendlyName(commandEntry.command);
 
     if (++_mavCommandList[index].tryCount > commandEntry.maxTries) {
         qCDebug(VehicleLog) << Q_FUNC_INFO << "giving up after max retries" << rawCommandName;
@@ -2711,7 +2667,7 @@ void Vehicle::_sendMavCommandFromList(int index)
             emit mavCommandResult(_id, commandEntry.targetCompId, commandEntry.command, MAV_RESULT_FAILED, MavCmdResultFailureNoResponseToCommand);
         }
         if (commandEntry.showError) {
-            qgcApp()->showAppMessage(tr("Vehicle did not respond to command: %1").arg(rawCommandName));
+            qgcApp()->showAppMessage(tr("Vehicle did not respond to command: %1").arg(friendlyName));
         }
         return;
     }
@@ -2925,7 +2881,7 @@ void Vehicle::_waitForMavlinkMessageMessageReceivedHandler(const mavlink_message
         // We use any incoming message as a trigger to check timeouts on message requests
 
         for (auto& compIdEntry : _requestMessageInfoMap) {
-            for (auto requestMessageInfo : compIdEntry) {    
+            for (auto requestMessageInfo : compIdEntry) {
                 if (requestMessageInfo->messageWaitElapsedTimer.isValid() && requestMessageInfo->messageWaitElapsedTimer.elapsed() > (qgcApp()->runningUnitTests() ? 50 : 1000)) {
                     auto resultHandler      = requestMessageInfo->resultHandler;
                     auto resultHandlerData  = requestMessageInfo->resultHandlerData;
@@ -3374,14 +3330,6 @@ QString Vehicle::vehicleImageOutline() const
         return QString();
 }
 
-QVariant Vehicle::mainStatusIndicatorContentItem()
-{
-    if(_firmwarePlugin) {
-        return _firmwarePlugin->mainStatusIndicatorContentItem(this);
-    }
-    return QVariant();
-}
-
 const QVariantList& Vehicle::toolIndicators()
 {
     if(_firmwarePlugin) {
@@ -3391,24 +3339,6 @@ const QVariantList& Vehicle::toolIndicators()
     return emptyList;
 }
 
-const QVariantList& Vehicle::modeIndicators()
-{
-    if(_firmwarePlugin) {
-        return _firmwarePlugin->modeIndicators(this);
-    }
-    static QVariantList emptyList;
-    return emptyList;
-}
-
-const QVariantList& Vehicle::staticCameraList() const
-{
-    if (_cameraManager) {
-        return _cameraManager->cameraList();
-    }
-    static QVariantList emptyList;
-    return emptyList;
-}
-
 void Vehicle::_setupAutoDisarmSignalling()
 {
     QString param = _firmwarePlugin->autoDisarmParameter(this);
@@ -3671,8 +3601,8 @@ void Vehicle::doSetHome(const QGeoCoordinate& coord)
             disconnect(_currentDoSetHomeTerrainAtCoordinateQuery, &TerrainAtCoordinateQuery::terrainDataReceived, this, &Vehicle::_doSetHomeTerrainReceived);
             _currentDoSetHomeTerrainAtCoordinateQuery = nullptr;
         }
-        // Save the coord for using when our terrain data arrives. If there was a pending terrain query paired with an older coordinate it is safe to 
-        // Override now, as we just disconnected the signal that would trigger the command sending 
+        // Save the coord for using when our terrain data arrives. If there was a pending terrain query paired with an older coordinate it is safe to
+        // Override now, as we just disconnected the signal that would trigger the command sending
         _doSetHomeCoordinate = coord;
         // Now setup and trigger the new terrain query
         _currentDoSetHomeTerrainAtCoordinateQuery = new TerrainAtCoordinateQuery(true /* autoDelet */);
@@ -3881,7 +3811,7 @@ void Vehicle::clearAllParamMapRC(void)
     }
 }
 
-void Vehicle::sendJoystickDataThreadSafe(float roll, float pitch, float yaw, float thrust, quint16 buttons, quint16 buttons2)
+void Vehicle::sendJoystickDataThreadSafe(float roll, float pitch, float yaw, float thrust, quint16 buttons, quint16 buttons2, float gimbalPitch, float gimbalYaw)
 {
     SharedLinkInterfacePtr sharedLink = vehicleLinkManager()->primaryLink().lock();
     if (!sharedLink) {
@@ -3901,6 +3831,17 @@ void Vehicle::sendJoystickDataThreadSafe(float roll, float pitch, float yaw, flo
     float newPitchCommand  =    pitch * axesScaling;    // Joystick data is reverse of mavlink values
     float newYawCommand    =    yaw * axesScaling;
     float newThrustCommand =    thrust * axesScaling;
+    float newGimbalPitch   =    gimbalPitch * axesScaling;
+    float newGimbalYaw     =    gimbalYaw * axesScaling;
+    uint8_t extensions     =    0;
+
+    if (std::isfinite(gimbalPitch)) {
+        extensions |= 1;
+    }
+
+    if (std::isfinite(gimbalYaw)) {
+        extensions |= 2;
+    }
 
     mavlink_msg_manual_control_pack_chan(
         static_cast<uint8_t>(MAVLinkProtocol::instance()->getSystemId()),
@@ -3913,8 +3854,9 @@ void Vehicle::sendJoystickDataThreadSafe(float roll, float pitch, float yaw, flo
         static_cast<int16_t>(newThrustCommand),
         static_cast<int16_t>(newYawCommand),
         buttons, buttons2,
-        0,
-        0, 0,
+        extensions,
+        static_cast<int16_t>(newGimbalPitch),
+        static_cast<int16_t>(newGimbalYaw),
         0, 0, 0, 0, 0, 0
     );
     sendMessageOnLinkThreadSafe(sharedLink.get(), message);
@@ -3929,32 +3871,14 @@ void Vehicle::triggerSimpleCamera()
                    1.0);                        // trigger camera
 }
 
-void Vehicle::setGripperAction(GRIPPER_ACTIONS gripperAction)
+void Vehicle::sendGripperAction(QGCMAVLink::GripperActions gripperAction)
 {
     sendMavCommand(
             _defaultComponentId,
             MAV_CMD_DO_GRIPPER,
-            false,                               // Don't show errors
-            0,                                   // Param1: Gripper ID (Always set to 0)
-            gripperAction,                       // Param2: Gripper Action
-            0, 0, 0, 0, 0);                      // Param 3 ~ 7 : unused
-}
-
-void Vehicle::sendGripperAction(QGCMAVLink::GRIPPER_OPTIONS gripperOption)
-{
-    switch(gripperOption) {
-        case QGCMAVLink::Gripper_release:
-            setGripperAction(GRIPPER_ACTION_RELEASE);
-            break;
-        case QGCMAVLink::Gripper_grab:
-            setGripperAction(GRIPPER_ACTION_GRAB);
-            break;
-        case QGCMAVLink::Invalid_option:
-            qDebug("unknown function");
-            break;
-        default: 
-            break;
-    }
+            true,                   // Show errors
+            0,                      // Param1: Gripper ID (Always set to 0)
+            gripperAction);         // Param2: Gripper Action
 }
 
 void Vehicle::setEstimatorOrigin(const QGeoCoordinate& centerCoord)
@@ -4011,7 +3935,7 @@ void Vehicle::startTimerRevertAllowTakeover()
     _timerRevertAllowTakeover.setInterval(operatorControlTakeoverTimeoutMsecs());
     // Disconnect any previous connections to avoid multiple handlers
     disconnect(&_timerRevertAllowTakeover, &QTimer::timeout, nullptr, nullptr);
-    
+
     connect(&_timerRevertAllowTakeover, &QTimer::timeout, this, [this](){
         if (MAVLinkProtocol::instance()->getSystemId() == _sysid_in_control) {
             this->requestOperatorControl(false);
@@ -4065,12 +3989,12 @@ void Vehicle::_requestOperatorControlAckHandler(void* resultHandlerData, int com
         default:
             break;
     }
-    
+
     Vehicle* vehicle = static_cast<Vehicle*>(resultHandlerData);
     if (!vehicle) {
         return;
     }
-    
+
     if (ack.result == MAV_RESULT_ACCEPTED) {
         qCDebug(VehicleLog) << "Operator control request accepted";
     } else {
@@ -4230,6 +4154,45 @@ void Vehicle::setMessageRate(uint8_t compId, uint16_t msgId, int32_t rate)
     );
 }
 
+QVariant Vehicle::expandedToolbarIndicatorSource(const QString& indicatorName)
+{
+    return _firmwarePlugin->expandedToolbarIndicatorSource(this, indicatorName);
+}
+
+QString Vehicle::requestMessageResultHandlerFailureCodeToString(RequestMessageResultHandlerFailureCode_t failureCode)
+{
+    switch(failureCode)
+    {
+    case RequestMessageNoFailure:
+        return QStringLiteral("No Failure");
+    case RequestMessageFailureCommandError:
+        return QStringLiteral("Command Error");
+    case RequestMessageFailureCommandNotAcked:
+        return QStringLiteral("Command Not Acked");
+    case RequestMessageFailureMessageNotReceived:
+        return QStringLiteral("Message Not Received");
+    case RequestMessageFailureDuplicateCommand:
+        return QStringLiteral("Duplicate Command");
+    default:
+        return QStringLiteral("Unknown (%1)").arg(failureCode);
+    }
+}
+
+QString Vehicle::mavCmdResultFailureCodeToString(MavCmdResultFailureCode_t failureCode)
+{
+    switch(failureCode)
+    {
+    case MavCmdResultCommandResultOnly:
+        return QStringLiteral("Command Result Only");
+    case MavCmdResultFailureNoResponseToCommand:
+        return QStringLiteral("No Response To Command");
+    case MavCmdResultFailureDuplicateCommand:
+        return QStringLiteral("Duplicate Command");
+    default:
+        return QStringLiteral("Unknown (%1)").arg(failureCode);
+    }
+}
+
 /*===========================================================================*/
 /*                         ardupilotmega Dialect                             */
 /*===========================================================================*/
@@ -4403,3 +4366,26 @@ MAVLinkLogManager *Vehicle::mavlinkLogManager() const
 }
 
 /*---------------------------------------------------------------------------*/
+/*===========================================================================*/
+/*                             Camera Manager                                */
+/*===========================================================================*/
+
+void Vehicle::_createCameraManager()
+{
+    if (!_cameraManager && _firmwarePlugin) {
+        _cameraManager = _firmwarePlugin->createCameraManager(this);
+        emit cameraManagerChanged();
+    }
+}
+
+const QVariantList &Vehicle::staticCameraList() const
+{
+    if (_cameraManager) {
+        return _cameraManager->cameraList();
+    }
+
+    static QVariantList emptyCameraList;
+    return emptyCameraList;
+}
+
+/*---------------------------------------------------------------------------*/
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index d15f2cf6c87f..b246b605a636 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -98,7 +98,6 @@ class Vehicle : public VehicleFactGroup
     Q_MOC_INCLUDE("VehicleObjectAvoidance.h")
     Q_MOC_INCLUDE("Autotune.h")
     Q_MOC_INCLUDE("RemoteIDManager.h")
-    Q_MOC_INCLUDE("QGCCameraManager.h")
     Q_MOC_INCLUDE("Actuators.h")
     Q_MOC_INCLUDE("MAVLinkLogManager.h")
     Q_MOC_INCLUDE("LinkInterface.h")
@@ -203,12 +202,8 @@ class Vehicle : public VehicleFactGroup
     Q_PROPERTY(unsigned int         telemetryTXBuffer           READ telemetryTXBuffer                                              NOTIFY telemetryTXBufferChanged)
     Q_PROPERTY(int                  telemetryLNoise             READ telemetryLNoise                                                NOTIFY telemetryLNoiseChanged)
     Q_PROPERTY(int                  telemetryRNoise             READ telemetryRNoise                                                NOTIFY telemetryRNoiseChanged)
-    Q_PROPERTY(QVariant          mainStatusIndicatorContentItem READ mainStatusIndicatorContentItem                                 CONSTANT)
     Q_PROPERTY(QVariantList         toolIndicators              READ toolIndicators                                                 NOTIFY toolIndicatorsChanged)
-    Q_PROPERTY(QVariantList         modeIndicators              READ modeIndicators                                                 NOTIFY modeIndicatorsChanged)
     Q_PROPERTY(bool              initialPlanRequestComplete     READ initialPlanRequestComplete                                     NOTIFY initialPlanRequestCompleteChanged)
-    Q_PROPERTY(QVariantList         staticCameraList            READ staticCameraList                                               CONSTANT)
-    Q_PROPERTY(QGCCameraManager*    cameraManager               READ cameraManager                                                  NOTIFY cameraManagerChanged)
     Q_PROPERTY(QString              hobbsMeter                  READ hobbsMeter                                                     NOTIFY hobbsMeterChanged)
     Q_PROPERTY(bool                 inFwdFlight                 READ inFwdFlight                                                    NOTIFY inFwdFlightChanged)
     Q_PROPERTY(bool                 vtolInFwdFlight             READ vtolInFwdFlight            WRITE setVtolInFwdFlight            NOTIFY vtolInFwdFlightChanged)
@@ -218,7 +213,7 @@ class Vehicle : public VehicleFactGroup
     Q_PROPERTY(quint64              mavlinkLossCount            READ mavlinkLossCount                                               NOTIFY mavlinkStatusChanged)
     Q_PROPERTY(float                mavlinkLossPercent          READ mavlinkLossPercent                                             NOTIFY mavlinkStatusChanged)
     Q_PROPERTY(GimbalController*    gimbalController            READ gimbalController                                               CONSTANT)
-    Q_PROPERTY(bool                 hasGripper                  READ hasGripper                                                     CONSTANT)
+    Q_PROPERTY(bool                 hasGripper                  READ hasGripper                                                     NOTIFY hasGripperChanged)
     Q_PROPERTY(bool                 isROIEnabled                READ isROIEnabled                                                   NOTIFY isROIEnabledChanged)
     Q_PROPERTY(CheckList            checkListState              READ checkListState             WRITE setCheckListState             NOTIFY checkListStateChanged)
     Q_PROPERTY(bool                 readyToFlyAvailable         READ readyToFlyAvailable                                            NOTIFY readyToFlyAvailableChanged)  ///< true: readyToFly signalling is available on this vehicle
@@ -398,7 +393,7 @@ class Vehicle : public VehicleFactGroup
     Q_ENUM(PIDTuningTelemetryMode)
 
     Q_INVOKABLE void setPIDTuningTelemetryMode(PIDTuningTelemetryMode mode);
-    
+
     Q_INVOKABLE void forceArm           ();
 
     /// Sends PARAM_MAP_RC message to vehicle
@@ -421,6 +416,8 @@ class Vehicle : public VehicleFactGroup
 
     Q_INVOKABLE void sendSetupSigning();
 
+    Q_INVOKABLE QVariant expandedToolbarIndicatorSource(const QString& indicatorName);
+
     bool    isInitialConnectComplete() const;
     bool    guidedModeSupported     () const;
     bool    pauseVehicleSupported   () const;
@@ -448,7 +445,7 @@ class Vehicle : public VehicleFactGroup
 
     bool joystickEnabled            () const;
     void setJoystickEnabled         (bool enabled);
-    void sendJoystickDataThreadSafe (float roll, float pitch, float yaw, float thrust, quint16 buttons, quint16 buttons2);
+    void sendJoystickDataThreadSafe (float roll, float pitch, float yaw, float thrust, quint16 buttons, quint16 buttons2, float gimbalPitch, float gimbalYaw);
 
     // Property accesors
     int id() const{ return _id; }
@@ -486,15 +483,6 @@ class Vehicle : public VehicleFactGroup
 
     bool airship() const;
 
-    /**
-     * @brief Send MAV_CMD_DO_GRIPPER command to trigger specified action in the vehicle
-     *
-     * @param gripperAction Gripper action to trigger
-    */
-
-    void setGripperAction(GRIPPER_ACTIONS gripperAction);
-    Q_INVOKABLE void sendGripperAction(QGCMAVLink::GRIPPER_OPTIONS gripperOption);
-
     void pairRX(int rxType, int rxSubType);
 
     bool fixedWing() const;
@@ -502,6 +490,7 @@ class Vehicle : public VehicleFactGroup
     bool vtol() const;
     bool rover() const;
     bool sub() const;
+    bool spacecraft() const;
 
     bool supportsThrottleModeCenterZero () const;
     bool supportsNegativeThrust         ();
@@ -585,11 +574,6 @@ class Vehicle : public VehicleFactGroup
     bool            requiresGpsFix              () const { return static_cast<bool>(_onboardControlSensorsPresent & QGCMAVLink::SysStatusSensorGPS); }
     bool            hilMode                     () const { return _base_mode & MAV_MODE_FLAG_HIL_ENABLED; }
     Actuators*      actuators                   () const { return _actuators; }
-
-    /// Get the maximum MAVLink protocol version supported
-    /// @return the maximum version
-    unsigned        maxProtoVersion         () const { return _maxProtoVersion; }
-
     bool            mavlinkSigning          () const { return _mavlinkSigning; }
 
     void startCalibration   (QGCMAVLink::CalibrationType calType);
@@ -668,6 +652,8 @@ class Vehicle : public VehicleFactGroup
         MavCmdResultFailureDuplicateCommand,    ///< Unable to send command since duplicate is already being waited on for response
     } MavCmdResultFailureCode_t;
 
+    static QString mavCmdResultFailureCodeToString(MavCmdResultFailureCode_t failureCode);
+
     /// Callback for sendMavCommandWithHandler which handles MAV_RESULT_IN_PROGRESS acks
     ///     @param progressHandlerData  Opaque data passed in to sendMavCommand call
     ///     @param ack                  Received COMMAND_ACK
@@ -682,7 +668,7 @@ class Vehicle : public VehicleFactGroup
     // Callback info for sendMavCommandWithHandler
     typedef struct MavCmdAckHandlerInfo_s {
         MavCmdResultHandler     resultHandler;          ///> nullptr for no handler
-        void*                   resultHandlerData; 
+        void*                   resultHandlerData;
         MavCmdProgressHandler   progressHandler;
         void*                   progressHandlerData;    ///> nullptr for no handler
     } MavCmdAckHandlerInfo_t;
@@ -690,7 +676,7 @@ class Vehicle : public VehicleFactGroup
     /// Sends the command and calls the callback with the result
     void sendMavCommandWithHandler(
         const MavCmdAckHandlerInfo_t* ackHandlerInfo,   ///> nullptr to signale no handlers
-        int compId, MAV_CMD command, 
+        int compId, MAV_CMD command,
         float param1 = 0.0f, float param2 = 0.0f, float param3 = 0.0f, float param4 = 0.0f, float param5 = 0.0f, float param6 = 0.0f, float param7 = 0.0f);
 
     /// Sends the command and calls the callback with the result
@@ -698,7 +684,7 @@ class Vehicle : public VehicleFactGroup
     ///     @param resultHandleData Opaque data passed through callback
     void sendMavCommandIntWithHandler(
         const MavCmdAckHandlerInfo_t* ackHandlerInfo,   ///> nullptr to signale no handlers
-        int compId, MAV_CMD command, MAV_FRAME frame, 
+        int compId, MAV_CMD command, MAV_FRAME frame,
         float param1 = 0.0f, float param2 = 0.0f, float param3 = 0.0f, float param4 = 0.0f, double param5 = 0.0f, double param6 = 0.0f, float param7 = 0.0f);
 
     /// Sends the command and calls the fallback lambda function in
@@ -718,6 +704,8 @@ class Vehicle : public VehicleFactGroup
         RequestMessageFailureDuplicateCommand,    ///< Unabled to send command since another request message isduplicate is already being waited on for response
     } RequestMessageResultHandlerFailureCode_t;
 
+    static QString requestMessageResultHandlerFailureCodeToString(RequestMessageResultHandlerFailureCode_t failureCode);
+
     /// Callback for requestMessage
     ///     @param resultHandlerData    Opaque data which was passed in to requestMessage call
     ///     @param commandResult        Result from ack to REQUEST_MESSAGE command
@@ -775,15 +763,11 @@ class Vehicle : public VehicleFactGroup
     QString vehicleImageOpaque  () const;
     QString vehicleImageOutline () const;
 
-    QVariant                    mainStatusIndicatorContentItem  ();
-    const QVariantList&         toolIndicators                  ();
-    const QVariantList&         modeIndicators                  ();
-    const QVariantList&         staticCameraList                () const;
+    const QVariantList&         toolIndicators();
 
     bool capabilitiesKnown      () const { return _capabilityBitsKnown; }
     uint64_t capabilityBits     () const { return _capabilityBits; }    // Change signalled by capabilityBitsChanged
 
-    QGCCameraManager*           cameraManager       () { return _cameraManager; }
     QString                     hobbsMeter          ();
 
     /// The vehicle is responsible for making the initial request for the Plan.
@@ -795,8 +779,6 @@ class Vehicle : public VehicleFactGroup
     void _setFlying(bool flying);
     void _setLanding(bool landing);
     void _setHomePosition(QGeoCoordinate& homeCoord);
-    void _setMaxProtoVersion(unsigned version);
-    void _setMaxProtoVersionFromBothSources();
 
     /// Vehicle is about to be deleted
     void prepareDelete();
@@ -804,9 +786,6 @@ class Vehicle : public VehicleFactGroup
     /// Delete gimbal controller, handy for RequestMessageTest.cc, otherwise gimbal controller message requests will mess with this test
     void deleteGimbalController();
 
-    /// Delete camera manager, just for testing
-    void deleteCameraManager();
-
     quint64     mavlinkSentCount        () const{ return _mavlinkSentCount; }        /// Calculated total number of messages sent to us
     quint64     mavlinkReceivedCount    () const{ return _mavlinkReceivedCount; }    /// Total number of sucessful messages received
     quint64     mavlinkLossCount        () const{ return _mavlinkLossCount; }        /// Total number of lost messages
@@ -830,6 +809,7 @@ public slots:
     void setVtolInFwdFlight                 (bool vtolInFwdFlight);
     void _offlineFirmwareTypeSettingChanged (QVariant varFirmwareType); // Should only be used by MissionControler to set firmware from Plan file
     void _offlineVehicleTypeSettingChanged  (QVariant varVehicleType);  // Should only be used by MissionController to set vehicle type from Plan file
+    Q_INVOKABLE void sendGripperAction(QGCMAVLink::GripperActions gripperOption);
 
 signals:
     void coordinateChanged              (QGeoCoordinate coordinate);
@@ -850,13 +830,11 @@ public slots:
     void defaultHoverSpeedChanged       (double hoverSpeed);
     void firmwareTypeChanged            ();
     void vehicleTypeChanged             ();
-    void cameraManagerChanged           ();
     void hobbsMeterChanged              ();
     void capabilitiesKnownChanged       (bool capabilitiesKnown);
     void initialPlanRequestCompleteChanged(bool initialPlanRequestComplete);
     void capabilityBitsChanged          (uint64_t capabilityBits);
     void toolIndicatorsChanged          ();
-    void modeIndicatorsChanged          ();
     void calibrationEventReceived       (int uasid, int componentid, int severity, QSharedPointer<events::parser::ParsedEvent> event);
     void checkListStateChanged          ();
     void longitudeChanged               ();
@@ -882,6 +860,7 @@ public slots:
     void requiresGpsFixChanged          ();
     void haveMRSpeedLimChanged          ();
     void haveFWSpeedLimChanged          ();
+    void hasGripperChanged              ();
 
     void firmwareVersionChanged         ();
     void firmwareCustomVersionChanged   ();
@@ -911,8 +890,6 @@ public slots:
     // MAVlink Serial Data
     void mavlinkSerialControl           (uint8_t device, uint8_t flags, uint16_t timeout, uint32_t baudrate, QByteArray data);
 
-    // MAVLink protocol version
-    void requestProtocolVersion         (unsigned version);
     void mavlinkStatusChanged           ();
     void mavlinkSigningChanged          ();
 
@@ -993,7 +970,7 @@ private slots:
     void _handleMavlinkLoggingData      (mavlink_message_t& message);
     void _handleMavlinkLoggingDataAcked (mavlink_message_t& message);
     void _ackMavlinkLogData             (uint16_t sequence);
-    void _commonInit                    ();
+    void _commonInit                    (LinkInterface* link);
     void _setupAutoDisarmSignalling     ();
     void _setCapabilities               (uint64_t capabilityBits);
     void _updateArmed                   (bool armed);
@@ -1008,6 +985,10 @@ private slots:
 
     static void _rebootCommandResultHandler(void* resultHandlerData, int compId, const mavlink_command_ack_t& ack, MavCmdResultFailureCode_t failureCode);
 
+    // The following two methods should only be called by unit tests
+    void _deleteGimbalController();
+    void _deleteCameraManager();
+
     int     _id;                    ///< Mavlink system id
     int     _defaultComponentId;
     bool    _offlineEditingVehicle = false; ///< true: This Vehicle is a "disconnected" vehicle for ui use while offline editing
@@ -1053,9 +1034,6 @@ private slots:
     uint32_t        _telemetryTXBuffer = 0;
     int             _telemetryLNoise = 0;
     int             _telemetryRNoise = 0;
-    bool            _mavlinkProtocolRequestComplete         = false;
-    unsigned        _mavlinkProtocolRequestMaxProtoVersion  = 0;
-    unsigned        _maxProtoVersion                        = 0;
     bool            _capabilityBitsKnown                    = false;
     uint64_t        _capabilityBits                         = 0;
     CheckList       _checkListState                         = CheckListNotSetup;
@@ -1066,7 +1044,6 @@ private slots:
 
     SysStatusSensorInfo _sysStatusSensorInfo;
 
-    QGCCameraManager* _cameraManager = nullptr;
 
     QString             _prearmError;
     QTimer              _prearmErrorTimer;
@@ -1218,9 +1195,9 @@ private slots:
     static const int                _mavCommandAckTimeoutMSecsHighLatency   = 120000;
 
     void _sendMavCommandWorker  (
-            bool commandInt, bool showError, 
+            bool commandInt, bool showError,
             const MavCmdAckHandlerInfo_t* ackHandlerInfo,   ///> nullptr to signale no handlers
-            int compId, MAV_CMD command, MAV_FRAME frame, 
+            int compId, MAV_CMD command, MAV_FRAME frame,
             float param1, float param2, float param3, float param4, double param5, double param6, float param7);
     void _sendMavCommandFromList(int index);
     int  _findMavCommandListEntryIndex(int targetCompId, MAV_CMD command);
@@ -1323,6 +1300,7 @@ private slots:
     QMultiHash<uint8_t, uint16_t> _unsupportedMessageIds;
     uint16_t _lastSetMsgIntervalMsgId = 0;
 
+/*---------------------------------------------------------------------------*/
 /*===========================================================================*/
 /*                         ardupilotmega Dialect                             */
 /*===========================================================================*/
@@ -1331,6 +1309,7 @@ private slots:
 
     /// Command vehicle to Enable/Disable Motor Interlock
     Q_INVOKABLE void motorInterlock(bool enable);
+
 /*---------------------------------------------------------------------------*/
 /*===========================================================================*/
 /*                         CONTROL STATUS HANDLER                            */
@@ -1360,7 +1339,7 @@ private slots:
     int     requestOperatorControlRemainingMsecs() const { return _timerRequestOperatorControl.remainingTime(); }
     bool    sendControlRequestAllowed() const { return _sendControlRequestAllowed; }
     void    requestOperatorControlStartTimer(int requestTimeoutMsecs);
-    
+
     uint8_t _sysid_in_control = 0;
     uint8_t _gcsControlStatusFlags = 0;
     bool    _gcsControlStatusFlags_SystemManager = 0;
@@ -1423,6 +1402,7 @@ private slots:
     void _createStatusTextHandler();
 
     StatusTextHandler *m_statusTextHandler = nullptr;
+
 /*---------------------------------------------------------------------------*/
 /*===========================================================================*/
 /*                        Image Protocol Manager                             */
@@ -1440,6 +1420,7 @@ private slots:
     void _createImageProtocolManager();
 
     ImageProtocolManager *_imageProtocolManager = nullptr;
+
 /*---------------------------------------------------------------------------*/
 /*===========================================================================*/
 /*                         MAVLink Log Manager                               */
@@ -1458,6 +1439,27 @@ private slots:
 
     MAVLinkLogManager *_mavlinkLogManager = nullptr;
 
+/*---------------------------------------------------------------------------*/
+/*===========================================================================*/
+/*                             Camera Manager                                */
+/*===========================================================================*/
+private:
+    Q_MOC_INCLUDE("QGCCameraManager.h")
+    Q_PROPERTY(QGCCameraManager *cameraManager READ cameraManager NOTIFY cameraManagerChanged)
+    Q_PROPERTY(QVariantList staticCameraList READ staticCameraList CONSTANT)
+
+public:
+    QGCCameraManager *cameraManager() { return _cameraManager; }
+    const QVariantList &staticCameraList() const;
+
+signals:
+    void cameraManagerChanged();
+
+private:
+    void _createCameraManager();
+
+    QGCCameraManager *_cameraManager = nullptr;
+
 /*---------------------------------------------------------------------------*/
 };
 Q_DECLARE_METATYPE(Vehicle::MavCmdResultFailureCode_t)
diff --git a/src/Vehicle/VehicleLinkManager.cc b/src/Vehicle/VehicleLinkManager.cc
index 903fea46d773..74ee1469c3bd 100644
--- a/src/Vehicle/VehicleLinkManager.cc
+++ b/src/Vehicle/VehicleLinkManager.cc
@@ -17,7 +17,7 @@
 #endif
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(VehicleLinkManagerLog, "qgc.vehicle.vehiclelinkmanager")
+QGC_LOGGING_CATEGORY(VehicleLinkManagerLog, "Vehicle.VehicleLinkManager")
 
 VehicleLinkManager::VehicleLinkManager(Vehicle *vehicle)
     : QObject(vehicle)
@@ -252,8 +252,8 @@ void VehicleLinkManager::_linkDisconnected()
 
     _removeLink(link);
     _updatePrimaryLink();
-    if (_rgLinkInfo.isEmpty()) {
-        qCDebug(VehicleLog) << "All links removed. Closing down Vehicle.";
+    if (_rgLinkInfo.isEmpty() && !_allLinksRemovedSignalledByCloseVehicle) {
+        qCDebug(VehicleLog) << "signalling allLinksRemoved";
         emit allLinksRemoved(_vehicle);
     }
 }
@@ -364,6 +364,7 @@ void VehicleLinkManager::closeVehicle()
 
     _rgLinkInfo.clear();
 
+    _allLinksRemovedSignalledByCloseVehicle = true; // Prevent double signal of allLinksRemoved
     emit allLinksRemoved(_vehicle);
 }
 
diff --git a/src/Vehicle/VehicleLinkManager.h b/src/Vehicle/VehicleLinkManager.h
index 3363d69d1fb3..91ceabfefeca 100644
--- a/src/Vehicle/VehicleLinkManager.h
+++ b/src/Vehicle/VehicleLinkManager.h
@@ -89,6 +89,7 @@ private slots:
     bool _communicationLost = false;
     bool _communicationLostEnabled = true;
     bool _autoDisconnect = false;                           ///< true: Automatically disconnect vehicle when last connection goes away or lost heartbeat
+    bool _allLinksRemovedSignalledByCloseVehicle = false;
 
     static constexpr int _commLostCheckTimeoutMSecs = 1000; ///< Check for comm lost once a second
     static constexpr int _heartbeatMaxElpasedMSecs = 3500;  ///< No heartbeat for longer than this indicates comm loss
diff --git a/src/Vehicle/VehicleObjectAvoidance.h b/src/Vehicle/VehicleObjectAvoidance.h
index 0c02445d211a..42800ce0bc06 100644
--- a/src/Vehicle/VehicleObjectAvoidance.h
+++ b/src/Vehicle/VehicleObjectAvoidance.h
@@ -69,4 +69,3 @@ class VehicleObjectAvoidance : public QObject
 
     static constexpr const char* kColPrevParam = "CP_DIST";
 };
-
diff --git a/src/Vehicle/VehicleSetup/Bootloader.cc b/src/Vehicle/VehicleSetup/Bootloader.cc
index 71f5face9214..6cd12c53b466 100644
--- a/src/Vehicle/VehicleSetup/Bootloader.cc
+++ b/src/Vehicle/VehicleSetup/Bootloader.cc
@@ -16,8 +16,8 @@
 #include <QtCore/QFile>
 #include <QtCore/QThread>
 
-QGC_LOGGING_CATEGORY(FirmwareUpgradeLog, "FirmwareUpgradeLog")
-QGC_LOGGING_CATEGORY(FirmwareUpgradeVerboseLog, "FirmwareUpgradeVerboseLog")
+QGC_LOGGING_CATEGORY(FirmwareUpgradeLog, "VehicleSetup.FirmwareUpgrade")
+QGC_LOGGING_CATEGORY(FirmwareUpgradeVerboseLog, "VehicleSetup.FirmwareUpgrade:verbose")
 
 /// This class manages interactions with the bootloader
 Bootloader::Bootloader(bool sikRadio, QObject *parent)
@@ -178,8 +178,16 @@ bool Bootloader::initFlashSequence(void)
 
 bool Bootloader::erase(void)
 {
+    uint32_t timeout = _eraseTimeout;
+
+    // If flash size is bigger then 2MB we need to increase timeout
+    if(_boardFlashSize > 2000 * 1024) {
+        // Increase timeout for each 1MB by 4 seconds
+        timeout += (_boardFlashSize / 1e6) * 4000;
+    }
+
     // Erase is slow, need larger timeout
-    if (!_sendCommand(PROTO_CHIP_ERASE, _eraseTimeout)) {
+    if (!_sendCommand(PROTO_CHIP_ERASE, timeout)) {
         _errorString = tr("Erase failed: %1").arg(_errorString);
         return false;
     }
@@ -232,7 +240,7 @@ bool Bootloader::_write(const uint8_t* data, qint64 maxSize)
         qWarning() << _errorString;
         return false;
     }
-    
+
     return true;
 }
 
@@ -271,12 +279,12 @@ bool Bootloader::_read(uint8_t* data, qint64 cBytesExpected, int readTimeout)
 bool Bootloader::_getCommandResponse(int responseTimeout)
 {
     uint8_t response[2];
-    
+
     if (!_read(response, 2, responseTimeout)) {
         _errorString.prepend(tr("Get Command Response: "));
         return false;
     }
-    
+
     // Make sure we get a good sync response
     if (response[0] != PROTO_INSYNC) {
         _errorString = tr("Invalid sync response: 0x%1 0x%2").arg(response[0], 2, 16, QLatin1Char('0')).arg(response[1], 2, 16, QLatin1Char('0'));
@@ -294,7 +302,7 @@ bool Bootloader::_getCommandResponse(int responseTimeout)
         _errorString = tr("Command failed: 0x%1 (%2)").arg(response[1], 2, 16, QLatin1Char('0')).arg(responseCode);
         return false;
     }
-    
+
     return true;
 }
 
@@ -304,7 +312,7 @@ bool Bootloader::_getCommandResponse(int responseTimeout)
 bool Bootloader::_protoGetDevice(uint8_t param, uint32_t& value)
 {
     uint8_t buf[3] = { PROTO_GET_DEVICE, param, PROTO_EOC };
-    
+
     if (!_write(buf, sizeof(buf))) {
         goto Error;
     }
@@ -314,9 +322,9 @@ bool Bootloader::_protoGetDevice(uint8_t param, uint32_t& value)
     if (!_getCommandResponse()) {
         goto Error;
     }
-    
+
     return true;
-    
+
 Error:
     _errorString.prepend(tr("Get Device: "));
     return false;
@@ -328,7 +336,7 @@ bool Bootloader::_protoGetDevice(uint8_t param, uint32_t& value)
 bool Bootloader::_sendCommand(const uint8_t cmd, int responseTimeout)
 {
     uint8_t buf[2] = { cmd, PROTO_EOC };
-    
+
     if (!_write(buf, 2)) {
         goto Error;
     }
@@ -337,7 +345,7 @@ bool Bootloader::_sendCommand(const uint8_t cmd, int responseTimeout)
     if (!_getCommandResponse(responseTimeout)) {
         goto Error;
     }
-    
+
     return true;
 
 Error:
@@ -353,29 +361,29 @@ bool Bootloader::_binProgram(const FirmwareImage* image)
         return false;
     }
     uint32_t imageSize = (uint32_t)firmwareFile.size();
-    
+
     uint8_t imageBuf[PROG_MULTI_MAX];
     uint32_t bytesSent = 0;
     _imageCRC = 0;
-    
+
     Q_ASSERT(PROG_MULTI_MAX <= 0x8F);
-    
+
     while (bytesSent < imageSize) {
         int bytesToSend = imageSize - bytesSent;
         if (bytesToSend > (int)sizeof(imageBuf)) {
             bytesToSend = (int)sizeof(imageBuf);
         }
-        
+
         Q_ASSERT((bytesToSend % 4) == 0);
-        
+
         int bytesRead = firmwareFile.read((char *)imageBuf, bytesToSend);
         if (bytesRead == -1 || bytesRead != bytesToSend) {
             _errorString = tr("Firmware file read failed: %1").arg(firmwareFile.errorString());
             return false;
         }
-        
+
         Q_ASSERT(bytesToSend <= 0x8F);
-        
+
         bool failed = true;
         if (_write(PROTO_PROG_MULTI) &&
                 _write((uint8_t)bytesToSend) &&
@@ -418,16 +426,16 @@ bool Bootloader::_ihxProgram(const FirmwareImage* image)
         bool        failed;
         uint16_t    flashAddress;
         QByteArray  bytes;
-        
+
         if (!image->ihxGetBlock(index, flashAddress, bytes)) {
             _errorString = tr("Unable to retrieve block from ihx: index %1").arg(index);
             return false;
         }
-        
+
         qCDebug(FirmwareUpgradeVerboseLog) << QString("Bootloader::_ihxProgram - address:0x%1 size:%2 block:%3").arg(flashAddress, 8, 16, QLatin1Char('0')).arg(bytes.length()).arg(index);
-        
+
         // Set flash address
-        
+
         failed = true;
         if (_write(PROTO_LOAD_ADDRESS) &&
                 _write(flashAddress & 0xFF) &&
@@ -438,17 +446,17 @@ bool Bootloader::_ihxProgram(const FirmwareImage* image)
                 failed = false;
             }
         }
-        
+
         if (failed) {
             _errorString = tr("Unable to set flash start address: 0x%2").arg(flashAddress, 8, 16, QLatin1Char('0'));
             return false;
         }
-        
+
         // Flash
-        
+
         int bytesIndex = 0;
         uint16_t bytesLeftToWrite = bytes.length();
-        
+
         while (bytesLeftToWrite > 0) {
             uint8_t bytesToWrite;
 
@@ -472,30 +480,30 @@ bool Bootloader::_ihxProgram(const FirmwareImage* image)
                 _errorString = tr("Flash failed: %1 at address 0x%2").arg(_errorString).arg(flashAddress, 8, 16, QLatin1Char('0'));
                 return false;
             }
-            
+
             bytesIndex += bytesToWrite;
             bytesLeftToWrite -= bytesToWrite;
             bytesSent += bytesToWrite;
-            
+
             emit updateProgress(bytesSent, imageSize);
         }
     }
-    
+
     return true;
 }
 
 bool Bootloader::verify(const FirmwareImage* image)
 {
     bool ret;
-    
+
     if (!image->imageIsBinFormat() || _bootloaderVersion <= 2) {
         ret = _verifyBytes(image);
     } else {
         ret = _verifyCRC();
     }
-    
+
     reboot();
-    
+
     return ret;
 }
 
@@ -512,40 +520,40 @@ bool Bootloader::_verifyBytes(const FirmwareImage* image)
 bool Bootloader::_binVerifyBytes(const FirmwareImage* image)
 {
     Q_ASSERT(image->imageIsBinFormat());
-    
+
     QFile firmwareFile(image->binFilename());
     if (!firmwareFile.open(QIODevice::ReadOnly)) {
         _errorString = tr("Unable to open firmware file %1: %2").arg(image->binFilename(), firmwareFile.errorString());
         return false;
     }
     uint32_t imageSize = (uint32_t)firmwareFile.size();
-    
+
     if (!_sendCommand(PROTO_CHIP_VERIFY)) {
         return false;
     }
-    
+
     uint8_t fileBuf[READ_MULTI_MAX];
     uint8_t readBuf[READ_MULTI_MAX];
     uint32_t bytesVerified = 0;
-    
+
     Q_ASSERT(PROG_MULTI_MAX <= 0x8F);
-    
+
     while (bytesVerified < imageSize) {
         int bytesToRead = imageSize - bytesVerified;
         if (bytesToRead > (int)sizeof(readBuf)) {
             bytesToRead = (int)sizeof(readBuf);
         }
-        
+
         Q_ASSERT((bytesToRead % 4) == 0);
-        
+
         int bytesRead = firmwareFile.read((char *)fileBuf, bytesToRead);
         if (bytesRead == -1 || bytesRead != bytesToRead) {
             _errorString = tr("Firmware file read failed: %1").arg(firmwareFile.errorString());
             return false;
         }
-        
+
         Q_ASSERT(bytesToRead <= 0x8F);
-        
+
         bool failed = true;
         if (_write(PROTO_READ_MULTI) &&
                 _write((uint8_t)bytesToRead) &&
@@ -568,38 +576,38 @@ bool Bootloader::_binVerifyBytes(const FirmwareImage* image)
                 return false;
             }
         }
-        
+
         bytesVerified += bytesToRead;
-        
+
         emit updateProgress(bytesVerified, imageSize);
     }
-    
+
     firmwareFile.close();
-    
+
     return true;
 }
 
 bool Bootloader::_ihxVerifyBytes(const FirmwareImage* image)
 {
     Q_ASSERT(!image->imageIsBinFormat());
-    
+
     uint32_t imageSize = image->imageSize();
     uint32_t bytesVerified = 0;
-    
+
     for (uint16_t index=0; index<image->ihxBlockCount(); index++) {
         bool        failed;
         uint16_t    readAddress;
         QByteArray  imageBytes;
-        
+
         if (!image->ihxGetBlock(index, readAddress, imageBytes)) {
             _errorString = tr("Unable to retrieve block from ihx: index %1").arg(index);
             return false;
         }
-        
+
         qCDebug(FirmwareUpgradeLog) << QString("Bootloader::_ihxVerifyBytes - address:0x%1 size:%2 block:%3").arg(readAddress, 8, 16, QLatin1Char('0')).arg(imageBytes.length()).arg(index);
-        
+
         // Set read address
-        
+
         failed = true;
         if (_write(PROTO_LOAD_ADDRESS) &&
                 _write(readAddress & 0xFF) &&
@@ -610,21 +618,21 @@ bool Bootloader::_ihxVerifyBytes(const FirmwareImage* image)
                 failed = false;
             }
         }
-        
+
         if (failed) {
             _errorString = tr("Unable to set read start address: 0x%2").arg(readAddress, 8, 16, QLatin1Char('0'));
             return false;
         }
-        
+
         // Read back
-        
+
         int         bytesIndex = 0;
         uint16_t    bytesLeftToRead = imageBytes.length();
-        
+
         while (bytesLeftToRead > 0) {
             uint8_t bytesToRead;
             uint8_t readBuf[READ_MULTI_MAX];
-            
+
             if (bytesLeftToRead > READ_MULTI_MAX) {
                 bytesToRead = READ_MULTI_MAX;
             } else {
@@ -646,24 +654,27 @@ bool Bootloader::_ihxVerifyBytes(const FirmwareImage* image)
                 _errorString = tr("Read failed: %1 at address: 0x%2").arg(_errorString).arg(readAddress, 8, 16, QLatin1Char('0'));
                 return false;
             }
-            
+
             // Compare
-            
+
             for (int i=0; i<bytesToRead; i++) {
                 if ((uint8_t)imageBytes[bytesIndex + i] != readBuf[i]) {
-                    _errorString = tr("Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3").arg(imageBytes[bytesIndex + i], 2, 16, QLatin1Char('0')).arg(readBuf[i], 2, 16, QLatin1Char('0')).arg(readAddress + i, 8, 16, QLatin1Char('0'));
+                    _errorString = tr("Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3")
+                        .arg(static_cast<qulonglong>(static_cast<quint8>(imageBytes[bytesIndex + i])), 2, 16, QLatin1Char('0'))
+                        .arg(static_cast<qulonglong>(static_cast<quint8>(readBuf[i])), 2, 16, QLatin1Char('0'))
+                        .arg(static_cast<qulonglong>(readAddress + i), 8, 16, QLatin1Char('0'));
                     return false;
                 }
             }
-            
+
             bytesVerified += bytesToRead;
             bytesIndex += bytesToRead;
             bytesLeftToRead -= bytesToRead;
-            
+
             emit updateProgress(bytesVerified, imageSize);
         }
     }
-    
+
     return true;
 }
 
@@ -673,7 +684,7 @@ bool Bootloader::_verifyCRC(void)
     uint8_t buf[2] = { PROTO_GET_CRC, PROTO_EOC };
 
     quint32 flashCRC;
-    
+
     bool failed = true;
     if (_write(buf, 2)) {
         _port.flush();
@@ -691,7 +702,7 @@ bool Bootloader::_verifyCRC(void)
         _errorString = tr("CRC mismatch: board(0x%1) file(0x%2)").arg(flashCRC, 4, 16, QLatin1Char('0')).arg(_imageCRC, 4, 16, QLatin1Char('0'));
         return false;
     }
-    
+
     return true;
 }
 
diff --git a/src/Vehicle/VehicleSetup/Bootloader.h b/src/Vehicle/VehicleSetup/Bootloader.h
index 793f6bac35a5..4fc7458805b8 100644
--- a/src/Vehicle/VehicleSetup/Bootloader.h
+++ b/src/Vehicle/VehicleSetup/Bootloader.h
@@ -27,12 +27,12 @@ class FirmwareImage;
 class Bootloader : public QObject
 {
     Q_OBJECT
-    
+
 public:
     explicit Bootloader(bool sikRadio, QObject *parent = 0);
-    
+
     QString errorString(void) { return _errorString; }
-    
+
     bool open               (const QString portName);
     void close              (void) { _port.close(); }
     bool getBoardInfo       (uint32_t& bootloaderVersion, uint32_t& boardID, uint32_t& flashSize);
@@ -53,7 +53,7 @@ class Bootloader : public QObject
 signals:
     /// @brief Signals progress indicator for long running bootloader utility routines
     void updateProgress(int curr, int total);
-    
+
 private:
     bool    _sync               (void);
     bool    _syncWorker         (void);
@@ -78,12 +78,12 @@ class Bootloader : public QObject
         PROTO_INSYNC =          0x12,   ///< 'in sync' byte sent before status
         PROTO_BAD_SILICON_REV = 0x14,   ///< device is using silicon not suitable for the target the bootloader was used for
         PROTO_EOC =             0x20,   ///< end of command
-        
+
         // Reply bytes
         PROTO_OK =              0x10,   ///< INSYNC/OK      - 'ok' response
         PROTO_FAILED =          0x11,   ///< INSYNC/FAILED  - 'fail' response
         PROTO_INVALID =         0x13,	///< INSYNC/INVALID - 'invalid' response for bad commands
-        
+
         // Command bytes
         PROTO_GET_SYNC =        0x21,   ///< NOP for re-establishing sync
         PROTO_GET_DEVICE =      0x22,   ///< get device ID bytes
@@ -92,22 +92,22 @@ class Bootloader : public QObject
         PROTO_PROG_MULTI =      0x27,   ///< write bytes at program address and increment
         PROTO_GET_CRC =         0x29,	///< compute & return a CRC
         PROTO_BOOT =            0x30,   ///< boot the application
-        
+
         // Command bytes - Rev 2 boootloader only
         PROTO_CHIP_VERIFY	=   0x24, ///< begin verify mode
         PROTO_READ_MULTI	=   0x28, ///< read bytes at programm address and increment
-        
+
         INFO_BL_REV         =   1,    ///< bootloader protocol revision
         BL_REV_MIN          =   2,    ///< Minimum supported bootlader protocol
         BL_REV_MAX			=   5,    ///< Maximum supported bootloader protocol
         INFO_BOARD_ID		=   2,    ///< board type
         INFO_BOARD_REV		=   3,    ///< board revision
         INFO_FLASH_SIZE		=   4,    ///< max firmware size in bytes
-        
+
         PROG_MULTI_MAX		=   64,     ///< write size for PROTO_PROG_MULTI, must be multiple of 4
         READ_MULTI_MAX		=   0x28    ///< read size for PROTO_READ_MULTI, must be multiple of 4. Sik Radio max size is 0x28
     };
-    
+
     QSerialPort _port;
     bool        _sikRadio           = false;
     bool        _inBootloaderMode   = false;    ///< true: board is in bootloader mode, false: special case for SiK Radio, board is in command mode
@@ -117,7 +117,7 @@ class Bootloader : public QObject
     uint32_t    _imageCRC           = 0;        ///< CRC for image in currently selected firmware file
     QString     _firmwareFilename;              ///< Currently selected firmware file to flash
     QString     _errorString;                   ///< Last error
-    
+
     static const int _eraseTimeout                      = 20000;    ///< Msecs to wait for response from erase command
     static const int _rebootTimeout                     = 10000;    ///< Msecs to wait for reboot command to cause serial port to disconnect
     static const int _verifyTimeout                     = 5000;     ///< Msecs to wait for response to PROTO_GET_CRC command
diff --git a/src/Vehicle/VehicleSetup/CMakeLists.txt b/src/Vehicle/VehicleSetup/CMakeLists.txt
index 50ad5563eddc..19357a4309da 100644
--- a/src/Vehicle/VehicleSetup/CMakeLists.txt
+++ b/src/Vehicle/VehicleSetup/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Vehicle Setup Subsystem
+# Vehicle configuration, calibration, and firmware upgrade
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         JoystickConfigController.cc
@@ -6,6 +11,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Firmware Upgrade (requires serial link)
+# ----------------------------------------------------------------------------
 if(NOT QGC_NO_SERIAL_LINK)
     target_sources(${CMAKE_PROJECT_NAME}
         PRIVATE
@@ -20,6 +28,9 @@ if(NOT QGC_NO_SERIAL_LINK)
     )
 endif()
 
+# ----------------------------------------------------------------------------
+# Vehicle Setup QML Module
+# ----------------------------------------------------------------------------
 qt_add_library(VehicleSetupModule STATIC)
 
 qt_add_qml_module(VehicleSetupModule
diff --git a/src/Vehicle/VehicleSetup/FirmwareImage.cc b/src/Vehicle/VehicleSetup/FirmwareImage.cc
index 8633516b830a..9a4a96d8d2f9 100644
--- a/src/Vehicle/VehicleSetup/FirmwareImage.cc
+++ b/src/Vehicle/VehicleSetup/FirmwareImage.cc
@@ -25,14 +25,14 @@ FirmwareImage::FirmwareImage(QObject* parent) :
     QObject(parent),
     _imageSize(0)
 {
-    
+
 }
 
 bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId)
 {
     _imageSize = 0;
     _boardId = boardId;
-    
+
     if (imageFilename.endsWith(".bin")) {
         _binFormat = true;
         return _binLoad(imageFilename);
@@ -54,46 +54,46 @@ bool FirmwareImage::load(const QString& imageFilename, uint32_t boardId)
 bool FirmwareImage::_readByteFromStream(QTextStream& stream, uint8_t& byte)
 {
     QString hex = stream.read(2);
-    
+
     if (hex.length() != 2) {
         return false;
     }
-    
+
     bool success;
     byte = (uint8_t)hex.toInt(&success, 16);
-    
+
     return success;
 }
 
 bool FirmwareImage::_readWordFromStream(QTextStream& stream, uint16_t& word)
 {
     QString hex = stream.read(4);
-    
+
     if (hex.length() != 4) {
         return false;
     }
-    
+
     bool success;
     word = (uint16_t)hex.toInt(&success, 16);
-    
+
     return success;
 }
 
 bool FirmwareImage::_readBytesFromStream(QTextStream& stream, uint8_t byteCount, QByteArray& bytes)
 {
     bytes.clear();
-    
+
     while (byteCount) {
         uint8_t byte;
-        
+
         if (!_readByteFromStream(stream, byte)) {
             return false;
         }
         bytes += byte;
-        
+
         byteCount--;
     }
-    
+
     return true;
 }
 
@@ -101,27 +101,27 @@ bool FirmwareImage::_ihxLoad(const QString& ihxFilename)
 {
     _imageSize = 0;
     _ihxBlocks.clear();
-    
+
     QFile ihxFile(ihxFilename);
     if (!ihxFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         emit statusMessage(QString("Unable to open firmware file %1, error: %2").arg(ihxFilename, ihxFile.errorString()));
         return false;
     }
-    
+
     QTextStream stream(&ihxFile);
-    
+
     while (true) {
         if (stream.read(1) != ":") {
             emit statusMessage("Incorrectly formatted .ihx file, line does not begin with :");
             return false;
         }
-        
+
         uint8_t     blockByteCount;
         uint16_t    address;
         uint8_t     recordType;
         QByteArray  bytes;
         uint8_t     crc;
-        
+
         if (!_readByteFromStream(stream, blockByteCount) ||
             !_readWordFromStream(stream, address) ||
             !_readByteFromStream(stream, recordType) ||
@@ -130,52 +130,52 @@ bool FirmwareImage::_ihxLoad(const QString& ihxFilename)
             emit statusMessage(tr("Incorrectly formatted line in .ihx file, line too short"));
             return false;
         }
-        
+
         if (!(recordType == 0 || recordType == 1)) {
             emit statusMessage(tr("Unsupported record type in file: %1").arg(recordType));
             return false;
         }
-        
+
         if (recordType == 0) {
             bool appendToLastBlock = false;
-            
+
             // Can we append this block to the last one?
-            
+
             if (_ihxBlocks.length()) {
                 int lastBlockIndex = _ihxBlocks.length() - 1;
-                
+
                 if (_ihxBlocks[lastBlockIndex].address + _ihxBlocks[lastBlockIndex].bytes.length() == address) {
                     appendToLastBlock = true;
                 }
             }
-            
+
             if (appendToLastBlock) {
                 _ihxBlocks[_ihxBlocks.length() - 1].bytes += bytes;
                 // Too noisy even for verbose
                 //qCDebug(FirmwareUpgradeVerboseLog) << QString("_ihxLoad - append - address:%1 size:%2 block:%3").arg(address).arg(blockByteCount).arg(ihxBlockCount());
             } else {
                 IntelHexBlock_t block;
-                
+
                 block.address = address;
                 block.bytes = bytes;
-                
+
                 _ihxBlocks += block;
                 qCDebug(FirmwareUpgradeVerboseLog) << QString("_ihxLoad - new block - address:%1 size:%2 block:%3").arg(address).arg(blockByteCount).arg(ihxBlockCount());
             }
-            
+
             _imageSize += blockByteCount;
         } else if (recordType == 1) {
             // EOF
             qCDebug(FirmwareUpgradeLog) << QString("_ihxLoad - EOF");
             break;
         }
-        
+
         // Move to next line
         stream.readLine();
     }
-    
+
     ihxFile.close();
-    
+
     return true;
 }
 
@@ -197,26 +197,26 @@ bool FirmwareImage::isCompatible(uint32_t boardId, uint32_t firmwareId) {
 bool FirmwareImage::_px4Load(const QString& imageFilename)
 {
     _imageSize = 0;
-    
+
     // We need to collect information from the .px4 file as well as pull the binary image out to a separate file.
-    
+
     QFile px4File(imageFilename);
     if (!px4File.open(QIODevice::ReadOnly | QIODevice::Text)) {
         emit statusMessage(tr("Unable to open firmware file %1, error: %2").arg(imageFilename, px4File.errorString()));
         return false;
     }
-    
+
     QByteArray bytes = px4File.readAll();
     px4File.close();
     QJsonDocument doc = QJsonDocument::fromJson(bytes);
-    
+
     if (doc.isNull()) {
         emit statusMessage(tr("Supplied file is not a valid JSON document"));
         return false;
     }
-    
+
     QJsonObject px4Json = doc.object();
-    
+
     // Make sure the keys we need are available
     QString errorString;
     QStringList requiredKeys;
@@ -245,7 +245,7 @@ bool FirmwareImage::_px4Load(const QString& imageFilename)
     // What firmware type is this?
     MAV_AUTOPILOT firmwareType = (MAV_AUTOPILOT)px4Json[_jsonMavAutopilotKey].toInt(MAV_AUTOPILOT_PX4);
     emit statusMessage(QString("MAV_AUTOPILOT = %1").arg(firmwareType));
-    
+
     // Decompress the parameter xml and save to file
     QByteArray decompressedBytes;
     bool success = _decompressJsonValue(px4Json,               // JSON object
@@ -299,7 +299,7 @@ bool FirmwareImage::_px4Load(const QString& imageFilename)
             emit statusMessage(tr("Unable to open airframe meta data file %1 for writing, error: %2").arg(airframeFilename, airframeFile.errorString()));
         }
     }
-    
+
     // Decompress the image and save to file
     _imageSize = px4Json.value(QString("image_size")).toInt();
     success = _decompressJsonValue(px4Json,               // JSON object
@@ -310,31 +310,31 @@ bool FirmwareImage::_px4Load(const QString& imageFilename)
     if (!success) {
         return false;
     }
-    
+
     // Pad image to 4-byte boundary
     while ((decompressedBytes.length() % 4) != 0) {
         decompressedBytes.append(static_cast<char>(static_cast<unsigned char>(0xFF)));
     }
-    
+
     // Store decompressed image file in same location as original download file
     QDir imageDir = QFileInfo(imageFilename).dir();
     QString decompressFilename = imageDir.filePath("PX4FlashUpgrade.bin");
-    
+
     QFile decompressFile(decompressFilename);
     if (!decompressFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
         emit statusMessage(tr("Unable to open decompressed file %1 for writing, error: %2").arg(decompressFilename, decompressFile.errorString()));
         return false;
     }
-    
+
     qint64 bytesWritten = decompressFile.write(decompressedBytes);
     if (bytesWritten != decompressedBytes.length()) {
         emit statusMessage(tr("Write failed for decompressed image file, error: %1").arg(decompressFile.errorString()));
         return false;
     }
     decompressFile.close();
-    
+
     _binFilename = decompressFilename;
-    
+
     return true;
 }
 
@@ -355,13 +355,13 @@ bool FirmwareImage::_decompressJsonValue(const QJsonObject&	jsonObject,			///< J
         emit statusMessage(tr("Firmware file has invalid decompressed size for %1").arg(sizeKey));
         return false;
     }
-    
+
     // XXX Qt's JSON string handling is terribly broken, strings
     // with some length (18K / 25K) are just weirdly cut.
     // The code below works around this by manually 'parsing'
     // for the image string. Since its compressed / checksummed
     // this should be fine.
-    
+
     QStringList parts = QString(jsonDocBytes).split(QString("\"%1\": \"").arg(bytesKey));
     if (parts.length() == 1) {
         emit statusMessage(tr("Could not find compressed bytes for %1 in Firmware file").arg(bytesKey));
@@ -372,18 +372,18 @@ bool FirmwareImage::_decompressJsonValue(const QJsonObject&	jsonObject,			///< J
         emit statusMessage(tr("Incorrectly formed compressed bytes section for %1 in Firmware file").arg(bytesKey));
         return false;
     }
-    
+
     // Store decompressed size as first four bytes. This is required by qUncompress routine.
     QByteArray raw;
     raw.append((unsigned char)((decompressedSize >> 24) & 0xFF));
     raw.append((unsigned char)((decompressedSize >> 16) & 0xFF));
     raw.append((unsigned char)((decompressedSize >> 8) & 0xFF));
     raw.append((unsigned char)((decompressedSize >> 0) & 0xFF));
-    
+
     QByteArray raw64 = parts.first().toUtf8();
     raw.append(QByteArray::fromBase64(raw64));
     decompressedBytes = qUncompress(raw);
-    
+
     if (decompressedBytes.length() == 0) {
         emit statusMessage(tr("Firmware file has 0 length %1").arg(bytesKey));
         return false;
@@ -392,9 +392,9 @@ bool FirmwareImage::_decompressJsonValue(const QJsonObject&	jsonObject,			///< J
         emit statusMessage(tr("Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)").arg(decompressedSize).arg(decompressedBytes.length()));
         return false;
     }
-    
+
     emit statusMessage(tr("Successfully decompressed %1").arg(bytesKey));
-    
+
     return true;
 }
 
@@ -407,7 +407,7 @@ bool FirmwareImage::ihxGetBlock(uint16_t index, uint16_t& address, QByteArray& b
 {
     address = 0;
     bytes.clear();
-    
+
     if (index < ihxBlockCount()) {
         address = _ihxBlocks[index].address;
         bytes = _ihxBlocks[index].bytes;
@@ -424,12 +424,12 @@ bool FirmwareImage::_binLoad(const QString& imageFilename)
         emit statusMessage(tr("Unabled to open firmware file %1, %2").arg(imageFilename, binFile.errorString()));
         return false;
     }
-    
+
     _imageSize = (uint32_t)binFile.size();
-    
+
     binFile.close();
-    
+
     _binFilename = imageFilename;
-    
+
     return true;
 }
diff --git a/src/Vehicle/VehicleSetup/FirmwareImage.h b/src/Vehicle/VehicleSetup/FirmwareImage.h
index e4f87a547499..a487047c2a79 100644
--- a/src/Vehicle/VehicleSetup/FirmwareImage.h
+++ b/src/Vehicle/VehicleSetup/FirmwareImage.h
@@ -23,58 +23,58 @@
 class FirmwareImage : public QObject
 {
     Q_OBJECT
-    
+
 public:
     FirmwareImage(QObject *parent = 0);
-    
+
     /// Loads the specified image file. Supported formats: .px4, .bin, .ihx.
     /// Emits errorMesssage and statusMessage signals while loading.
     ///     @param imageFilename Image file to load
     ///     @param boardId Board id that we are going to load this image onto
     /// @return true: success, false: failure
     bool load(const QString& imageFilename, uint32_t boardId);
-    
+
     /// Returns the number of bytes in the image.
     uint32_t imageSize(void) const { return _imageSize; }
-    
+
     /// @return true: image format is .bin
     bool imageIsBinFormat(void) const { return _binFormat; }
-    
+
     /// @return Filename for .bin file
     QString binFilename(void) const { return _binFilename; }
-    
+
     /// @return Block count from .ihx image
     uint16_t ihxBlockCount(void) const;
-    
+
     /// Retrieves the specified block from the .ihx image
     ///     @param index Index of block to return
     ///     @param address Address of returned block
     ///     @param byets Bytes of returned block
     /// @return true: block retrieved
     bool ihxGetBlock(uint16_t index, uint16_t& address, QByteArray& bytes) const;
-    
+
     /// @return true: actual boardId is compatible with firmware boardId
     bool isCompatible(uint32_t boardId, uint32_t firmwareId);
 
 signals:
     void errorMessage(const QString& errorString);
     void statusMessage(const QString& warningtring);
-    
+
 private:
     bool _binLoad(const QString& px4Filename);
     bool _px4Load(const QString& px4Filename);
     bool _ihxLoad(const QString& ihxFilename);
-    
+
     bool _readByteFromStream(QTextStream& stream, uint8_t& byte);
     bool _readWordFromStream(QTextStream& stream, uint16_t& word);
     bool _readBytesFromStream(QTextStream& stream, uint8_t byteCount, QByteArray& bytes);
-    
+
     bool _decompressJsonValue(const QJsonObject&	jsonObject,
                               const QByteArray&     jsonDocBytes,
                               const QString&		sizeKey,
                               const QString&		bytesKey,
                               QByteArray&			decompressedBytes);
-    
+
     typedef struct {
         uint16_t    address;
         QByteArray  bytes;
@@ -95,4 +95,3 @@ class FirmwareImage : public QObject
     static constexpr const char* _jsonImageKey =              "image";
     static constexpr const char* _jsonMavAutopilotKey =       "mav_autopilot";
 };
-
diff --git a/src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc b/src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc
index 335d60e63b61..ffacd68f3578 100644
--- a/src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc
+++ b/src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc
@@ -68,6 +68,7 @@ static QMap<int, QString> px4_board_name_map {
     {28, "nxp_fmuk66-v3_default"},
     {30, "nxp_fmuk66-e_default"},
     {31, "nxp_fmurt1062-v1_default"},
+    {37, "nxp_mr-tropic_default"},
     {85, "freefly_can-rtk-gps_default"},
     {120, "cubepilot_cubeyellow_default"},
     {136, "mro_x21-777_default"},
@@ -90,11 +91,13 @@ static QMap<int, QString> px4_board_name_map {
     {1058, "holybro_kakuteh7mini_default"},
     {1105, "holybro_kakuteh7-wing_default"},
     {1110, "jfb_jfb110_default"},
-    {1123, "siyi_n7_default"},    
+    {1123, "siyi_n7_default"},
     {1124, "3dr_ctrl-zero-h7-oem-revg_default"},
     {5600, "zeroone_x6_default"},
+    {6110, "svehicle_e2_default"},
     {7000, "cuav_7-nano_default"},
-    {7001, "cuav_fmu-v6x_default"}
+    {7001, "cuav_fmu-v6x_default"},
+    {7002, "cuav_x25-evo_default"}
 };
 
 uint qHash(const FirmwareUpgradeController::FirmwareIdentifier& firmwareId)
@@ -140,7 +143,7 @@ FirmwareUpgradeController::FirmwareUpgradeController(void)
     connect(_threadController, &PX4FirmwareUpgradeThreadController::eraseComplete,          this, &FirmwareUpgradeController::_eraseComplete);
     connect(_threadController, &PX4FirmwareUpgradeThreadController::flashComplete,          this, &FirmwareUpgradeController::_flashComplete);
     connect(_threadController, &PX4FirmwareUpgradeThreadController::updateProgress,         this, &FirmwareUpgradeController::_updateProgress);
-    
+
     connect(&_eraseTimer, &QTimer::timeout, this, &FirmwareUpgradeController::_eraseProgressTick);
 
 #if !defined(QGC_NO_ARDUPILOT_DIALECT)
@@ -255,7 +258,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort
                                                                                 DefaultVehicleFirmware);
         }
     }
-    
+
     qCDebug(FirmwareUpgradeLog) << _boardType << _boardTypeName;
     emit boardFound();
 }
@@ -279,12 +282,12 @@ void FirmwareUpgradeController::_foundBoardInfo(int bootloaderVersion, int board
     _bootloaderVersion          = static_cast<uint32_t>(bootloaderVersion);
     _bootloaderBoardID          = static_cast<uint32_t>(boardID);
     _bootloaderBoardFlashSize   = static_cast<uint32_t>(flashSize);
-    
+
     _appendStatusLog(tr("Connected to bootloader:"));
     _appendStatusLog(tr("  Version: %1").arg(_bootloaderVersion));
     _appendStatusLog(tr("  Board ID: %1").arg(_bootloaderBoardID));
     _appendStatusLog(tr("  Flash size: %1").arg(_bootloaderBoardFlashSize));
-    
+
     if (_startFlashWhenBootloaderFound) {
         flash(_startFlashWhenBootloaderFoundFirmwareIdentity);
     } else {
@@ -347,7 +350,7 @@ void FirmwareUpgradeController::_getFirmwareFile(FirmwareIdentifier firmwareId)
             return;
         }
     }
-    
+
     if (_firmwareFilename.isEmpty()) {
         _errorCancel(tr("No firmware file selected"));
     } else {
@@ -359,10 +362,10 @@ void FirmwareUpgradeController::_getFirmwareFile(FirmwareIdentifier firmwareId)
 void FirmwareUpgradeController::_downloadFirmware(void)
 {
     Q_ASSERT(!_firmwareFilename.isEmpty());
-    
+
     _appendStatusLog(tr("Downloading firmware..."));
     _appendStatusLog(tr(" From: %1").arg(_firmwareFilename));
-    
+
     QGCFileDownload* downloader = new QGCFileDownload(this);
     connect(downloader, &QGCFileDownload::downloadComplete, this, &FirmwareUpgradeController::_firmwareDownloadComplete);
     connect(downloader, &QGCFileDownload::downloadProgress, this, &FirmwareUpgradeController::_firmwareDownloadProgress);
@@ -383,23 +386,23 @@ void FirmwareUpgradeController::_firmwareDownloadComplete(QString /*remoteFile*/
 {
     if (errorMsg.isEmpty()) {
     _appendStatusLog(tr("Download complete"));
-    
+
     FirmwareImage* image = new FirmwareImage(this);
-    
+
     connect(image, &FirmwareImage::statusMessage, this, &FirmwareUpgradeController::_status);
     connect(image, &FirmwareImage::errorMessage, this, &FirmwareUpgradeController::_error);
-    
+
     if (!image->load(localFile, _bootloaderBoardID)) {
         _errorCancel(tr("Image load failed"));
         return;
     }
-    
+
     // We can't proceed unless we have the bootloader
     if (!_bootloaderFound) {
         _errorCancel(tr("Bootloader not found"));
         return;
     }
-    
+
     if (_bootloaderBoardFlashSize != 0 && image->imageSize() > _bootloaderBoardFlashSize) {
         _errorCancel(tr("Image size of %1 is too large for board flash size %2").arg(image->imageSize()).arg(_bootloaderBoardFlashSize));
         return;
@@ -432,7 +435,7 @@ void FirmwareUpgradeController::_flashComplete(void)
 {
     delete _image;
     _image = nullptr;
-    
+
     _appendStatusLog(tr("Upgrade complete"), true);
     _appendStatusLog("------------------------------------------", false);
     emit flashComplete();
@@ -443,7 +446,7 @@ void FirmwareUpgradeController::_error(const QString& errorString)
 {
     delete _image;
     _image = nullptr;
-    
+
     _errorCancel(QString("Error: %1").arg(errorString));
 }
 
@@ -472,15 +475,15 @@ void FirmwareUpgradeController::_eraseProgressTick(void)
 void FirmwareUpgradeController::_appendStatusLog(const QString& text, bool critical)
 {
     Q_ASSERT(_statusLog);
-    
+
     QString varText;
-    
+
     if (critical) {
         varText = QString("<font color=\"yellow\">%1</font>").arg(text);
     } else {
         varText = text;
     }
-    
+
     QMetaObject::invokeMethod(_statusLog,
                               "append",
                               Q_ARG(QString, varText));
diff --git a/src/Vehicle/VehicleSetup/FirmwareUpgradeController.h b/src/Vehicle/VehicleSetup/FirmwareUpgradeController.h
index 10f1b402a80d..04ac0e3ef0d5 100644
--- a/src/Vehicle/VehicleSetup/FirmwareUpgradeController.h
+++ b/src/Vehicle/VehicleSetup/FirmwareUpgradeController.h
@@ -95,16 +95,16 @@ class FirmwareUpgradeController : public QObject
 
     /// TextArea for log output
     Q_PROPERTY(QQuickItem* statusLog READ statusLog WRITE setStatusLog)
-    
+
     /// Progress bar for you know what
     Q_PROPERTY(QQuickItem* progressBar READ progressBar WRITE setProgressBar)
 
     /// Starts searching for boards on the background thread
     Q_INVOKABLE void startBoardSearch(void);
-    
+
     /// Cancels whatever state the upgrade worker thread is in
     Q_INVOKABLE void cancel(void);
-    
+
     /// Called when the firmware type has been selected by the user to continue the flash process.
     Q_INVOKABLE void flash(AutoPilotStackType_t stackType,
                            FirmwareBuildType_t firmwareType = StableFirmware,
@@ -116,18 +116,18 @@ class FirmwareUpgradeController : public QObject
     Q_INVOKABLE void flashSingleFirmwareMode(FirmwareBuildType_t firmwareType);
 
     Q_INVOKABLE FirmwareVehicleType_t vehicleTypeFromFirmwareSelectionIndex(int index);
-    
+
     // overload, not exposed to qml side
     void flash(const FirmwareIdentifier& firmwareId);
 
     // Property accessors
-    
+
     QQuickItem* progressBar(void) { return _progressBar; }
     void setProgressBar(QQuickItem* progressBar) { _progressBar = progressBar; }
-    
+
     QQuickItem* statusLog(void) { return _statusLog; }
     void setStatusLog(QQuickItem* statusLog) { _statusLog = statusLog; }
-    
+
     QString boardPort(void) { return _boardInfo.portName(); }
     QString boardDescription(void) { return _boardInfo.description(); }
 
@@ -210,17 +210,17 @@ private slots:
     uint32_t    _bootloaderVersion;         ///< Bootloader version
     uint32_t    _bootloaderBoardID;         ///< Board ID
     uint32_t    _bootloaderBoardFlashSize;  ///< Flash size in bytes of board
-    
+
     bool                 _startFlashWhenBootloaderFound;
     FirmwareIdentifier   _startFlashWhenBootloaderFoundFirmwareIdentity;
 
     QPixmap _boardIcon;             ///< Icon used to display image of board
-    
+
     QString _firmwareFilename;      ///< Image which we are going to flash to the board
-    
+
     /// @brief Thread controller which is used to run bootloader commands on separate thread
     PX4FirmwareUpgradeThreadController* _threadController;
-    
+
     static const int    _eraseTickMsec = 500;       ///< Progress bar update tick time for erase
     static const int    _eraseTotalMsec = 15000;    ///< Estimated amount of time erase takes
     int                 _eraseTickCount;            ///< Number of ticks for erase progress update
@@ -228,12 +228,12 @@ private slots:
 
     static const int    _findBoardTimeoutMsec = 30000;      ///< Amount of time for user to plug in USB
     static const int    _findBootloaderTimeoutMsec = 5000;  ///< Amount time to look for bootloader
-    
+
     QQuickItem*     _statusLog;         ///< Status log TextArea Qml control
     QQuickItem*     _progressBar;
-    
+
     bool _searchingForBoard;    ///< true: searching for board, false: search for bootloader
-    
+
     QSerialPortInfo                 _boardInfo;
     QGCSerialPortInfo::BoardType_t  _boardType;
     QString                         _boardTypeName;
diff --git a/src/Vehicle/VehicleSetup/JoystickConfig.qml b/src/Vehicle/VehicleSetup/JoystickConfig.qml
index b7f779fbac85..4a9e26d73369 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfig.qml
+++ b/src/Vehicle/VehicleSetup/JoystickConfig.qml
@@ -80,7 +80,7 @@ SetupPage {
                     visible:    _allowJoystickSelection
                 }
                 QGCTabButton {
-                    text:       qsTr("Button Assigment")
+                    text:       qsTr("Button Assignment")
                 }
                 QGCTabButton {
                     text:       qsTr("Calibration")
@@ -103,5 +103,3 @@ SetupPage {
         }
     }
 }
-
-
diff --git a/src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml b/src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml
index 9f421ee8f5b6..bb7d83f029b8 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml
+++ b/src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml
@@ -87,6 +87,14 @@ Item {
                 text:   expoSlider.value.toFixed(2)
             }
         }
+
+        QGCCheckBox {
+            Layout.columnSpan:  2
+            text: qsTr("Allow additional axes to be used for manual control extensions")
+            checked: _activeJoystick ? _activeJoystick.enableManualControlExtensions : false
+            onClicked: _activeJoystick.enableManualControlExtensions = checked
+        }
+
         //-----------------------------------------------------------------
         //-- Enable Advanced Mode
         QGCLabel {
@@ -184,5 +192,3 @@ Item {
         }
     }
 }
-
-
diff --git a/src/Vehicle/VehicleSetup/JoystickConfigButtons.qml b/src/Vehicle/VehicleSetup/JoystickConfigButtons.qml
index 9c6317115e6e..02a293652e60 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfigButtons.qml
+++ b/src/Vehicle/VehicleSetup/JoystickConfigButtons.qml
@@ -24,7 +24,7 @@ ColumnLayout {
     width:                  availableWidth
     height:                 (globals.activeVehicle.supportsJSButton ? buttonCol.height : flowColumn.height) + (ScreenTools.defaultFontPixelHeight * 2)
     spacing:                ScreenTools.defaultFontPixelHeight
-    
+
     Connections {
         target: _activeJoystick
         onRawButtonPressedChanged: (index, pressed) => {
@@ -48,7 +48,7 @@ ColumnLayout {
             wrapMode:               Text.WordWrap
             text:                   qsTr(" Multiple buttons that have the same action must be pressed simultaneously to invoke the action.")
         }
-        
+
         Flow {
             id:                     buttonFlow
             Layout.preferredWidth:  parent.width
@@ -270,5 +270,3 @@ ColumnLayout {
         }
     }
 }
-
-
diff --git a/src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml b/src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml
index aa88f0d05989..a8a5aaf2906a 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml
+++ b/src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml
@@ -199,5 +199,3 @@ Item {
         }
     }
 }
-
-
diff --git a/src/Vehicle/VehicleSetup/JoystickConfigController.cc b/src/Vehicle/VehicleSetup/JoystickConfigController.cc
index 1981f6c1edc2..d7c4a995d553 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfigController.cc
+++ b/src/Vehicle/VehicleSetup/JoystickConfigController.cc
@@ -15,11 +15,11 @@
 #include "Vehicle.h"
 #include "QGCLoggingCategory.h"
 
-QGC_LOGGING_CATEGORY(JoystickConfigControllerLog, "JoystickConfigControllerLog")
+QGC_LOGGING_CATEGORY(JoystickConfigControllerLog, "Joystick.JoystickConfigController")
 
 JoystickConfigController::JoystickConfigController(void)
 {
-    
+
     connect(JoystickManager::instance(), &JoystickManager::activeJoystickChanged, this, &JoystickConfigController::_activeJoystickChanged);
     _activeJoystickChanged(JoystickManager::instance()->activeJoystick());
     _setStickPositions();
@@ -61,11 +61,15 @@ const JoystickConfigController::stateMachineEntry* JoystickConfigController::_ge
     static constexpr const char* msgPitchDown =           "Move the Pitch stick all the way down and hold it there...";
     static constexpr const char* msgPitchUp =             "Move the Pitch stick all the way up and hold it there...";
     static constexpr const char* msgPitchCenter =         "Allow the Pitch stick to move back to center...";
+    static constexpr const char* msgGimbalPitchUp =       "Move the Gimbal Pitch control all the way up and hold it there...";
+    static constexpr const char* msgGimbalPitchDown =     "Move the Gimbal Pitch control all the way down and hold it there...";
+    static constexpr const char* msgGimbalYawUp =         "Move the Gimbal Yaw control all the way up and hold it there...";
+    static constexpr const char* msgGimbalYawDown =       "Move the Gimbal Yaw control all the way down and hold it there...";
     static constexpr const char* msgComplete =            "All settings have been captured.\nClick Next to enable the joystick.";
 
     static const stateMachineEntry rgStateMachine[] = {
         //Function
-        { Joystick::maxFunction,            msgBegin,           _sticksCentered,        &JoystickConfigController::_inputCenterWaitBegin,   &JoystickConfigController::_saveAllTrims,        nullptr, 0 },
+        { Joystick::maxAxisFunction,        msgBegin,           _sticksCentered,        &JoystickConfigController::_inputCenterWaitBegin,   &JoystickConfigController::_saveAllTrims,        nullptr, 0 },
         { Joystick::throttleFunction,       msgThrottleUp,      _sticksThrottleUp,      &JoystickConfigController::_inputStickDetect,       nullptr,                                         nullptr, 0 },
         { Joystick::throttleFunction,       msgThrottleDown,    _sticksThrottleDown,    &JoystickConfigController::_inputStickMin,          nullptr,                                         nullptr, 0 },
         { Joystick::yawFunction,            msgYawRight,        _sticksYawRight,        &JoystickConfigController::_inputStickDetect,       nullptr,                                         nullptr, 1 },
@@ -75,7 +79,11 @@ const JoystickConfigController::stateMachineEntry* JoystickConfigController::_ge
         { Joystick::pitchFunction,          msgPitchUp,         _sticksPitchUp,         &JoystickConfigController::_inputStickDetect,       nullptr,                                         nullptr, 3 },
         { Joystick::pitchFunction,          msgPitchDown,       _sticksPitchDown,       &JoystickConfigController::_inputStickMin,          nullptr,                                         nullptr, 3 },
         { Joystick::pitchFunction,          msgPitchCenter,     _sticksCentered,        &JoystickConfigController::_inputCenterWait,        nullptr,                                         nullptr, 3 },
-        { Joystick::maxFunction,            msgComplete,        _sticksCentered,        nullptr,                                            &JoystickConfigController::_writeCalibration,    nullptr, -1 },
+        { Joystick::gimbalPitchFunction,    msgGimbalPitchUp,   _sticksCentered,        &JoystickConfigController::_inputStickDetect,       nullptr,                                         nullptr, 4 },
+        { Joystick::gimbalPitchFunction,    msgGimbalPitchDown, _sticksCentered,        &JoystickConfigController::_inputStickMin,          nullptr,                                         nullptr, 4 },
+        { Joystick::gimbalYawFunction,      msgGimbalYawUp,     _sticksCentered,        &JoystickConfigController::_inputStickDetect,       nullptr,                                         nullptr, 5 },
+        { Joystick::gimbalYawFunction,      msgGimbalYawDown,   _sticksCentered,        &JoystickConfigController::_inputStickMin,          nullptr,                                         nullptr, 5 },
+        { Joystick::maxAxisFunction,        msgComplete,        _sticksCentered,        nullptr,                                            &JoystickConfigController::_writeCalibration,    nullptr, -1 },
     };
 
     Q_ASSERT(step >= 0 && step < static_cast<int>((sizeof(rgStateMachine) / sizeof(rgStateMachine[0]))));
@@ -84,7 +92,17 @@ const JoystickConfigController::stateMachineEntry* JoystickConfigController::_ge
 
 void JoystickConfigController::_advanceState()
 {
-    _currentStep++;
+    const stateMachineEntry* state = _getStateMachineEntry(++_currentStep);
+
+    Joystick* joystick = JoystickManager::instance()->activeJoystick();
+    int axisCount = joystick->enableManualControlExtensions() ? _axisCount : 4;
+
+    // The state machine includes additional states for optional axes. If those
+    // axes aren't detected, those states should be skipped.
+    while (state->function >= axisCount && state->function < Joystick::maxAxisFunction) {
+        state = _getStateMachineEntry(++_currentStep);
+    }
+
     _setupCurrentState();
 }
 
@@ -113,7 +131,8 @@ void JoystickConfigController::_setupCurrentState()
     _setStatusText(state->instructions);
     _stickDetectAxis = _axisNoAxis;
     _stickDetectSettleStarted = false;
-    _calSaveCurrentValues();
+    _loggingLastValuesMap.clear();
+    _saveCurrentAxisValues();
     _currentStickPositions.clear();
     _currentStickPositions << state->stickPositions.leftX << state->stickPositions.leftY << state->stickPositions.rightX << state->stickPositions.rightY;
     emit stickPositionsChanged();
@@ -191,7 +210,7 @@ void JoystickConfigController::_saveAllTrims()
     // axis they are yet. As we continue through the process the other axes will get their
     // trims reset to correct values.
     for (int i = 0; i < _axisCount; i++) {
-        qCDebug(JoystickConfigControllerLog) << "_saveAllTrims trim" << _axisRawValue[i];
+        qCDebug(JoystickConfigControllerLog) << "_saveAllTrims axis:trim" << i << _axisRawValue[i];
         _rgAxisInfo[i].axisTrim = _axisRawValue[i];
     }
     _advanceState();
@@ -224,7 +243,7 @@ bool JoystickConfigController::_stickSettleComplete(int axis, int value)
     }
 
     // We are waiting for the stick to settle out to a max position
-    
+
     if (abs(_stickDetectValue - value) > _calSettleDelta) {
         // Stick is moving too much to consider stopped
         qCDebug(JoystickConfigControllerLog) << "_stickSettleComplete still moving, axis:_stickDetectValue:value" << axis << _stickDetectValue << value;
@@ -246,24 +265,33 @@ bool JoystickConfigController::_stickSettleComplete(int axis, int value)
             _stickDetectSettleElapsed.start();
         }
     }
-    
+
     return false;
 }
 
+void JoystickConfigController::_logJoystickInfo(const QString &methodName, Joystick::AxisFunction_t function, int axis, int value)
+{
+    int lastAxisValue = _loggingLastValuesMap.value(axis, value + 1); // Force first time we see an axis to be different than existing value
+    if (lastAxisValue != value) {
+        _loggingLastValuesMap[axis] = value;
+        qCDebug(JoystickConfigControllerLog) << methodName << "function:axis:value" << Joystick::axisFunctionToString(function) << axis << value;
+    }
+}
+
 void JoystickConfigController::_inputStickDetect(Joystick::AxisFunction_t function, int axis, int value)
 {
-    qCDebug(JoystickConfigControllerLog) << "_inputStickDetect function:axis:value" << function << axis << value;
-    
     if (!_validAxis(axis)) {
         qCWarning(JoystickConfigControllerLog) << "Invalid axis axis:_axisCount" << axis << _axisCount;
         return;
     }
 
     // If this axis is already used in a mapping we can't use it again
-    if (_rgAxisInfo[axis].function != Joystick::maxFunction) {
+    if (_rgAxisInfo[axis].function != Joystick::maxAxisFunction) {
         return;
     }
-    
+
+    _logJoystickInfo(QStringLiteral("_inputStickDetect"), function, axis, value);
+
     if (_stickDetectAxis == _axisNoAxis) {
         // We have not detected enough movement on a axis yet
         if (abs(_axisValueSave[axis] - value) > _calMoveDelta) {
@@ -297,7 +325,6 @@ void JoystickConfigController::_inputStickDetect(Joystick::AxisFunction_t functi
 
 void JoystickConfigController::_inputStickMin(Joystick::AxisFunction_t function, int axis, int value)
 {
-    qCDebug(JoystickConfigControllerLog) << "_inputStickMin function:axis:value" << function << axis << value;
     if (!_validAxis(axis)) {
         qCWarning(JoystickConfigControllerLog) << "Invalid axis axis:_axisCount" << axis << _axisCount;
         return;
@@ -306,6 +333,9 @@ void JoystickConfigController::_inputStickMin(Joystick::AxisFunction_t function,
     if (_rgFunctionAxisMapping[function] != axis) {
         return;
     }
+
+    _logJoystickInfo(QStringLiteral("_inputStickMin"), function, axis, value);
+
     if (_stickDetectAxis == _axisNoAxis) {
         // Setup up to detect stick being pegged to extreme position
         if (_rgAxisInfo[axis].reversed) {
@@ -341,7 +371,6 @@ void JoystickConfigController::_inputStickMin(Joystick::AxisFunction_t function,
 
 void JoystickConfigController::_inputCenterWait(Joystick::AxisFunction_t function, int axis, int value)
 {
-    qCDebug(JoystickConfigControllerLog) << "_inputCenterWait function:axis:value" << function << axis << value;
     if (!_validAxis(axis)) {
         qCWarning(JoystickConfigControllerLog) << "Invalid axis axis:_axisCount" << axis << _axisCount;
         return;
@@ -351,7 +380,9 @@ void JoystickConfigController::_inputCenterWait(Joystick::AxisFunction_t functio
     if (_rgFunctionAxisMapping[function] != axis) {
         return;
     }
-    
+
+    _logJoystickInfo(QStringLiteral("_inputCenterWait"), function, axis, value);
+
     if (_stickDetectAxis == _axisNoAxis) {
         // Sticks have not yet moved close enough to center
         int roughCenter = getDeadbandToggle() ? std::max(_rgAxisInfo[axis].deadband,_calRoughCenterDelta) : _calRoughCenterDelta;
@@ -375,7 +406,7 @@ void JoystickConfigController::_resetInternalCalibrationValues()
     // Set all raw axis to not reversed and center point values
     for (int i = 0; i < _axisCount; i++) {
         struct AxisInfo* info = &_rgAxisInfo[i];
-        info->function = Joystick::maxFunction;
+        info->function = Joystick::maxAxisFunction;
         info->reversed = false;
         info->deadband = 0;
         emit axisDeadbandChanged(i,info->deadband);
@@ -384,7 +415,7 @@ void JoystickConfigController::_resetInternalCalibrationValues()
         info->axisTrim = JoystickConfigController::_calCenterPoint;
     }
     // Initialize attitude function mapping to function axis not set
-    for (size_t i = 0; i < Joystick::maxFunction; i++) {
+    for (size_t i = 0; i < Joystick::maxAxisFunction; i++) {
         _rgFunctionAxisMapping[i] = _axisNoAxis;
     }
     _signalAllAttitudeValueChanges();
@@ -397,13 +428,15 @@ void JoystickConfigController::_setInternalCalibrationValuesFromSettings()
     // Initialize all function mappings to not set
     for (int i = 0; i < _axisCount; i++) {
         struct AxisInfo* info = &_rgAxisInfo[i];
-        info->function = Joystick::maxFunction;
+        info->function = Joystick::maxAxisFunction;
     }
-    
-    for (size_t i = 0; i < Joystick::maxFunction; i++) {
+
+    for (size_t i = 0; i < Joystick::maxAxisFunction; i++) {
         _rgFunctionAxisMapping[i] = _axisNoAxis;
     }
-    
+
+    qCDebug(JoystickConfigControllerLog) << "Calibration values" <<joystick->name();
+    qCDebug(JoystickConfigControllerLog) << "  axis:min:max:trim:reversed";
     for (int axis = 0; axis < _axisCount; axis++) {
         struct AxisInfo* info = &_rgAxisInfo[axis];
         Joystick::Calibration_t calibration = joystick->getCalibration(axis);
@@ -413,10 +446,10 @@ void JoystickConfigController::_setInternalCalibrationValuesFromSettings()
         info->reversed  = calibration.reversed;
         info->deadband  = calibration.deadband;
         emit axisDeadbandChanged(axis,info->deadband);
-        qCDebug(JoystickConfigControllerLog) << "Read settings name:axis:min:max:trim:reversed" << joystick->name() << axis << info->axisMin << info->axisMax << info->axisTrim << info->reversed;
+        qCDebug(JoystickConfigControllerLog) << "  " << axis << info->axisMin << info->axisMax << info->axisTrim << info->reversed;
     }
-    
-    for (int function = 0; function < Joystick::maxFunction; function++) {
+
+    for (int function = 0; function < Joystick::maxAxisFunction; function++) {
         int paramAxis;
         paramAxis = joystick->getFunctionAxis(static_cast<Joystick::AxisFunction_t>(function));
         if(paramAxis >= 0 && paramAxis < _axisCount) {
@@ -469,7 +502,7 @@ void JoystickConfigController::_writeCalibration()
 {
     Joystick* joystick = JoystickManager::instance()->activeJoystick();
     _validateCalibration();
-    
+
     for (int axis = 0; axis < _axisCount; axis++) {
         Joystick::Calibration_t calibration;
         struct AxisInfo* info   = &_rgAxisInfo[axis];
@@ -480,12 +513,12 @@ void JoystickConfigController::_writeCalibration()
         calibration.deadband    = info->deadband;
         joystick->setCalibration(axis, calibration);
     }
-    
+
     // Write function mapping parameters
-    for (int function = 0; function < Joystick::maxFunction; function++) {
+    for (int function = 0; function < Joystick::maxAxisFunction; function++) {
         joystick->setFunctionAxis(static_cast<Joystick::AxisFunction_t>(function), _rgFunctionAxisMapping[function]);
     }
-    
+
     _stopCalibration();
     _setInternalCalibrationValuesFromSettings();
 
@@ -519,10 +552,10 @@ void JoystickConfigController::_stopCalibration()
     emit stickPositionsChanged();
 }
 
-/// @brief Saves the current axis values, so that we can detect when the use moves an input.
-void JoystickConfigController::_calSaveCurrentValues()
+/// @brief Saves the current axis values, so that we can detect when the user moves an input.
+void JoystickConfigController::_saveCurrentAxisValues()
 {
-	qCDebug(JoystickConfigControllerLog) << "_calSaveCurrentValues";
+	qCDebug(JoystickConfigControllerLog) << "_saveCurrentAxisValues";
     for (int i = 0; i < _axisCount; i++) {
         _axisValueSave[i] = _axisRawValue[i];
     }
@@ -653,7 +686,7 @@ void JoystickConfigController::_activeJoystickChanged(Joystick* joystick)
         _axisCount = 0;
         _activeJoystick = nullptr;
     }
-    
+
     if (joystick) {
         _activeJoystick = joystick;
         if (joystickTransition) {
diff --git a/src/Vehicle/VehicleSetup/JoystickConfigController.h b/src/Vehicle/VehicleSetup/JoystickConfigController.h
index 3491b1573a7f..79e70b8ead4e 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfigController.h
+++ b/src/Vehicle/VehicleSetup/JoystickConfigController.h
@@ -146,7 +146,7 @@ private slots:
 
     /// @brief A set of information associated with a radio axis.
     struct AxisInfo {
-        Joystick::AxisFunction_t    function;   ///< Function mapped to this axis, Joystick::maxFunction for none
+        Joystick::AxisFunction_t    function;   ///< Function mapped to this axis, Joystick::maxAxisFunction for none
         bool                        reversed;   ///< true: axis is reverse, false: not reversed
         int                         axisMin;    ///< Minimum axis value
         int                         axisMax;    ///< Maximum axis value
@@ -187,7 +187,7 @@ private slots:
     void _startCalibration      ();
     void _stopCalibration       ();
 
-    void _calSaveCurrentValues  ();
+    void _saveCurrentAxisValues  ();
 
     void _setStickPositions     ();
 
@@ -195,6 +195,8 @@ private slots:
 
     void _setStatusText         (const QString& text);
 
+    void _logJoystickInfo(const QString &methodName, Joystick::AxisFunction_t function, int axis, int value);
+
     stateStickPositions _sticksCentered;
     stateStickPositions _sticksThrottleUp;
     stateStickPositions _sticksThrottleDown;
@@ -207,7 +209,7 @@ private slots:
 
     QList<qreal> _currentStickPositions;
 
-    int _rgFunctionAxisMapping[Joystick::maxFunction]; ///< Maps from joystick function to axis index. _axisMax indicates axis not set for this function.
+    int _rgFunctionAxisMapping[Joystick::maxAxisFunction]; ///< Maps from joystick function to axis index. _axisMax indicates axis not set for this function.
 
     static const int _attitudeControls  = 5;
 
@@ -230,6 +232,7 @@ private slots:
     int     _stickDetectValue;
     bool    _stickDetectSettleStarted;
     QElapsedTimer   _stickDetectSettleElapsed;
+    QMap<int, int> _loggingLastValuesMap;
 
     QString             _statusText;
 
@@ -238,7 +241,7 @@ private slots:
     static constexpr int _calValidMaxValue =     32767;      ///< Smallest valid maximum axis value
     static constexpr int _calDefaultMinValue =   -32768;     ///< Default value for Min if not set
     static constexpr int _calDefaultMaxValue =   32767;      ///< Default value for Max if not set
-    static constexpr int _calRoughCenterDelta =  500;        ///< Delta around center point which is considered to be roughly centered
+    static constexpr int _calRoughCenterDelta =  700;        ///< Delta around center point which is considered to be roughly centered (Note: PS5 controller has very noisy center, hence 700)
     static constexpr int _calMoveDelta =         32768/2;    ///< Amount of delta past center which is considered stick movement
     static constexpr int _calSettleDelta =       600;        ///< Amount of delta which is considered no stick movement
     static constexpr int _calMinDelta =          1000;       ///< Amount of delta allowed around min value to consider channel at min
@@ -282,4 +285,3 @@ private slots:
     };
 
 };
-
diff --git a/src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml b/src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml
index 14b9f2f84a45..5ecd77519912 100644
--- a/src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml
+++ b/src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml
@@ -16,8 +16,6 @@ import QGroundControl
 
 import QGroundControl.Controls
 
-
-
 import QGroundControl.FactControls
 
 Item {
@@ -152,6 +150,20 @@ Item {
                 width:              axisGrid.width  + (ScreenTools.defaultFontPixelWidth  * 2)
                 height:             axisGrid.height + (ScreenTools.defaultFontPixelHeight * 2)
                 visible:            !_buttonsOnly
+
+                function joyToAxis(v, reversed) {
+                    v = Math.max(-1, Math.min(1, v))
+                    if (reversed) v = -v
+                    return v * 32768.0
+                }
+
+                function joyToThrottleAxis(v, reversed) {
+                    v = (2 * v - 1)
+                    v = Math.max(-1, Math.min(1, v))
+                    if (reversed) v = -v
+                    return v * 32768.0
+                }
+
                 GridLayout {
                     id:                 axisGrid
                     columns:            2
@@ -210,12 +222,12 @@ Item {
                     }
 
                     Connections {
-                        target:             _activeJoystick
+                        target: _activeJoystick
                         onAxisValues: (roll, pitch, yaw, throttle) => {
-                            rollAxis.axisValue      = roll  * 32768.0
-                            pitchAxis.axisValue     = pitch * 32768.0
-                            yawAxis.axisValue       = yaw   * 32768.0
-                            throttleAxis.axisValue  = _activeJoystick.negativeThrust ? throttle * -32768.0 : (-2 * throttle + 1) * 32768.0
+                            rollAxis.axisValue     = axisRect.joyToAxis(roll,  controller.rollAxisReversed)
+                            pitchAxis.axisValue    = axisRect.joyToAxis(pitch, controller.pitchAxisReversed)
+                            yawAxis.axisValue      = axisRect.joyToAxis(yaw,   controller.yawAxisReversed)
+                            throttleAxis.axisValue = axisRect.joyToThrottleAxis(throttle, controller.throttleAxisReversed)
                         }
                     }
                 }
@@ -263,5 +275,3 @@ Item {
         }
     }
 }
-
-
diff --git a/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc
index 539eb2b851c8..8c97b269e898 100644
--- a/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc
+++ b/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc
@@ -38,7 +38,7 @@ PX4FirmwareUpgradeThreadWorker::~PX4FirmwareUpgradeThreadWorker()
 void PX4FirmwareUpgradeThreadWorker::_init(void)
 {
     // We create the timers here so that they are on the right thread
-    
+
     _findBoardTimer = new QTimer(this);
     _findBoardTimer->setSingleShot(true);
     _findBoardTimer->setInterval(500);
@@ -66,11 +66,11 @@ void PX4FirmwareUpgradeThreadWorker::_startFindBoardLoop(void)
 void PX4FirmwareUpgradeThreadWorker::_findBoardOnce(void)
 {
     qCDebug(FirmwareUpgradeVerboseLog) << "_findBoardOnce";
-    
+
     QGCSerialPortInfo               portInfo;
     QGCSerialPortInfo::BoardType_t  boardType;
     QString                         boardName;
-    
+
     if (_findBoardFromPorts(portInfo, boardType, boardName)) {
         if (!_foundBoard) {
             _foundBoard = true;
@@ -105,7 +105,7 @@ void PX4FirmwareUpgradeThreadWorker::_findBoardOnce(void)
             emit noBoardFound();
         }
     }
-    
+
     _findBoardFirstAttempt = false;
     _findBoardTimer->start();
 }
@@ -124,13 +124,13 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QGCSerialPortInfo& port
         qCDebug(FirmwareUpgradeVerboseLog) << "\tsystem location:" << info.systemLocation();
         qCDebug(FirmwareUpgradeVerboseLog) << "\tvendor ID:" << info.vendorIdentifier();
         qCDebug(FirmwareUpgradeVerboseLog) << "\tproduct ID:" << info.productIdentifier();
-        
+
         if (info.canFlash()) {
             portInfo = info;
             return true;
         }
     }
-    
+
     return false;
 }
 
@@ -150,7 +150,7 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
 
     if (_erase()) {
         emit status(tr("Programming new version..."));
-        
+
         if (_bootloader->program(_controller->image())) {
             qCDebug(FirmwareUpgradeLog) << "Program complete";
             emit status("Program complete");
@@ -158,9 +158,9 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
             qCDebug(FirmwareUpgradeLog) << "Program failed:" << _bootloader->errorString();
             goto Error;
         }
-        
+
         emit status(tr("Verifying program..."));
-        
+
         if (_bootloader->verify(_controller->image())) {
             qCDebug(FirmwareUpgradeLog) << "Verify complete";
             emit status(tr("Verify complete"));
@@ -169,14 +169,14 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
             goto Error;
         }
     }
-    
+
     emit status(tr("Rebooting board"));
     _reboot();
 
     _bootloader->close();
     _bootloader->deleteLater();
     _bootloader = nullptr;
-    
+
     emit flashComplete();
 
     return;
@@ -192,10 +192,10 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
 bool PX4FirmwareUpgradeThreadWorker::_erase(void)
 {
     qCDebug(FirmwareUpgradeLog) << "PX4FirmwareUpgradeThreadWorker::_erase";
-    
+
     emit eraseStarted();
     emit status(tr("Erasing previous program..."));
-    
+
     if (_bootloader->erase()) {
         qCDebug(FirmwareUpgradeLog) << "Erase complete";
         emit status(tr("Erase complete"));
@@ -214,7 +214,7 @@ PX4FirmwareUpgradeThreadController::PX4FirmwareUpgradeThreadController(QObject*
     _worker         = new PX4FirmwareUpgradeThreadWorker(this);
     _workerThread   = new QThread(this);
     _worker->moveToThread(_workerThread);
-    
+
     connect(_worker, &PX4FirmwareUpgradeThreadWorker::updateProgress,       this, &PX4FirmwareUpgradeThreadController::_updateProgress);
     connect(_worker, &PX4FirmwareUpgradeThreadWorker::foundBoard,           this, &PX4FirmwareUpgradeThreadController::_foundBoard);
     connect(_worker, &PX4FirmwareUpgradeThreadWorker::noBoardFound,         this, &PX4FirmwareUpgradeThreadController::_noBoardFound);
@@ -227,7 +227,7 @@ PX4FirmwareUpgradeThreadController::PX4FirmwareUpgradeThreadController(QObject*
     connect(_worker, &PX4FirmwareUpgradeThreadWorker::flashComplete,        this, &PX4FirmwareUpgradeThreadController::_flashComplete);
 
     _workerThread->start();
-    
+
     emit _initThreadWorker();
 }
 
@@ -235,7 +235,7 @@ PX4FirmwareUpgradeThreadController::~PX4FirmwareUpgradeThreadController()
 {
     _workerThread->quit();
     _workerThread->wait();
-    
+
     delete _workerThread;
 }
 
diff --git a/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.h b/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.h
index f8caa8614c3f..7238b2a22bbb 100644
--- a/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.h
+++ b/src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.h
@@ -32,11 +32,11 @@ class QTimer;
 class PX4FirmwareUpgradeThreadWorker : public QObject
 {
     Q_OBJECT
-    
+
 public:
     PX4FirmwareUpgradeThreadWorker(PX4FirmwareUpgradeThreadController* controller);
     ~PX4FirmwareUpgradeThreadWorker();
-    
+
 signals:
     void updateProgress         (int curr, int total);
     void foundBoard             (bool firstAttempt, const QGCSerialPortInfo& portInfo, int type, QString boardName);
@@ -48,7 +48,7 @@ class PX4FirmwareUpgradeThreadWorker : public QObject
     void eraseStarted           (void);
     void eraseComplete          (void);
     void flashComplete          (void);
-    
+
 private slots:
     void _init              (void);
     void _startFindBoardLoop(void);
@@ -57,13 +57,13 @@ private slots:
     void _findBoardOnce     (void);
     void _updateProgress    (int curr, int total) { emit updateProgress(curr, total); }
     void _cancel            (void);
-    
+
 private:
     bool _findBoardFromPorts(QGCSerialPortInfo& portInfo, QGCSerialPortInfo::BoardType_t& boardType, QString& boardName);
     bool _erase             (void);
-    
+
     PX4FirmwareUpgradeThreadController* _controller;
-    
+
     Bootloader*         _bootloader             = nullptr;
     QTimer*             _findBoardTimer         = nullptr;
     QTime               _elapsed;
@@ -78,24 +78,24 @@ private slots:
 class PX4FirmwareUpgradeThreadController : public QObject
 {
     Q_OBJECT
-    
+
 public:
     PX4FirmwareUpgradeThreadController(QObject* parent = nullptr);
     ~PX4FirmwareUpgradeThreadController(void);
-    
+
     /// @brief Begins the process of searching for a supported board connected to any serial port. This will
     /// continue until cancelFind is called. Signals foundBoard and boardGone as boards come and go.
     void startFindBoardLoop(void);
-    
+
     void cancel(void);
-    
+
     /// @brief Sends a reboot command to the bootloader
     void reboot(void) { emit _rebootOnThread(); }
-    
+
     void flash(const FirmwareImage* image);
-    
+
     const FirmwareImage* image(void) { return _image; }
-    
+
 signals:
     void foundBoard     (bool firstAttempt, const QGCSerialPortInfo &portInfo, int boardType, QString boardName);
     void noBoardFound   (void);
@@ -107,14 +107,14 @@ class PX4FirmwareUpgradeThreadController : public QObject
     void eraseComplete  (void);
     void flashComplete  (void);
     void updateProgress (int curr, int total);
-    
+
     // Internal signals to communicate with thread worker
     void _initThreadWorker          (void);
     void _startFindBoardLoopOnThread(void);
     void _rebootOnThread            (void);
     void _flashOnThread             (void);
     void _cancel                    (void);
-    
+
 private slots:
     void _foundBoard            (bool firstAttempt, const QGCSerialPortInfo& portInfo, int type, QString name) { emit foundBoard(firstAttempt, portInfo, type, name); }
     void _noBoardFound          (void) { emit noBoardFound(); }
@@ -125,13 +125,12 @@ private slots:
     void _eraseStarted          (void) { emit eraseStarted(); }
     void _eraseComplete         (void) { emit eraseComplete(); }
     void _flashComplete         (void) { emit flashComplete(); }
-    
+
 private:
     void _updateProgress(int curr, int total) { emit updateProgress(curr, total); }
-    
+
     PX4FirmwareUpgradeThreadWorker* _worker         = nullptr;
     QThread*                        _workerThread   = nullptr;  ///< Thread which PX4FirmwareUpgradeThreadWorker runs on
-    
+
     const FirmwareImage* _image;
 };
-
diff --git a/src/Vehicle/VehicleSetup/SetupView.qml b/src/Vehicle/VehicleSetup/SetupView.qml
index 54e81b2a061a..5fbe7bcbc633 100644
--- a/src/Vehicle/VehicleSetup/SetupView.qml
+++ b/src/Vehicle/VehicleSetup/SetupView.qml
@@ -22,6 +22,11 @@ Rectangle {
     color:  qgcPal.window
     z:      QGroundControl.zOrderTopMost
 
+    // This need to block click event leakage to underlying map.
+    DeadMouseArea {
+        anchors.fill: parent
+    }
+
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
     readonly property real      _defaultTextHeight: ScreenTools.defaultFontPixelHeight
diff --git a/src/VideoManager/CMakeLists.txt b/src/VideoManager/CMakeLists.txt
index 561c4dcb65b8..3792876f40d3 100644
--- a/src/VideoManager/CMakeLists.txt
+++ b/src/VideoManager/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Video Manager Module
+# Handles video streaming and subtitle generation
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         SubtitleWriter.cc
@@ -8,4 +13,7 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Video Receiver Subsystem
+# ----------------------------------------------------------------------------
 add_subdirectory(VideoReceiver)
diff --git a/src/VideoManager/SubtitleWriter.cc b/src/VideoManager/SubtitleWriter.cc
index d21e03a4d2fd..0e18c21f8555 100644
--- a/src/VideoManager/SubtitleWriter.cc
+++ b/src/VideoManager/SubtitleWriter.cc
@@ -19,7 +19,7 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QString>
 
-QGC_LOGGING_CATEGORY(SubtitleWriterLog, "qgc.videomanager.subtitlewriter")
+QGC_LOGGING_CATEGORY(SubtitleWriterLog, "Video.SubtitleWriter")
 
 SubtitleWriter::SubtitleWriter(QObject *parent)
     : QObject(parent)
diff --git a/src/VideoManager/VideoManager.cc b/src/VideoManager/VideoManager.cc
index d1a3aee3e6ea..4648b198e906 100644
--- a/src/VideoManager/VideoManager.cc
+++ b/src/VideoManager/VideoManager.cc
@@ -9,6 +9,7 @@
 
 #include "VideoManager.h"
 #include "AppSettings.h"
+#include "MavlinkCameraControl.h"
 #include "MultiVehicleManager.h"
 #include "QGCApplication.h"
 #include "QGCCameraManager.h"
@@ -34,7 +35,7 @@
 #include <QtQuick/QQuickWindow>
 #include <QtCore/QTimer>
 
-QGC_LOGGING_CATEGORY(VideoManagerLog, "qgc.videomanager.videomanager")
+QGC_LOGGING_CATEGORY(VideoManagerLog, "Video.VideoManager")
 
 static constexpr const char *kFileExtension[VideoReceiver::FILE_FORMAT_MAX + 1] = {
     "mkv",
@@ -72,16 +73,18 @@ VideoManager *VideoManager::instance()
     return _videoManagerInstance();
 }
 
-void VideoManager::init(QQuickWindow *window)
+void VideoManager::init(QQuickWindow *mainWindow)
 {
     if (_initialized) {
+        qCDebug(VideoManagerLog) << "Video Manager already initialized";
         return;
     }
 
-    if (!window) {
-        qCCritical(VideoManagerLog) << "Failed To Init Video Manager - window is NULL";
+    if (!mainWindow) {
+        qCCritical(VideoManagerLog) << "Failed To Init Video Manager - mainWindow is NULL";
         return;
     }
+    _mainWindow = mainWindow;
 
     // TODO: VideoSettings _configChanged/streamConfiguredChanged
     (void) connect(_videoSettings->videoSource(), &Fact::rawValueChanged, this, &VideoManager::_videoSourceChanged);
@@ -94,6 +97,25 @@ void VideoManager::init(QQuickWindow *window)
 
     (void) connect(this, &VideoManager::autoStreamConfiguredChanged, this, &VideoManager::_videoSourceChanged);
 
+    _mainWindow->scheduleRenderJob(new FinishVideoInitialization(), QQuickWindow::BeforeSynchronizingStage);
+
+    _initialized = true;
+}
+
+void VideoManager::_initAfterQmlIsReady()
+{
+    if (_initAfterQmlIsReadyDone) {
+        qCWarning(VideoManagerLog) << "_initAfterQmlIsReady called multiple times";
+        return;
+    }
+    if (!_mainWindow) {
+        qCCritical(VideoManagerLog) << "_initAfterQmlIsReady called with NULL mainWindow";
+        return;
+    }
+    _initAfterQmlIsReadyDone = true;
+
+    qCDebug(VideoManagerLog) << "_initAfterQmlIsReady";
+
     static const QStringList videoStreamList = {
         "videoContent",
         "thermalVideo"
@@ -105,12 +127,8 @@ void VideoManager::init(QQuickWindow *window)
         }
         receiver->setName(streamName);
 
-        _initVideoReceiver(receiver, window);
+        _initVideoReceiver(receiver, _mainWindow);
     }
-
-    window->scheduleRenderJob(new FinishVideoInitialization(), QQuickWindow::BeforeSynchronizingStage);
-
-    _initialized = true;
 }
 
 void VideoManager::cleanup()
@@ -539,14 +557,17 @@ bool VideoManager::_updateSettings(VideoReceiver *receiver)
 
 void VideoManager::_setActiveVehicle(Vehicle *vehicle)
 {
+    qCDebug(VideoManagerLog) << Q_FUNC_INFO << "new vehicle" << vehicle << "old active vehicle" << _activeVehicle;
+
     if (_activeVehicle) {
         (void) disconnect(_activeVehicle->vehicleLinkManager(), &VehicleLinkManager::communicationLostChanged, this, &VideoManager::_communicationLostChanged);
-        if (_activeVehicle->cameraManager()) {
-            MavlinkCameraControl *pCamera = _activeVehicle->cameraManager()->currentCameraInstance();
+        auto cameraManager = _activeVehicle->cameraManager();
+        if (cameraManager) {
+            MavlinkCameraControl *pCamera = cameraManager->currentCameraInstance();
             if (pCamera) {
                 pCamera->stopStream();
             }
-            (void) disconnect(_activeVehicle->cameraManager(), &QGCCameraManager::streamChanged, this, &VideoManager::_videoSourceChanged);
+            (void) disconnect(cameraManager, &QGCCameraManager::streamChanged, this, &VideoManager::_videoSourceChanged);
         }
 
         for (VideoReceiver *receiver : std::as_const(_videoReceivers)) {
@@ -780,6 +801,8 @@ void VideoManager::_initVideoReceiver(VideoReceiver *receiver, QQuickWindow *win
 
 void VideoManager::startVideo()
 {
+    qCDebug(VideoManagerLog) << "startVideo";
+
     if (!hasVideo()) {
         qCDebug(VideoManagerLog) << "Stream not enabled/configured";
         return;
@@ -803,5 +826,6 @@ FinishVideoInitialization::~FinishVideoInitialization()
 
 void FinishVideoInitialization::run()
 {
-    VideoManager::instance()->startVideo();
+    qCDebug(VideoManagerLog) << "FinishVideoInitialization::run";
+    VideoManager::instance()->_initAfterQmlIsReady();
 }
diff --git a/src/VideoManager/VideoManager.h b/src/VideoManager/VideoManager.h
index 9e851e0cdc6e..cb1e173e560c 100644
--- a/src/VideoManager/VideoManager.h
+++ b/src/VideoManager/VideoManager.h
@@ -30,6 +30,7 @@ class VideoManager : public QObject
     QML_ELEMENT
     QML_UNCREATABLE("")
     Q_MOC_INCLUDE("Vehicle.h")
+
     Q_PROPERTY(bool     gstreamerEnabled        READ gstreamerEnabled                           CONSTANT)
     Q_PROPERTY(bool     qtmultimediaEnabled     READ qtmultimediaEnabled                        CONSTANT)
     Q_PROPERTY(bool     uvcEnabled              READ uvcEnabled                                 CONSTANT)
@@ -54,6 +55,8 @@ class VideoManager : public QObject
     explicit VideoManager(QObject *parent = nullptr);
     ~VideoManager();
 
+    friend class FinishVideoInitialization;
+
     static VideoManager *instance();
 
     Q_INVOKABLE void grabImage(const QString &imageFile = QString());
@@ -62,7 +65,7 @@ class VideoManager : public QObject
     Q_INVOKABLE void stopRecording();
     Q_INVOKABLE void stopVideo();
 
-    void init(QQuickWindow *rootWindow);
+    void init(QQuickWindow *mainWindow);
     void cleanup();
     bool autoStreamConfigured() const;
     bool decoding() const { return _decoding; }
@@ -107,6 +110,7 @@ private slots:
     void _videoSourceChanged();
 
 private:
+    void _initAfterQmlIsReady();
     void _initVideoReceiver(VideoReceiver *receiver, QQuickWindow *window);
     bool _updateAutoStream(VideoReceiver *receiver);
     bool _updateUVC(VideoReceiver *receiver);
@@ -124,6 +128,7 @@ private slots:
     VideoSettings *_videoSettings = nullptr;
 
     bool _initialized = false;
+    bool _initAfterQmlIsReadyDone = false;
     bool _fullScreen = false;
     QAtomicInteger<bool> _decoding = false;
     QAtomicInteger<bool> _recording = false;
@@ -132,6 +137,7 @@ private slots:
     QString _imageFile;
     QString _uvcVideoSourceID;
     Vehicle *_activeVehicle = nullptr;
+    QQuickWindow *_mainWindow = nullptr;
 };
 
 /*===========================================================================*/
diff --git a/src/VideoManager/VideoReceiver/CMakeLists.txt b/src/VideoManager/VideoReceiver/CMakeLists.txt
index dab1dda4a126..8b36831df460 100644
--- a/src/VideoManager/VideoReceiver/CMakeLists.txt
+++ b/src/VideoManager/VideoReceiver/CMakeLists.txt
@@ -1,6 +1,14 @@
+# ============================================================================
+# Video Receiver Subsystem
+# Video streaming backends (GStreamer and Qt Multimedia)
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE VideoReceiver.h)
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Video Backend Implementations
+# ----------------------------------------------------------------------------
 add_subdirectory(GStreamer)
 add_subdirectory(QtMultimedia)
diff --git a/src/VideoManager/VideoReceiver/GStreamer/CMakeLists.txt b/src/VideoManager/VideoReceiver/GStreamer/CMakeLists.txt
index 7a85b09c2ece..057db82665df 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/CMakeLists.txt
+++ b/src/VideoManager/VideoReceiver/GStreamer/CMakeLists.txt
@@ -1,20 +1,37 @@
+# ============================================================================
+# GStreamer Video Receiver Backend
+# GStreamer-based video streaming and decoding
+# ============================================================================
+
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE VideoItemStub.h)
 
+# ============================================================================
+# GStreamer Detection and Configuration
+# ============================================================================
+
 if(QGC_ENABLE_GST_VIDEOSTREAMING)
     if(NOT MACOS)
-        # Using FindGStreamer.cmake is currently bypassed on MACOS since it doesn't work
-        # So for now we hack in a simple hardwired setup which does work
+        # NOTE: Using FindGStreamer.cmake is currently bypassed on macOS
+        # Using hardwired framework path as a workaround until FindGStreamer works on macOS
         find_package(GStreamer
             REQUIRED
             COMPONENTS Core Base Video Gl GlPrototypes Rtsp
-            OPTIONAL_COMPONENTS GlEgl GlWayland GlX11)
+            OPTIONAL_COMPONENTS GlEgl GlWayland GlX11
+        )
     endif()
 
+    # Build GStreamer Qt6 QML GL plugin
     add_subdirectory(gstqml6gl)
-    # TODO: https://gstreamer.freedesktop.org/documentation/qt6d3d11/index.html#qml6d3d11sink-page
+
+    # TODO: Add Qt6 Direct3D11 plugin support
+    # https://gstreamer.freedesktop.org/documentation/qt6d3d11/index.html#qml6d3d11sink-page
 endif()
 
+# ============================================================================
+# GStreamer Video Receiver Sources
+# ============================================================================
+
 if(TARGET gstqml6gl)
     target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE gstqml6gl)
 
@@ -28,11 +45,19 @@ if(TARGET gstqml6gl)
             GstVideoReceiver.h
     )
 
+    # Build custom GStreamer QGC plugin
     add_subdirectory(gstqgc)
 
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_GST_STREAMING)
 
+    # ============================================================================
+    # Platform-Specific GStreamer Installation
+    # ============================================================================
+
     if(LINUX)
+        # ----------------------------------------------------------------------------
+        # Linux: Install GStreamer Plugins and Libraries
+        # ----------------------------------------------------------------------------
         install(
             DIRECTORY
                 "${GSTREAMER_PLUGIN_PATH}"
@@ -54,6 +79,9 @@ if(TARGET gstqml6gl)
                 PATTERN "gst-*"
         )
     elseif(WIN32)
+        # ----------------------------------------------------------------------------
+        # Windows: Install GStreamer DLLs and Plugins
+        # ----------------------------------------------------------------------------
         install(
             DIRECTORY "${GStreamer_ROOT_DIR}/bin/"
             DESTINATION "${CMAKE_INSTALL_BINDIR}"
@@ -83,6 +111,9 @@ if(TARGET gstqml6gl)
                 PATTERN "*.exe"
         )
     elseif(MACOS)
+        # ----------------------------------------------------------------------------
+        # macOS: Install GStreamer Framework
+        # ----------------------------------------------------------------------------
         if(GSTREAMER_FRAMEWORK)
             install(
                 DIRECTORY "${GSTREAMER_FRAMEWORK}"
diff --git a/src/VideoManager/VideoReceiver/GStreamer/GStreamer.cc b/src/VideoManager/VideoReceiver/GStreamer/GStreamer.cc
index 4c884af775f4..976081febfaf 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/GStreamer.cc
+++ b/src/VideoManager/VideoReceiver/GStreamer/GStreamer.cc
@@ -8,6 +8,7 @@
  ****************************************************************************/
 
 #include "GStreamer.h"
+#include "GStreamerHelpers.h"
 #include "AppSettings.h"
 #include "GstVideoReceiver.h"
 #include "QGCLoggingCategory.h"
@@ -16,12 +17,14 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QSettings>
+#include <QtCore/QStringList>
 #include <QtQuick/QQuickItem>
 
 #include <gst/gst.h>
 
-QGC_LOGGING_CATEGORY(GStreamerLog, "qgc.videomanager.videoreceiver.gstreamer")
-QGC_LOGGING_CATEGORY(GStreamerAPILog, "qgc.videomanager.videoreceiver.gstreamer.api")
+QGC_LOGGING_CATEGORY(GStreamerLog, "Video.GStreamer")
+QGC_LOGGING_CATEGORY(GStreamerDecoderRanksLog, "Video.GStreamerDecoderRanks")
+QGC_LOGGING_CATEGORY_ON(GStreamerAPILog, "Video.GStreamerAPI")
 
 // TODO: Clean These up with Macros or CMake
 G_BEGIN_DECLS
@@ -59,7 +62,7 @@ GST_PLUGIN_STATIC_DECLARE(vulkan);
 GST_PLUGIN_STATIC_DECLARE(qgc);
 G_END_DECLS
 
-namespace
+namespace GStreamer
 {
 
 void _registerPlugins()
@@ -224,7 +227,7 @@ void _setGstEnvVars()
 #endif
 }
 
-void _checkPlugin(gpointer data, gpointer user_data)
+void _logPlugin(gpointer data, gpointer user_data)
 {
     GstPlugin *plugin = static_cast<GstPlugin*>(data);
     if (!plugin) {
@@ -233,7 +236,7 @@ void _checkPlugin(gpointer data, gpointer user_data)
 
     const gchar *name = gst_plugin_get_name(plugin);
     const gchar *version = gst_plugin_get_version(plugin);
-    qCDebug(GStreamerLog) << QString("Plugin %1: (Version %2)").arg(name, version);
+    qCDebug(GStreamerLog) << "  " << name << "-" << version;
 }
 
 bool _verifyPlugins()
@@ -242,8 +245,9 @@ bool _verifyPlugins()
 
     GstRegistry *registry = gst_registry_get();
 
+    qCDebug(GStreamerLog) << "Installed GStreamer Plugins:";
     GList *plugins = gst_registry_get_plugin_list(registry);
-    g_list_foreach(plugins, _checkPlugin, NULL);
+    g_list_foreach(plugins, _logPlugin, NULL);
     g_list_free(plugins);
 
     static constexpr const char *pluginNames[2] = {"qml6", "qgc"};
@@ -279,71 +283,211 @@ bool _verifyPlugins()
     return result;
 }
 
-void _setCodecPriorities(GStreamer::VideoDecoderOptions option)
+void _logDecoderRanks()
 {
-    GstRegistry *registry = gst_registry_get();
+    GList *decoderFactories = gst_element_factory_list_get_elements(
+        static_cast<GstElementFactoryListType>(GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO),
+        GST_RANK_NONE);
+
+    if (!decoderFactories) {
+        qCDebug(GStreamerDecoderRanksLog) << "No video decoder factories found.";
+        return;
+    }
+
+    decoderFactories = g_list_sort(decoderFactories, [](gconstpointer lhs, gconstpointer rhs) -> gint {
+        GstElementFactory *lhsFactory = GST_ELEMENT_FACTORY(lhs);
+        GstElementFactory *rhsFactory = GST_ELEMENT_FACTORY(rhs);
+
+        if (!lhsFactory && !rhsFactory) {
+            return 0;
+        }
+        if (!lhsFactory) {
+            return 1;
+        }
+        if (!rhsFactory) {
+            return -1;
+        }
 
+        const guint lhsRank = gst_plugin_feature_get_rank(GST_PLUGIN_FEATURE(lhsFactory));
+        const guint rhsRank = gst_plugin_feature_get_rank(GST_PLUGIN_FEATURE(rhsFactory));
+        if (lhsRank == rhsRank) {
+            const gchar *lhsName = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(lhsFactory));
+            const gchar *rhsName = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(rhsFactory));
+            return g_strcmp0(lhsName, rhsName);
+        }
+
+        return lhsRank > rhsRank ? -1 : 1;
+    });
+
+    qCDebug(GStreamerDecoderRanksLog) << "Video decoder plugin ranks:";
+    for (GList *node = decoderFactories; node != nullptr; node = node->next) {
+        GstElementFactory *factory = GST_ELEMENT_FACTORY(node->data);
+        if (!factory) {
+            continue;
+        }
+
+        const gchar *decoderKlass = gst_element_factory_get_klass(factory);
+        GstPluginFeature *feature = GST_PLUGIN_FEATURE(factory);
+        const gchar *featureName = gst_plugin_feature_get_name(feature);
+        const guint rank = gst_plugin_feature_get_rank(feature);
+
+        GstPlugin *plugin = gst_plugin_feature_get_plugin(feature);
+        if (plugin) {
+            qCDebug(GStreamerDecoderRanksLog) << "  " << gst_plugin_get_name(plugin) << "/" << featureName << "-" << decoderKlass << ":" << rank;
+            gst_object_unref(plugin);
+        } else {
+            qCDebug(GStreamerDecoderRanksLog) << "  " << featureName << "-" << decoderKlass << ":" << rank;
+        }
+    }
+
+    gst_plugin_feature_list_free(decoderFactories);
+}
+
+void _lowerSoftwareDecoderRanks(GstRegistry *registry)
+{
+    static constexpr uint16_t NewRank  = GST_RANK_NONE;
+    if (!registry) {
+        qCCritical(GStreamerLog) << "Invalid registry!";
+        return;
+    }
+
+    const char* softDecoders[] = {"avdec_h264", "avdec_h265", "avdec_mjpeg", "avdec_mpeg2video", "avdec_mpeg4",
+                                  "avdec_vp8", "avdec_vp9", "dav1ddec", "vp8dec", "vp9dec"};
+
+    for (const char *name : softDecoders) {
+        GstPluginFeature *feature = gst_registry_lookup_feature(registry, name);
+        if (feature) {
+            qCDebug(GStreamerLog) << "Setting software decoder rank low:" << name << " rank:" << NewRank;
+            gst_plugin_feature_set_rank(feature, NewRank);
+            gst_object_unref(feature);
+        } else {
+            qCDebug(GStreamerLog) << "Software decoder not found:" << name;
+        }
+    }
+}
+
+void _changeFeatureRank(GstRegistry *registry, const char *featureName, uint16_t rank)
+{
+    if (!registry || !featureName) {
+        return;
+    }
+
+    GstPluginFeature *feature = gst_registry_lookup_feature(registry, featureName);
+    if (!feature) {
+        qCDebug(GStreamerLog) << "Failed to change ranking of feature. Feature does not exist:" << featureName;
+        return;
+    }
+
+    qCDebug(GStreamerLog) << "  Changing feature (" << featureName << ") to use rank:" << rank;
+    gst_plugin_feature_set_rank(feature, rank);
+    gst_clear_object(&feature);
+}
+
+void _prioritizeByHardwareClass(GstRegistry *registry, uint16_t prioritizedRank, bool requireHardware)
+{
     if (!registry) {
         qCCritical(GStreamerLog) << "Failed to get gstreamer registry.";
         return;
     }
 
-    const auto changeRank = [registry](const char *featureName, uint16_t rank) {
-        GstPluginFeature *feature = gst_registry_lookup_feature(registry, featureName);
-        if (!feature) {
-            qCDebug(GStreamerLog) << "Failed to change ranking of feature. Feature does not exist:" << featureName;
-            return;
+    GList *decoderFactories = gst_element_factory_list_get_elements(
+        static_cast<GstElementFactoryListType>(GST_ELEMENT_FACTORY_TYPE_DECODER | GST_ELEMENT_FACTORY_TYPE_MEDIA_VIDEO),
+        GST_RANK_NONE);
+
+    if (!decoderFactories) {
+        qCDebug(GStreamerLog) << "No decoder factories available while prioritizing"
+                              << (requireHardware ? "hardware" : "software") << "decoders";
+        return;
+    }
+
+    qCDebug(GStreamerLog) << "Prioritizing" << (requireHardware ? "hardware" : "software")
+                           << "video decoders with rank:" << prioritizedRank;
+    int matchedFactories = 0;
+    for (GList *node = decoderFactories; node != nullptr; node = node->next) {
+        GstElementFactory *factory = GST_ELEMENT_FACTORY(node->data);
+        if (!factory) {
+            continue;
+        }
+
+        if (GStreamer::is_hardware_decoder_factory(factory) != requireHardware) {
+            continue;
         }
 
-        qCDebug(GStreamerLog) << "Changing feature (" << featureName << ") to use rank:" << rank;
-        gst_plugin_feature_set_rank(feature, rank);
-        (void) gst_registry_add_feature(registry, feature);
-        gst_clear_object(&feature);
-    };
+        const gchar *featureName = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory));
+        if (!featureName) {
+            continue;
+        }
 
-    // TODO: ForceVideoDecoderCustom in VideoSettings with textbox in QML
+        _changeFeatureRank(registry, featureName, prioritizedRank);
+        ++matchedFactories;
+    }
+
+    if (matchedFactories == 0) {
+        qCWarning(GStreamerLog) << "No" << (requireHardware ? "hardware" : "software")
+                               << "video decoder factories found to reprioritize.";
+    }
+
+   // Lower software decoder rank when using hardware decoders
+    if(requireHardware) {
+        qCCritical(GstVideoReceiverLog) << "Set the software decoder rank low.";
+        _lowerSoftwareDecoderRanks(registry);
+    }
+
+    gst_plugin_feature_list_free(decoderFactories);
+}
+
+void _setCodecPriorities(GStreamer::VideoDecoderOptions option)
+{
+    GstRegistry *registry = gst_registry_get();
+
+    if (!registry) {
+        qCCritical(GStreamerLog) << "Failed to get gstreamer registry.";
+        return;
+    }
 
     static constexpr uint16_t PrioritizedRank = GST_RANK_PRIMARY + 1;
 
+    // TODO: ForceVideoDecoderCustom in VideoSettings with textbox in QML
+
     switch (option) {
     case GStreamer::ForceVideoDecoderDefault:
         break;
     case GStreamer::ForceVideoDecoderSoftware:
-        for (const char *name : {"avdec_h264", "avdec_h265", "avdec_mjpeg", "avdec_mpeg2video", "avdec_mpeg4", "avdec_vp8", "avdec_vp9",
-                                 "dav1ddec", "vp8dec", "vp9dec"}) {
-            changeRank(name, PrioritizedRank);
-        }
+        _prioritizeByHardwareClass(registry, PrioritizedRank, false);
+        break;
+    case GStreamer::ForceVideoDecoderHardware:
+        _prioritizeByHardwareClass(registry, PrioritizedRank, true);
         break;
     case GStreamer::ForceVideoDecoderVAAPI:
         for (const char *name : {"vaav1dec", "vah264dec", "vah265dec", "vajpegdec", "vampeg2dec", "vavp8dec", "vavp9dec"}) {
-            changeRank(name, PrioritizedRank);
+            _changeFeatureRank(registry, name, PrioritizedRank);
         }
         break;
     case GStreamer::ForceVideoDecoderNVIDIA:
         for (const char *name : {"nvav1dec", "nvh264dec", "nvh265dec", "nvjpegdec", "nvmpeg2videodec", "nvmpeg4videodec", "nvmpegvideodec", "nvvp8dec", "nvvp9dec"}) {
-            changeRank(name, PrioritizedRank);
+            _changeFeatureRank(registry, name, PrioritizedRank);
         }
         break;
     case GStreamer::ForceVideoDecoderDirectX3D:
         for (const char *name : {"d3d11av1dec", "d3d11h264dec", "d3d11h265dec", "d3d11mpeg2dec", "d3d11vp8dec", "d3d11vp9dec",
                                  "d3d12av1dec", "d3d12h264dec", "d3d12h265dec", "d3d12mpeg2dec", "d3d12vp8dec", "d3d12vp9dec",
                                  "dxvaav1decoder", "dxvah264decoder", "dxvah265decoder", "dxvampeg2decoder", "dxvavp8decoder", "dxvavp9decoder" }) {
-            changeRank(name, PrioritizedRank);
+            _changeFeatureRank(registry, name, PrioritizedRank);
         }
         break;
     case GStreamer::ForceVideoDecoderVideoToolbox:
         for (const char *name : {"vtdec_hw", "vtdec"}) {
-            changeRank(name, PrioritizedRank);
+            _changeFeatureRank(registry, name, PrioritizedRank);
         }
         break;
     case GStreamer::ForceVideoDecoderIntel:
         for (const char *name : {"qsvh264dec", "qsvh265dec", "qsvjpegdec", "qsvvp9dec", "msdkav1dec", "msdkh264dec", "msdkh265dec", "msdkmjpegdec", "msdkmpeg2dec", "msdkvc1dec", "msdkvp8dec", "msdkvp9dec"}) {
-            changeRank(name, PrioritizedRank);
+            _changeFeatureRank(registry, name, PrioritizedRank);
         }
         break;
     case GStreamer::ForceVideoDecoderVulkan:
         for (const char *name : {"vulkanh264dec", "vulkanh265dec"}) {
-            changeRank(name, PrioritizedRank);
+            _changeFeatureRank(registry, name, PrioritizedRank);
         }
         break;
     default:
@@ -352,11 +496,6 @@ void _setCodecPriorities(GStreamer::VideoDecoderOptions option)
     }
 }
 
-} // namespace
-
-namespace GStreamer
-{
-
 bool initialize()
 {
     _setGstEnvVars();
@@ -368,10 +507,11 @@ bool initialize()
             gstDebugLevel = settings.value(AppSettings::gstDebugLevelName).toInt();
         }
         gst_debug_set_default_threshold(static_cast<GstDebugLevel>(gstDebugLevel));
-        gst_debug_remove_log_function(gst_debug_log_default);
-        gst_debug_add_log_function(_qtGstLog, nullptr, nullptr);
     }
 
+    gst_debug_remove_log_function(gst_debug_log_default);
+    gst_debug_add_log_function(_qtGstLog, nullptr, nullptr);
+
     const QStringList args = QCoreApplication::arguments();
     int gstArgc = args.size();
 
@@ -405,6 +545,7 @@ bool initialize()
         return false;
     }
 
+    _logDecoderRanks();
     _setCodecPriorities(static_cast<GStreamer::VideoDecoderOptions>(SettingsManager::instance()->videoSettings()->forceVideoDecoder()->rawValue().toInt()));
 
     GstElement *sink = gst_element_factory_make("qml6glsink", nullptr);
diff --git a/src/VideoManager/VideoReceiver/GStreamer/GStreamer.h b/src/VideoManager/VideoReceiver/GStreamer/GStreamer.h
index 8f04673fd028..85370f5fe48d 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/GStreamer.h
+++ b/src/VideoManager/VideoReceiver/GStreamer/GStreamer.h
@@ -28,7 +28,8 @@ enum VideoDecoderOptions {
     ForceVideoDecoderDirectX3D,
     ForceVideoDecoderVideoToolbox,
     ForceVideoDecoderIntel,
-    ForceVideoDecoderVulkan
+    ForceVideoDecoderVulkan,
+    ForceVideoDecoderHardware
 };
 
 bool initialize();
diff --git a/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.cc b/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.cc
index 9595e1bcbffe..bdb6c8f0f055 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.cc
+++ b/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.cc
@@ -10,6 +10,8 @@
 #include "GStreamerHelpers.h"
 
 #include <gst/rtsp/gstrtspurl.h>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 namespace GStreamer
 {
@@ -33,4 +35,55 @@ is_valid_rtsp_uri(const gchar *uri_str)
     return TRUE;
 }
 
+bool is_hardware_decoder_factory(GstElementFactory *factory)
+{
+    if (!factory) {
+        return false;
+    }
+
+    const gchar *factoryName = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory));
+    if (!factoryName) {
+        return false;
+    }
+
+    // Exclude Android software decoders (OMXGoogle / C2Android)
+    QString name = QString::fromUtf8(factoryName).toLower();
+    if (name.startsWith("amcviddec-omxgoogle") || name.startsWith("amcviddec-c2android")) {
+        return false;
+    }
+
+    const auto containsHardware = [](const gchar *value) {
+        return value && (g_strrstr(value, "Hardware") != nullptr || g_strrstr(value, "hardware") != nullptr);
+    };
+
+    if (containsHardware(gst_element_factory_get_metadata(factory, GST_ELEMENT_METADATA_KLASS))) {
+        return true;
+    }
+
+    if (containsHardware(gst_element_factory_get_klass(factory))) {
+        return true;
+    }
+
+    const QString nameLower = QString::fromUtf8(factoryName).toLower();
+    static const QStringList kHardwareTags = {
+        QStringLiteral("va"),      // vaapi family
+        QStringLiteral("nv"),      // nvidia nvcodec
+        QStringLiteral("qsv"),     // intel quick sync
+        QStringLiteral("msdk"),    // intel media sdk
+        QStringLiteral("vulkan"),  // vulkan accelerated
+        QStringLiteral("d3d"),     // direct3d
+        QStringLiteral("dxva"),    // directx video accel
+        QStringLiteral("vtdec"),   // apple video toolbox
+        QStringLiteral("metal")    // metal-based decoders
+    };
+
+    for (const QString &tag : kHardwareTags) {
+        if (nameLower.contains(tag)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 } // namespace GStreamer
diff --git a/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.h b/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.h
index bb1bf4dfcbfc..a8a05c889ec5 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.h
+++ b/src/VideoManager/VideoReceiver/GStreamer/GStreamerHelpers.h
@@ -10,8 +10,14 @@
 #pragma once
 
 #include <glib.h>
+// Needed for GstElementFactory
+#include <gst/gst.h>
 
 namespace GStreamer
 {
     gboolean is_valid_rtsp_uri(const gchar *uri_str);
+
+    // Returns true if the given factory likely represents a hardware-accelerated decoder.
+    // Heuristics: checks metadata/klass for "Hardware" and common vendor tags in the factory name.
+    bool is_hardware_decoder_factory(GstElementFactory *factory);
 }
diff --git a/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.cc b/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.cc
index 359daebe77db..dc302c7dd228 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.cc
+++ b/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.cc
@@ -27,7 +27,7 @@
 
 #include <gst/gst.h>
 
-QGC_LOGGING_CATEGORY(GstVideoReceiverLog, "qgc.videomanager.videoreceiver.gstreamer.gstvideoreceiver")
+QGC_LOGGING_CATEGORY(GstVideoReceiverLog, "Video.GstVideoReceiver")
 
 GstVideoReceiver::GstVideoReceiver(QObject *parent)
     : VideoReceiver(parent)
@@ -239,10 +239,12 @@ void GstVideoReceiver::stop()
     qCDebug(GstVideoReceiverLog) << "Stopping" << _uri;
 
     if (_teeProbeId != 0) {
-        GstPad *sinkpad = gst_element_get_static_pad(_tee, "sink");
-        if (sinkpad) {
-            gst_pad_remove_probe(sinkpad, _teeProbeId);
-            gst_clear_object(&sinkpad);
+        if (_tee) {
+            GstPad *sinkpad = gst_element_get_static_pad(_tee, "sink");
+            if (sinkpad) {
+                gst_pad_remove_probe(sinkpad, _teeProbeId);
+                gst_clear_object(&sinkpad);
+            }
         }
         _teeProbeId = 0;
     }
@@ -918,12 +920,50 @@ void GstVideoReceiver::_onNewSourcePad(GstPad *pad)
     qCDebug(GstVideoReceiverLog) << "Decoding started" << _uri;
 }
 
+void GstVideoReceiver::_logDecodebin3SelectedCodec(GstElement *decodebin3)
+{
+    GValue value = G_VALUE_INIT;
+    GstIterator *iter = gst_bin_iterate_elements(GST_BIN(decodebin3));
+    GstElement *child;
+
+    while (gst_iterator_next(iter, &value) == GST_ITERATOR_OK) {
+        child = GST_ELEMENT(g_value_get_object(&value));
+        GstElementFactory *factory = gst_element_get_factory(child);
+
+        if (factory) {
+            gboolean is_decoder = gst_element_factory_list_is_type(factory, GST_ELEMENT_FACTORY_TYPE_DECODER);
+            if (is_decoder) {
+                const gchar *decoderKlass = gst_element_factory_get_klass(factory);
+                GstPluginFeature *feature = GST_PLUGIN_FEATURE(factory);
+                const gchar *featureName = gst_plugin_feature_get_name(feature);
+                const guint rank = gst_plugin_feature_get_rank(feature);
+                bool isHardwareDecoder = GStreamer::is_hardware_decoder_factory(factory);
+
+                QString pluginName = featureName;
+                GstPlugin *plugin = gst_plugin_feature_get_plugin(feature);
+                if (plugin) {
+                    pluginName = gst_plugin_get_name(plugin);
+                    gst_object_unref(plugin);
+                }
+                qCDebug(GstVideoReceiverLog) << "Decodebin3 selected codec:rank -" << pluginName << "/" << featureName << "-" << decoderKlass << (isHardwareDecoder ? "(HW)" : "(SW)") << ":" << rank;
+            }
+        }
+        g_value_reset(&value);
+    }
+    g_value_unset(&value);
+    gst_iterator_free(iter);
+}
+
+
 void GstVideoReceiver::_onNewDecoderPad(GstPad *pad)
 {
     qCDebug(GstVideoReceiverLog) << "_onNewDecoderPad" << _uri;
 
     GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(_pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "pipeline-with-new-decoder-pad");
 
+    // We should now know what codec decodebin3 selected.
+    _logDecodebin3SelectedCodec(_decoder);
+
     if (!_addVideoSink(pad)) {
         qCCritical(GstVideoReceiverLog) << "_addVideoSink() failed";
     }
@@ -1018,20 +1058,45 @@ bool GstVideoReceiver::_addVideoSink(GstPad *pad)
 
     GST_DEBUG_BIN_TO_DOT_FILE(GST_BIN(_pipeline), GST_DEBUG_GRAPH_SHOW_ALL, "pipeline-with-videosink");
 
-    if (_decoderValve) {
-        // Extracting video size from source is more guaranteed
+    // Determine video size. Errors here are non-fatal.
+    QSize videoSize;
+    do {
+        if (!_decoderValve) {
+            qCCritical(GstVideoReceiverLog) << "Unable to determine video size - _decoderValve is NULL" << _uri;
+            break;
+        }
+
         GstPad *valveSrcPad = gst_element_get_static_pad(_decoderValve, "src");
-        const GstCaps *valveSrcPadCaps = gst_pad_query_caps(valveSrcPad, nullptr);
+        if (!valveSrcPad) {
+            qCCritical(GstVideoReceiverLog) << "gst_element_get_static_pad() failed";
+            break;
+        }
+
+        GstCaps *valveSrcPadCaps = gst_pad_query_caps(valveSrcPad, nullptr);
+        if (!valveSrcPadCaps) {
+            qCCritical(GstVideoReceiverLog) << "gst_pad_query_caps() failed";
+            gst_clear_object(&valveSrcPad);
+            break;
+        }
+
         const GstStructure *structure = gst_caps_get_structure(valveSrcPadCaps, 0);
-        if (structure) {
-            gint width, height;
-            (void) gst_structure_get_int(structure, "width", &width);
-            (void) gst_structure_get_int(structure, "height", &height);
-            _dispatchSignal([this, width, height]() { emit videoSizeChanged(QSize(width, height)); });
+        if (!structure) {
+            qCCritical(GstVideoReceiverLog) << "Unable to determine video size - structure is NULL" << _uri;
+            gst_clear_object(&valveSrcPad);
+            break;
         }
-    } else {
-        _dispatchSignal([this]() { emit videoSizeChanged(QSize()); });
-    }
+
+        gint width = 0;
+        gint height = 0;
+        (void) gst_structure_get_int(structure, "width", &width);
+        (void) gst_structure_get_int(structure, "height", &height);
+        videoSize.setWidth(width);
+        videoSize.setHeight(height);
+
+        gst_clear_caps(&valveSrcPadCaps);
+        gst_clear_object(&valveSrcPad);
+    } while (false);
+    _dispatchSignal([this, videoSize]() { emit videoSizeChanged(videoSize); });
 
     gst_clear_caps(&caps);
     return true;
diff --git a/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.h b/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.h
index 41e686b6f368..1099233eb5d7 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.h
+++ b/src/VideoManager/VideoReceiver/GStreamer/GstVideoReceiver.h
@@ -90,6 +90,7 @@ private slots:
     bool _unlinkBranch(GstElement *from);
     void _shutdownDecodingBranch();
     void _shutdownRecordingBranch();
+    void _logDecodebin3SelectedCodec(GstElement *decodebin3);
 
     bool _needDispatch();
     void _dispatchSignal(Task emitter);
diff --git a/src/VideoManager/VideoReceiver/GStreamer/gstqgc/CMakeLists.txt b/src/VideoManager/VideoReceiver/GStreamer/gstqgc/CMakeLists.txt
index e21b727443cc..804785f617f0 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/gstqgc/CMakeLists.txt
+++ b/src/VideoManager/VideoReceiver/GStreamer/gstqgc/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# GStreamer QGC Video Sink Plugin
+# Custom GStreamer elements for QGC video streaming
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         gstqgc.cc
diff --git a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt
index dda388dcfdcb..40d318671e2d 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt
+++ b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/CMakeLists.txt
@@ -1,30 +1,50 @@
+# ============================================================================
+# GStreamer Qt6 QML GL Plugin
+# Qt6 integration for GStreamer video rendering
+# ============================================================================
+
 qt_add_library(gstqml6gl STATIC)
 
+# ----------------------------------------------------------------------------
+# Platform-Specific GStreamer Linking
+# ----------------------------------------------------------------------------
 if(MACOS)
-    # Using FindGStreamer.cmake is currently bypassed on MACOS since it doesn't work
-    # So for now we hack in a simple hardwired setup which does work
+    # NOTE: Using FindGStreamer.cmake is currently bypassed on macOS
+    # Using hardwired framework path as a workaround
     find_library(GSTREAMER_FRAMEWORK GStreamer)
-    set(GST_PLUGINS_VERSION 1.24.12)
+    set(GST_REQUIRED_FRAMEWORK_VERSION 1.24.13)
+    set(GST_PLUGINS_VERSION ${GST_REQUIRED_FRAMEWORK_VERSION})
     set(GSTREAMER_FRAMEWORK_PATH "/Library/Frameworks/GStreamer.framework")
     if(NOT EXISTS "${GSTREAMER_FRAMEWORK_PATH}")
         message(FATAL_ERROR "GStreamer.framework not found at ${GSTREAMER_FRAMEWORK_PATH}. Install GStreamer using tools/setup/install-dependencies-osx.sh script")
     endif()
     target_link_libraries(gstqml6gl PUBLIC "$<LINK_LIBRARY:FRAMEWORK,${GSTREAMER_FRAMEWORK_PATH}>")
     target_include_directories(gstqml6gl PUBLIC "${GSTREAMER_FRAMEWORK_PATH}/Headers")
+    # Verify correct framework version
+    execute_process(
+        COMMAND defaults read "${GSTREAMER_FRAMEWORK_PATH}/Versions/1.0/Resources/Info.plist" CFBundleShortVersionString
+        OUTPUT_VARIABLE GST_INSTALLED_FRAMEWORK_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(NOT GST_INSTALLED_FRAMEWORK_VERSION STREQUAL GST_REQUIRED_FRAMEWORK_VERSION)
+        message(FATAL_ERROR "GStreamer.framework version (${GST_INSTALLED_FRAMEWORK_VERSION}) does not match required framework version (${GST_REQUIRED_FRAMEWORK_VERSION}). Please install the correct version using tools/setup/install-dependencies-osx.sh script")
+    endif()
 else()
     target_link_libraries(gstqml6gl PUBLIC GStreamer::GStreamer)
 endif()
 
+# TODO: Skip custom build if system gstreamer1.0-qt6 plugin is found
 # if(GST_PLUGIN_qml6_FOUND)
-#     # Don't Download & Build if gstreamer1.0-qt6 gstqml6 was found
 #     return()
 # endif()
 
-################################################################################
+# ============================================================================
+# GStreamer Good Plugins Integration
+# ============================================================================
 
-if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.22)
-    # Use Latest Revisions for each minor version: 1.20.7, 1.22.12, 1.24.12, 1.26.3
-    string(REPLACE "." ";" GST_VERSION_LIST ${GStreamer_VERSION})
+if(GStreamer_VERSION VERSION_GREATER_EQUAL "1.22")
+    # Use Latest Revisions for each minor version: 1.20.7, 1.22.12, 1.24.13, 1.26.6
+    string(REPLACE "." ";" GST_VERSION_LIST "${GStreamer_VERSION}")
     list(GET GST_VERSION_LIST 0 GST_VERSION_MAJOR)
     list(GET GST_VERSION_LIST 1 GST_VERSION_MINOR)
     list(GET GST_VERSION_LIST 2 GST_VERSION_PATCH)
@@ -34,39 +54,48 @@ if(GStreamer_VERSION VERSION_GREATER_EQUAL 1.22)
     elseif(GST_VERSION_MINOR EQUAL 22)
         set(GST_VERSION_PATCH 12)
     elseif(GST_VERSION_MINOR EQUAL 24)
-        set(GST_VERSION_PATCH 12)
+        set(GST_VERSION_PATCH 13)
     elseif(GST_VERSION_MINOR EQUAL 26)
-        set(GST_VERSION_PATCH 3)
+        set(GST_VERSION_PATCH 6)
     endif()
 
     set(GST_PLUGINS_VERSION ${GST_VERSION_MAJOR}.${GST_VERSION_MINOR}.${GST_VERSION_PATCH})
 
-    # URL_HASH https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${GST_PLUGINS_VERSION}.tar.xz.sha256sum
+    # Download GStreamer good plugins for Qt6 support
     CPMAddPackage(
         NAME gstreamer_good_plugins
         VERSION ${GST_PLUGINS_VERSION}
-        # URL https://gitlab.freedesktop.org/gstreamer/gstreamer/-/archive/${GST_PLUGINS_VERSION}/gstreamer-${GST_PLUGINS_VERSION}.zip?path=subprojects/gst-plugins-good/ext/qt6
         URL https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${GST_PLUGINS_VERSION}.tar.xz
+        # TODO: Add URL_HASH for verification
+        # URL_HASH https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${GST_PLUGINS_VERSION}.tar.xz.sha256sum
     )
     set(QGC_GST_QT6_PLUGIN_PATH "${gstreamer_good_plugins_SOURCE_DIR}/ext/qt6")
 else()
     set(QGC_GST_QT6_PLUGIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qt6")
 endif()
 
-################################################################################
+# ============================================================================
+# Source Code Patching
+# ============================================================================
 
-file(READ ${QGC_GST_QT6_PLUGIN_PATH}/qt6glitem.h FILE_CONTENTS)
+# Fix missing includes in GStreamer Qt6 plugin
+file(READ "${QGC_GST_QT6_PLUGIN_PATH}/qt6glitem.h" FILE_CONTENTS)
 string(FIND "${FILE_CONTENTS}" "#include <QtQuick/QQuickWindow>" GST_FIX_INCLUDES)
 if(GST_FIX_INCLUDES EQUAL -1)
     string(REPLACE "#include <QtGui/QOpenGLFunctions>" "#include <QtGui/QOpenGLFunctions>\n#include <QtQuick/QQuickWindow>" FILE_CONTENTS "${FILE_CONTENTS}")
-    file(WRITE ${QGC_GST_QT6_PLUGIN_PATH}/qt6glitem.h "${FILE_CONTENTS}")
+    file(WRITE "${QGC_GST_QT6_PLUGIN_PATH}/qt6glitem.h" "${FILE_CONTENTS}")
 endif()
 
-################################################################################
+# ----------------------------------------------------------------------------
+# Build GStreamer QML6 GL Library
+# ----------------------------------------------------------------------------
 
+# NOTE: Using file(GLOB) for external GStreamer plugin sources
+# CONFIGURE_DEPENDS ensures CMake re-runs if files are added/removed
 file(GLOB gstqml6gl_SRCS
-    ${QGC_GST_QT6_PLUGIN_PATH}/*.cc
-    ${QGC_GST_QT6_PLUGIN_PATH}/*.h
+    CONFIGURE_DEPENDS
+    "${QGC_GST_QT6_PLUGIN_PATH}/*.cc"
+    "${QGC_GST_QT6_PLUGIN_PATH}/*.h"
 )
 target_sources(gstqml6gl PRIVATE ${gstqml6gl_SRCS})
 
@@ -89,7 +118,9 @@ target_precompile_headers(gstqml6gl
         <gst/video/video.h>
 )
 
-################################################################################
+# ============================================================================
+# Shader Compilation
+# ============================================================================
 
 if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/resources.qrc")
     find_package(Qt6 REQUIRED COMPONENTS ShaderTools)
@@ -111,6 +142,7 @@ if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/resources.qrc")
         LIST(APPEND OUTPUTS "YUV_BIPLANAR.frag.qsb")
     endif()
 
+    # Compile shaders for different GLSL versions
     qt_add_shaders(gstqml6gl "gstqml6gl_shaders"
         PREFIX "/org/freedesktop/gstreamer/qml6"
         GLSL "100 es,120,330"
@@ -120,6 +152,7 @@ if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/resources.qrc")
         BATCHABLE
     )
 
+    # Handle additional GLES-specific RGBA shader if present
     if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/RGBA_gles.frag")
         find_program(QSB_PROGRAM
             NAMES qsb
@@ -161,7 +194,9 @@ if(EXISTS "${QGC_GST_QT6_PLUGIN_PATH}/resources.qrc")
     endif()
 endif()
 
-################################################################################
+# ============================================================================
+# Platform-Specific OpenGL Support
+# ============================================================================
 
 if(GStreamer_GlX11_FOUND)
     target_compile_definitions(gstqml6gl PRIVATE HAVE_QT_X11)
diff --git a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/gstqml6glsink.cc b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/gstqml6glsink.cc
index 32dd64693120..161fb4a196ff 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/gstqml6glsink.cc
+++ b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/gstqml6glsink.cc
@@ -528,7 +528,7 @@ gst_qml6_gl_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
   }
 
   if (pool == NULL && need_pool) {
-  
+
     GST_DEBUG_OBJECT (qt_sink, "create new pool");
     pool = gst_gl_buffer_pool_new (qt_sink->context);
 
diff --git a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/qt6glitem.cc b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/qt6glitem.cc
index cb01ca8b84e5..4e319abf7584 100644
--- a/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/qt6glitem.cc
+++ b/src/VideoManager/VideoReceiver/GStreamer/gstqml6gl/qt6/qt6glitem.cc
@@ -761,4 +761,3 @@ Qt6GLVideoItemInterface::invalidateRef()
   QMutexLocker locker(&lock);
   qt_item = NULL;
 }
-
diff --git a/src/VideoManager/VideoReceiver/QtMultimedia/CMakeLists.txt b/src/VideoManager/VideoReceiver/QtMultimedia/CMakeLists.txt
index d0d2cd7de1c2..06958ec3fb63 100644
--- a/src/VideoManager/VideoReceiver/QtMultimedia/CMakeLists.txt
+++ b/src/VideoManager/VideoReceiver/QtMultimedia/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Qt Multimedia Video Receiver Backend
+# Qt6 Multimedia-based video streaming and UVC camera support
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         QtMultimediaReceiver.cc
@@ -8,10 +13,16 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Qt Multimedia Video Streaming
+# ----------------------------------------------------------------------------
 if(QGC_ENABLE_QT_VIDEOSTREAMING)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_QT_STREAMING)
 endif()
 
+# ----------------------------------------------------------------------------
+# UVC Camera Support
+# ----------------------------------------------------------------------------
 if(NOT QGC_ENABLE_UVC)
     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_DISABLE_UVC)
 endif()
diff --git a/src/VideoManager/VideoReceiver/QtMultimedia/QtMultimediaReceiver.cc b/src/VideoManager/VideoReceiver/QtMultimedia/QtMultimediaReceiver.cc
index 9c3f01c0e2b5..56c88942e4fe 100644
--- a/src/VideoManager/VideoReceiver/QtMultimedia/QtMultimediaReceiver.cc
+++ b/src/VideoManager/VideoReceiver/QtMultimedia/QtMultimediaReceiver.cc
@@ -21,7 +21,7 @@
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickItemGrabResult>
 
-QGC_LOGGING_CATEGORY(QtMultimediaReceiverLog, "qgc.videomanager.videoreceiver.qtmultimedia.qtmultimediareceiver")
+QGC_LOGGING_CATEGORY(QtMultimediaReceiverLog, "Video.QtMultimediaReceiver")
 
 QtMultimediaReceiver::QtMultimediaReceiver(QObject *parent)
     : VideoReceiver(parent)
diff --git a/src/VideoManager/VideoReceiver/QtMultimedia/UVCReceiver.cc b/src/VideoManager/VideoReceiver/QtMultimedia/UVCReceiver.cc
index 6a680ebc4cdd..bfa4f64a3af9 100644
--- a/src/VideoManager/VideoReceiver/QtMultimedia/UVCReceiver.cc
+++ b/src/VideoManager/VideoReceiver/QtMultimedia/UVCReceiver.cc
@@ -23,7 +23,7 @@
 #include <QtMultimediaQuick/private/qquickvideooutput_p.h>
 #include <QtQuick/QQuickItem>
 
-QGC_LOGGING_CATEGORY(UVCReceiverLog, "qgc.videomanager.videoreceiver.qtmultimedia.uvcreceiver")
+QGC_LOGGING_CATEGORY(UVCReceiverLog, "Video.UVCReceiver")
 
 UVCReceiver::UVCReceiver(QObject *parent)
     : QtMultimediaReceiver(parent)
diff --git a/src/Viewer3D/CMakeLists.txt b/src/Viewer3D/CMakeLists.txt
index d344da10fc25..2a36f69566f5 100644
--- a/src/Viewer3D/CMakeLists.txt
+++ b/src/Viewer3D/CMakeLists.txt
@@ -1,5 +1,10 @@
+# ============================================================================
+# Viewer3D Module
+# 3D visualization with terrain and city geometry
 # @author Omid Esrafilian <esrafilian.omid@gmail.com>
+# ============================================================================
 
+# Only build when 3D viewer is enabled
 if(NOT QGC_VIEWER3D)
     return()
 endif()
@@ -28,6 +33,9 @@ target_sources(${CMAKE_PROJECT_NAME}
         Viewer3DTileReply.h
 )
 
+# ----------------------------------------------------------------------------
+# Qt Quick3D Dependency
+# ----------------------------------------------------------------------------
 find_package(Qt6 REQUIRED COMPONENTS Quick3D)
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Quick3D)
@@ -36,6 +44,9 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_
 
 target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_VIEWER3D)
 
+# ----------------------------------------------------------------------------
+# 3D QML Module
+# ----------------------------------------------------------------------------
 qt_add_library(Viewer3DModule STATIC)
 
 set_source_files_properties(Images/city_3d_map_icon.svg PROPERTIES QT_RESOURCE_ALIAS City3DMapIcon.svg)
diff --git a/src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml b/src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml
index d1bb7d699670..4696fb5d9aaf 100644
--- a/src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml
+++ b/src/Viewer3D/Viewer3DQml/Models3D/Line3D.qml
@@ -1,108 +1,108 @@
-/****************************************************************************
- *
- * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-import QGroundControl.Viewer3D
-
-Node{
-
-    id: lineBody
-    property vector3d p_1: Qt.vector3d(10, 0, 0)
-    property vector3d p_2: Qt.vector3d(0, 20, 0)
-    property real lineWidth: 5
-    property alias color: line_mat.diffuseColor
-
-    readonly property vector3d vec_1: Qt.vector3d(p_2.x - p_1.x,
-                                                  p_2.y - p_1.y,
-                                                  p_2.z - p_1.z)
-    readonly property real length_: vecNorm(vec_1)
-    readonly property vector3d vec_2: Qt.vector3d(0, length_, 0)
-
-    function crossProduct(vec_a, vec_b)
-    {
-        var vec_c = Qt.vector3d(0, 0, 0)
-        vec_c.x = vec_a.y * vec_b.z - vec_a.z * vec_b.y
-        vec_c.y = -(vec_a.x * vec_b.z - vec_a.z * vec_b.x)
-        vec_c.z = vec_a.x * vec_b.y - vec_a.y * vec_b.x
-
-        return vec_c
-    }
-
-    function dotProduct(vec_a, vec_b)
-    {
-        return (vec_a.x*vec_b.x + vec_a.y*vec_b.y + vec_a.z*vec_b.z)
-    }
-
-    function vecNorm(_vec)
-    {
-        return Math.sqrt(dotProduct(_vec, _vec))
-    }
-
-    function normalizeVec(_vec)
-    {
-        var norm_vec = vecNorm(_vec)
-        return Qt.vector3d(_vec.x/norm_vec, _vec.y/norm_vec, _vec.z/norm_vec)
-    }
-
-    function getRotationBetween(vec_a, vec_b)
-    {
-        var vec_a_n = normalizeVec(vec_a)
-        var vec_b_n = normalizeVec(vec_b)
-
-        var cos_angle = dotProduct(vec_a_n, vec_b_n)
-        if(cos_angle === 1)
-        {
-            return Quaternion.fromEulerAngles(Qt.vector3d(0, 0, 0))
-        }else if(cos_angle === -1)
-        {
-            var axis_idx = 0
-            var dx = Math.abs(vec_a_n.x - vec_b_n.x)
-            if(dx < Math.abs(vec_a_n.y - vec_b_n.y))
-            {
-                dx = Math.abs(vec_a_n.y - vec_b_n.y)
-                axis_idx = 1
-            }
-            if(dx < Math.abs(vec_a_n.z - vec_b_n.z))
-                axis_idx = 2
-
-            switch(axis_idx)
-            {
-            case 0:
-                return Quaternion.fromEulerAngles(Qt.vector3d(0, 180, 0))
-            case 1:
-                return Quaternion.fromEulerAngles(Qt.vector3d(0, 0, 180))
-            case 2:
-                return Quaternion.fromEulerAngles(Qt.vector3d(180, 0, 0))
-            }
-        }
-
-        var angle_ = Math.acos(cos_angle)
-        var axis_ = normalizeVec(crossProduct(vec_a_n, vec_b_n))
-
-        return Quaternion.fromAxisAndAngle(axis_, angle_ * 180/3.1415)
-    }
-
-    rotation: getRotationBetween(vec_2, vec_1)
-    position: p_1
-
-    Model {
-        readonly property real scalePose: 50
-        readonly property real height: lineBody.length_
-        readonly property real radius: lineBody.lineWidth * 0.1
-
-        source: "#Cylinder"
-        scale: Qt.vector3d(radius/scalePose, 0.5 * height/scalePose, radius/scalePose)
-        position: Qt.vector3d(0, 0.5 * height, 0)
-
-        materials:
-            DefaultMaterial {
-            id: line_mat
-            diffuseColor: "blue"
-        }
-    }
-}
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QGroundControl.Viewer3D
+
+Node{
+
+    id: lineBody
+    property vector3d p_1: Qt.vector3d(10, 0, 0)
+    property vector3d p_2: Qt.vector3d(0, 20, 0)
+    property real lineWidth: 5
+    property alias color: line_mat.diffuseColor
+
+    readonly property vector3d vec_1: Qt.vector3d(p_2.x - p_1.x,
+                                                  p_2.y - p_1.y,
+                                                  p_2.z - p_1.z)
+    readonly property real length_: vecNorm(vec_1)
+    readonly property vector3d vec_2: Qt.vector3d(0, length_, 0)
+
+    function crossProduct(vec_a, vec_b)
+    {
+        var vec_c = Qt.vector3d(0, 0, 0)
+        vec_c.x = vec_a.y * vec_b.z - vec_a.z * vec_b.y
+        vec_c.y = -(vec_a.x * vec_b.z - vec_a.z * vec_b.x)
+        vec_c.z = vec_a.x * vec_b.y - vec_a.y * vec_b.x
+
+        return vec_c
+    }
+
+    function dotProduct(vec_a, vec_b)
+    {
+        return (vec_a.x*vec_b.x + vec_a.y*vec_b.y + vec_a.z*vec_b.z)
+    }
+
+    function vecNorm(_vec)
+    {
+        return Math.sqrt(dotProduct(_vec, _vec))
+    }
+
+    function normalizeVec(_vec)
+    {
+        var norm_vec = vecNorm(_vec)
+        return Qt.vector3d(_vec.x/norm_vec, _vec.y/norm_vec, _vec.z/norm_vec)
+    }
+
+    function getRotationBetween(vec_a, vec_b)
+    {
+        var vec_a_n = normalizeVec(vec_a)
+        var vec_b_n = normalizeVec(vec_b)
+
+        var cos_angle = dotProduct(vec_a_n, vec_b_n)
+        if(cos_angle === 1)
+        {
+            return Quaternion.fromEulerAngles(Qt.vector3d(0, 0, 0))
+        }else if(cos_angle === -1)
+        {
+            var axis_idx = 0
+            var dx = Math.abs(vec_a_n.x - vec_b_n.x)
+            if(dx < Math.abs(vec_a_n.y - vec_b_n.y))
+            {
+                dx = Math.abs(vec_a_n.y - vec_b_n.y)
+                axis_idx = 1
+            }
+            if(dx < Math.abs(vec_a_n.z - vec_b_n.z))
+                axis_idx = 2
+
+            switch(axis_idx)
+            {
+            case 0:
+                return Quaternion.fromEulerAngles(Qt.vector3d(0, 180, 0))
+            case 1:
+                return Quaternion.fromEulerAngles(Qt.vector3d(0, 0, 180))
+            case 2:
+                return Quaternion.fromEulerAngles(Qt.vector3d(180, 0, 0))
+            }
+        }
+
+        var angle_ = Math.acos(cos_angle)
+        var axis_ = normalizeVec(crossProduct(vec_a_n, vec_b_n))
+
+        return Quaternion.fromAxisAndAngle(axis_, angle_ * 180/3.1415)
+    }
+
+    rotation: getRotationBetween(vec_2, vec_1)
+    position: p_1
+
+    Model {
+        readonly property real scalePose: 50
+        readonly property real height: lineBody.length_
+        readonly property real radius: lineBody.lineWidth * 0.1
+
+        source: "#Cylinder"
+        scale: Qt.vector3d(radius/scalePose, 0.5 * height/scalePose, radius/scalePose)
+        position: Qt.vector3d(0, 0.5 * height, 0)
+
+        materials:
+            DefaultMaterial {
+            id: line_mat
+            diffuseColor: "blue"
+        }
+    }
+}
diff --git a/src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml b/src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml
index 23370dd07e07..0b2aea9076d3 100644
--- a/src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml
+++ b/src/Viewer3D/Viewer3DQml/Models3D/Waypoint3DModel.qml
@@ -67,6 +67,3 @@ Node{
         }
     }
 }
-
-
-
diff --git a/src/Viewer3D/Viewer3DTileQuery.cc b/src/Viewer3D/Viewer3DTileQuery.cc
index 54c3bc6c103f..80093722edf8 100644
--- a/src/Viewer3D/Viewer3DTileQuery.cc
+++ b/src/Viewer3D/Viewer3DTileQuery.cc
@@ -227,4 +227,3 @@ QString MapTileQuery::getTileKey(int mapId, int x, int y, int zoomLevel)
 {
     return QString::asprintf("%010d%08d%08d%03d", mapId, x, y, zoomLevel);
 }
-
diff --git a/src/main.cc b/src/main.cc
index 00662144ebce..ec81462249f7 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -11,15 +11,10 @@
 #include <QtWidgets/QApplication>
 
 #include "QGCApplication.h"
+#include "QGCCommandLineParser.h"
 #include "QGCLogging.h"
-#include "CmdLineOptParser.h"
-#include "SettingsManager.h"
-#include "MavlinkSettings.h"
 #include "Platform.h"
-
-#ifdef Q_OS_WIN
-    #include <windows.h>
-#endif
+#include "NTRIP.h"
 
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
     #include <QtWidgets/QMessageBox>
@@ -27,177 +22,90 @@
 #endif
 
 #ifdef Q_OS_LINUX
-#ifdef Q_OS_ANDROID
-    #include "AndroidInterface.h"
-#else
     #include <unistd.h>
     #include <sys/types.h>
-    #include "SignalHandler.h"
-#endif
 #endif
 
 #ifdef QGC_UNITTEST_BUILD
     #include "UnitTestList.h"
 #endif
 
-//-----------------------------------------------------------------------------
-/**
- * @brief Starts the application
- *
- * @param argc Number of commandline arguments
- * @param argv Commandline arguments
- * @return exit code, 0 for normal exit and !=0 for error cases
- */
-
 int main(int argc, char *argv[])
 {
-    bool runUnitTests = false;
-    bool simpleBootTest = false;
-    QString systemIdStr = QString();
-    bool hasSystemId = false;
-    bool bypassRunGuard = false;
-
-    bool stressUnitTests = false;       // Stress test unit tests
-    bool quietWindowsAsserts = false;   // Don't let asserts pop dialog boxes
-    QString unitTestOptions;
-
-    CmdLineOpt_t rgCmdLineOptions[] = {
-#ifdef QT_DEBUG
-        { "--unittest",             &runUnitTests,          &unitTestOptions },
-        { "--unittest-stress",      &stressUnitTests,       &unitTestOptions },
-        { "--no-windows-assert-ui", &quietWindowsAsserts,   nullptr },
-        { "--allow-multiple",       &bypassRunGuard,        nullptr },
-#endif
-        { "--system-id",            &hasSystemId,           &systemIdStr },
-        { "--simple-boot-test",     &simpleBootTest,        nullptr },
-        // Add additional command line option flags here
-    };
-
-    ParseCmdLineOptions(argc, argv, rgCmdLineOptions, std::size(rgCmdLineOptions), false);
-
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
-    // We make the runguard key different for custom and non custom
-    // builds, so they can be executed together in the same device.
-    // Stable and Daily have same QGC_APP_NAME so they would
-    // not be able to run at the same time
-    const QString runguardString = QStringLiteral("%1 RunGuardKey").arg(QGC_APP_NAME);
-
-    RunGuard guard(runguardString);
-    if (!bypassRunGuard && !guard.tryToRun()) {
-        const QApplication errorApp(argc, argv);
-        (void) QMessageBox::critical(nullptr, QObject::tr("Error"),
-            QObject::tr("A second instance of %1 is already running. Please close the other instance and try again.").arg(QGC_APP_NAME)
-        );
-        return -1;
-    }
+#if 0
+    // Useful for debugging specific unit tests
+    char argument1[] = "--unittest:ParameterManagerTest";
+    char argument2[] = "--logging:FactSystem.ParameterManager,Utilities.QGCStateMachine";
+    char *newArgv[] = { argv[0], argument1, argument2 };
+    argc = 3;
+    argv = newArgv;
 #endif
 
 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
     if (::getuid() == 0) {
         const QApplication errorApp(argc, argv);
-        (void) QMessageBox::critical(nullptr, QObject::tr("Error"),
-            QObject::tr("You are running %1 as root. "
-                "You should not do this since it will cause other issues with %1."
-                "%1 will now exit.<br/><br/>").arg(QGC_APP_NAME)
-        );
+        // QErrorMessage
+        (void) QMessageBox::critical(nullptr,
+                                     QCoreApplication::translate("main", "Error"),
+                                     QCoreApplication::translate("main", "You are running %1 as root. "
+                                                                         "You should not do this since it will cause other issues with %1. "
+                                                                         "%1 will now exit.<br/><br/>").arg(QGC_APP_NAME));
         return -1;
     }
 #endif
 
-#ifdef Q_OS_UNIX
-    if (!qEnvironmentVariableIsSet("QT_ASSUME_STDERR_HAS_CONSOLE")) {
-        (void) qputenv("QT_ASSUME_STDERR_HAS_CONSOLE", "1");
-    }
-
-    if (!qEnvironmentVariableIsSet("QT_FORCE_STDERR_LOGGING")) {
-        (void) qputenv("QT_FORCE_STDERR_LOGGING", "1");
-    }
-#endif
-
-#ifdef Q_OS_WIN
-    if (!qEnvironmentVariableIsSet("QT_WIN_DEBUG_CONSOLE")) {
-        (void) qputenv("QT_WIN_DEBUG_CONSOLE", "attach"); // new
+    QGCCommandLineParser::CommandLineParseResult args;
+    {
+        const QCoreApplication pre(argc, argv);
+        QCoreApplication::setApplicationName(QStringLiteral(QGC_APP_NAME));
+        QCoreApplication::setApplicationVersion(QStringLiteral(QGC_APP_VERSION_STR));
+        args = QGCCommandLineParser::parseCommandLine();
+        if (args.statusCode == QGCCommandLineParser::CommandLineParseResult::Status::Error) {
+            const QString errorMessage = args.errorString.value_or(QStringLiteral("Unknown error occurred"));
+            qCritical() << qPrintable(errorMessage);
+            // TODO: QCommandLineParser::showMessageAndExit(QCommandLineParser::MessageType::Error) - Qt6.9
+            return 1;
+        }
     }
-#endif
 
-    QGCLogging::installHandler(quietWindowsAsserts);
-
-#ifdef QGC_UNITTEST_BUILD
-    if (stressUnitTests) {
-        runUnitTests = true;
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+    const QString runguardString = QStringLiteral("%1 RunGuardKey").arg(QStringLiteral(QGC_APP_NAME));
+    RunGuard guard(runguardString);
+    if (!args.allowMultiple) {
+        if (!guard.tryToRun()) {
+            const QApplication errorApp(argc, argv);
+            (void) QMessageBox::critical(nullptr,
+                QCoreApplication::translate("main", "Error"),
+                QCoreApplication::translate("main", "A second instance of %1 is already running. "
+                                                    "Please close the other instance and try again.").arg(QStringLiteral(QGC_APP_NAME)));
+            return -1;
+        }
     }
 #endif
 
-#ifdef Q_OS_MACOS
-    Platform::disableAppNapViaInfoDict();
-#endif
+    // Early platform setup before Qt app construction
+    Platform::setupPreApp(args);
 
-#ifdef Q_OS_WIN
-    // Set our own OpenGL buglist
-    // (void) qputenv("QT_OPENGL_BUGLIST", ":/opengl/resources/opengl/buglist.json");
-
-    // Allow for command line override of renderer
-    for (int i = 0; i < argc; i++) {
-        const QString arg(argv[i]);
-        if (arg == QStringLiteral("-desktop")) {
-            QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
-            break;
-        } else if (arg == QStringLiteral("-swrast")) {
-            QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
-            break;
-        }
-    }
-
-#ifdef QGC_UNITTEST_BUILD
-    if (runUnitTests) {
-        // Don't pop up Windows Error Reporting dialog when app crashes.
-        const DWORD dwMode = SetErrorMode(SEM_NOGPFAULTERRORBOX);
-        SetErrorMode(dwMode | SEM_NOGPFAULTERRORBOX);
-    }
-#endif
-#endif // Q_OS_WIN
+    QGCApplication app(argc, argv, args);
 
-    QGCApplication app(argc, argv, runUnitTests, simpleBootTest);
+    QGCLogging::installHandler();
 
-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
-    SignalHandler::instance();
-    (void) SignalHandler::setupSignalHandlers();
-#endif
+    // Late platform setup after app and logging exist
+    Platform::setupPostApp();
 
     app.init();
 
-    // Set system ID if specified via command line, for example --system-id:255
-    if (hasSystemId) {
-        bool ok;
-        const int systemId = systemIdStr.toInt(&ok);
-        if (ok && (systemId >= 1) && (systemId <= 255)) {  // MAVLink system IDs are 8-bit
-            qDebug() << "Setting MAVLink System ID to:" << systemId;
-            SettingsManager::instance()->mavlinkSettings()->gcsMavlinkSystemID()->setRawValue(systemId);
-        } else {
-            qDebug() << "Not setting MAVLink System ID. It must be between 0 and 255. Invalid system ID value:" << systemIdStr;
-        }
-    }
-
     int exitCode = 0;
-
+    if (args.runningUnitTests) {
 #ifdef QGC_UNITTEST_BUILD
-    if (runUnitTests) {
-        exitCode = runTests(stressUnitTests, unitTestOptions);
-    } else
+        exitCode = QGCUnitTest::runTests(args.stressUnitTests, args.unitTests);
 #endif
-    {
-        #ifdef Q_OS_ANDROID
-            AndroidInterface::checkStoragePermissions();
-        #endif
-
-        if (!simpleBootTest) {
-            exitCode = app.exec();
-        }
+    } else if (!args.simpleBootTest) {
+        exitCode = app.exec();
     }
 
     app.shutdown();
 
     qDebug() << "Exiting main";
-
     return exitCode;
 }
diff --git a/test/ADSB/ADSB_Simulator.py b/test/ADSB/ADSB_Simulator.py
index 88a6b9cd20c5..ddf205c182cc 100644
--- a/test/ADSB/ADSB_Simulator.py
+++ b/test/ADSB/ADSB_Simulator.py
@@ -1,9 +1,9 @@
 import socket
 import threading
 import numpy as np
-import datetime
 import time
 
+
 class Aircraft:
     def __init__(self):
         self.icao_address = self.generate_icao_address()
@@ -12,22 +12,28 @@ def __init__(self):
         self.lat = np.random.uniform(34.8, 41.8)  # Latitude range for Greece
         self.lon = np.random.uniform(19.8, 29.6)  # Longitude range for Greece
         self.altitude = np.random.randint(0, 40000)
-        self.velocity = np.random.randint(50, 600)  
+        self.velocity = np.random.randint(50, 600)
         self.heading = np.random.randint(0, 360)
-        self.verticalRate = np.random.randint(-3000, 3000)  # Vertical rate in feet per minute
+        self.verticalRate = np.random.randint(
+            -3000, 3000
+        )  # Vertical rate in feet per minute
         # Generate a valid squawk code as a four-digit octal number ranging from 0000 to 7777.
         # Squawk codes are assigned by ATC and represent a specific aircraft's transponder setting.
-        # We use `np.random.randint(0, 4096)` to generate values from 0 to 4095 (decimal), 
+        # We use `np.random.randint(0, 4096)` to generate values from 0 to 4095 (decimal),
         # and then format it as an octal string with `{value:04o}` to ensure the correct 4-digit format.
         self.squawk = f"{np.random.randint(0, 4096):04o}"
 
     def generate_icao_address(self):
         # Generate a random ICAO address in the format of 6 hexadecimal digits
-        return '{:06X}'.format(np.random.randint(0, 0x1000000))  # Generates a number from 0 to 16777215
+        return "{:06X}".format(
+            np.random.randint(0, 0x1000000)
+        )  # Generates a number from 0 to 16777215
 
     def update(self):
         # Update position to move in a more linear direction
-        distance_movement = np.random.uniform(0.05, 0.15)  # Small constant step for smooth movement
+        distance_movement = np.random.uniform(
+            0.05, 0.15
+        )  # Small constant step for smooth movement
         self.lat += distance_movement * np.cos(np.radians(self.heading))
         self.lon += distance_movement * np.sin(np.radians(self.heading))
 
@@ -36,30 +42,33 @@ def update(self):
         self.lon = max(19.0, min(self.lon, 29.0))  # Longitude range in Greece
 
         # Altitude can change gradually (e.g., climbing or descending)
-        self.altitude += np.random.choice([-20, 20, 0])  # Climb or descend 20 feet or stay level
+        self.altitude += np.random.choice(
+            [-20, 20, 0]
+        )  # Climb or descend 20 feet or stay level
         self.altitude = max(0, self.altitude)  # Ensure altitude doesn't go below 0
 
         # Velocity can change with small gradual adjustments
         self.velocity += np.random.uniform(-2, 2)  # Smooth adjustments to speed
-        self.velocity = max(0, min(self.velocity, 600))  # Ensure velocity is within bounds
+        self.velocity = max(
+            0, min(self.velocity, 600)
+        )  # Ensure velocity is within bounds
 
         # Gradually update heading to simulate a more consistent direction
         heading_change = np.random.uniform(-1, 1)  # Slightly adjust heading
-        self.heading = (self.heading + heading_change) % 360  # Keep heading in 0-360 range
-
+        self.heading = (
+            self.heading + heading_change
+        ) % 360  # Keep heading in 0-360 range
 
     def generate_adsb_message(self):
-        timestamp = datetime.datetime.now(datetime.timezone.utc).isoformat()
-
         # Format message as "MSG,1,..."
         msg_type = np.random.choice([1, 3, 4, 5, 6, 8])
         msg_parts = [
             "MSG",  # Field 1: Message type
-            str(msg_type), # Field 2: Transmission Type
+            str(msg_type),  # Field 2: Transmission Type
             "",  # Index 2 | Field 3: Session ID
             "",  # Index 3 | Field 4: Aircraft ID
             self.icao_address,  # Field 5: HexIdent
-            "",  # Index 4 | Field 6: Flight ID   
+            "",  # Index 4 | Field 6: Flight ID
             "",  # Index 5 | Field 7: Date message generated
             "",  # Index 6 | Field 8: Time message generated
             "",  # Index 7 | Field 9: Date message logged
@@ -87,52 +96,55 @@ def generate_adsb_message(self):
             msg_parts[18] = "0"  # Field 19: Alert (0 means no alert)
             msg_parts[19] = "0"  # Field 20: Emergency (0 means no emergency)
             msg_parts[20] = "0"  # Field 21: SPI (0 means no SPI)
-            msg_parts[21] = "0"  # Field 22: IsOnGround (0 means the aircraft is airborne)
+            msg_parts[21] = (
+                "0"  # Field 22: IsOnGround (0 means the aircraft is airborne)
+            )
         if msg_type == 4:
             msg_parts[12] = str(int(self.velocity))  # GroundSpeed as an integer
-            msg_parts[13] = str(int(self.heading))   # Track (Heading) as an integer
+            msg_parts[13] = str(int(self.heading))  # Track (Heading) as an integer
             msg_parts[16] = str(self.verticalRate)
-            msg_parts[18] = "0"  
-            msg_parts[19] = "0"  
-            msg_parts[20] = "0"  
+            msg_parts[18] = "0"
+            msg_parts[19] = "0"
+            msg_parts[20] = "0"
             msg_parts[21] = "0"
         if msg_type == 5:
-            msg_parts[11] = str(self.altitude)  
-            msg_parts[18] = "0"  
-            msg_parts[19] = "0"  
-            msg_parts[20] = "0"  
+            msg_parts[11] = str(self.altitude)
+            msg_parts[18] = "0"
+            msg_parts[19] = "0"
+            msg_parts[20] = "0"
             msg_parts[21] = "0"
         if msg_type == 6:
             msg_parts[17] = str(self.squawk)
-            msg_parts[18] = "0"  
-            msg_parts[19] = "0"  
-            msg_parts[20] = "0"  
+            msg_parts[18] = "0"
+            msg_parts[19] = "0"
+            msg_parts[20] = "0"
             msg_parts[21] = "0"
         if msg_type == 8:
             msg_parts[21] = "0"
-                 
 
         # Join the message parts correctly
-        message = ','.join(msg_parts)
+        message = ",".join(msg_parts)
         return message
 
+
 def handle_client(client_socket, aircrafts):
     try:
         while True:
             # Update aircraft positions before generating messages
             for aircraft in aircrafts:
                 aircraft.update()
-                
+
             messages = [aircraft.generate_adsb_message() for aircraft in aircrafts]
             for message in messages:
-                client_socket.sendall(message.encode('utf-8') + b'\n')
+                client_socket.sendall(message.encode("utf-8") + b"\n")
             time.sleep(1)  # Simulate a delay between message batches
     except (ConnectionResetError, BrokenPipeError):
         print("Client disconnected.")
     finally:
         client_socket.close()
 
-def start_server(host='0.0.0.0', port=30003):
+
+def start_server(host="0.0.0.0", port=30003):
     server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     server_socket.bind((host, port))
     server_socket.listen(5)
@@ -144,8 +156,11 @@ def start_server(host='0.0.0.0', port=30003):
     while True:
         client_socket, addr = server_socket.accept()
         print(f"Accepted connection from {addr}")
-        client_handler = threading.Thread(target=handle_client, args=(client_socket, aircrafts))
+        client_handler = threading.Thread(
+            target=handle_client, args=(client_socket, aircrafts)
+        )
         client_handler.start()
 
+
 if __name__ == "__main__":
     start_server()
diff --git a/test/ADSB/CMakeLists.txt b/test/ADSB/CMakeLists.txt
index 622e864d86f2..cd4fe7b4c623 100644
--- a/test/ADSB/CMakeLists.txt
+++ b/test/ADSB/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# ADSB Unit Tests
+# Tests for ADS-B traffic detection and collision avoidance
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ADSBTest.cc
@@ -6,6 +11,7 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# TODO: Enable ADSB simulator test resources
 # qt_add_resources(${CMAKE_PROJECT_NAME} "ADSBTest_res"
 #     PREFIX "/unittest"
 #     FILES
diff --git a/test/AnalyzeView/CMakeLists.txt b/test/AnalyzeView/CMakeLists.txt
index 1d822e5039ca..9698fe070830 100644
--- a/test/AnalyzeView/CMakeLists.txt
+++ b/test/AnalyzeView/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Analyze View Unit Tests
+# Tests for log analysis, EXIF parsing, and telemetry visualization
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ExifParserTest.cc
@@ -16,7 +21,10 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-# https://github.com/ianare/exif-samples
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
+# EXIF test samples from https://github.com/ianare/exif-samples
 qt_add_resources(${CMAKE_PROJECT_NAME} "AnalyzeViewTest_res"
     PREFIX "/unittest"
     FILES
diff --git a/test/AnalyzeView/MavlinkLogTest.cc b/test/AnalyzeView/MavlinkLogTest.cc
index bf49ea3ff2b2..cccac4679e8e 100644
--- a/test/AnalyzeView/MavlinkLogTest.cc
+++ b/test/AnalyzeView/MavlinkLogTest.cc
@@ -29,13 +29,13 @@ const char* MavlinkLogTest::_saveLogFilename = "qgroundcontrol.mavlink.ut";
 
 MavlinkLogTest::MavlinkLogTest(void)
 {
-    
+
 }
 
 void MavlinkLogTest::init(void)
 {
     UnitTest::init();
-    
+
     // Make sure temp directory is clear of mavlink logs
     QDir tmpDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
     QStringList logFiles(tmpDir.entryList(QStringList(QString("*.%1").arg(_logFileExtension)), QDir::Files));
@@ -52,14 +52,14 @@ void MavlinkLogTest::cleanup(void)
     QDir tmpDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
     QStringList logFiles(tmpDir.entryList(QStringList(QString("*.%1").arg(_logFileExtension)), QDir::Files));
     QCOMPARE(logFiles.count(), 0);
-    
+
     UnitTest::cleanup();
 }
 
 void MavlinkLogTest::_createTempLogFile(bool zeroLength)
 {
     QGCTemporaryFile tempLogFile(QString("%1.%2").arg(_tempLogFileTemplate).arg(_logFileExtension));
-    
+
     tempLogFile.open();
     if (!zeroLength) {
         tempLogFile.write("foo");
@@ -82,15 +82,15 @@ void MavlinkLogTest::_bootLogDetectionSave_test(void)
 {
     // Create a fake mavlink log
     _createTempLogFile(false);
-    
+
     // We should get a message box, followed by a getSaveFileName dialog.
     QDir logSaveDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
-    
+
     // Kick the protocol to check for lost log files and wait for signals to move through
     connect(this, &MavlinkLogTest::checkForLostLogFiles, MAVLinkProtocol::instance(), &MAVLinkProtocol::checkForLostLogFiles);
     emit checkForLostLogFiles();
     QTest::qWait(1000);
-    
+
     // Make sure the file is there and delete it
     QCOMPARE(logSaveDir.remove(_saveLogFilename), true);
 }
@@ -99,12 +99,12 @@ void MavlinkLogTest::_bootLogDetectionZeroLength_test(void)
 {
     // Create a fake empty mavlink log
     _createTempLogFile(true);
-    
+
     // Kick the protocol to check for lost log files and wait for signals to move through
     connect(this, &MavlinkLogTest::checkForLostLogFiles, MAVLinkProtocol::instance(), &MAVLinkProtocol::checkForLostLogFiles);
     emit checkForLostLogFiles();
     QTest::qWait(1000);
-    
+
     // Zero length log files should not generate any additional UI pop-ups. It should just be deleted silently.
 }
 
@@ -113,15 +113,15 @@ void MavlinkLogTest::_connectLogWorker(bool arm)
     _connectMockLink();
 
     QDir logSaveDir;
-    
+
     if (arm) {
         MultiVehicleManager::instance()->activeVehicle()->setArmedShowError(true);
         QTest::qWait(500); // Wait long enough for heartbeat to come through
-        
+
         // On Disconnect: We should get a getSaveFileName dialog.
         logSaveDir.setPath(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
     }
-    
+
     _disconnectMockLink();
 
     if (arm) {
@@ -143,7 +143,7 @@ void MavlinkLogTest::_connectLogArm_test(void)
 void MavlinkLogTest::_deleteTempLogFiles_test(void)
 {
     // Verify that the MAVLinkProtocol::deleteTempLogFiles api works correctly
-    
+
     _createTempLogFile(false);
     MAVLinkProtocol::deleteTempLogFiles();
     QDir tmpDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
diff --git a/test/AnalyzeView/MavlinkLogTest.h b/test/AnalyzeView/MavlinkLogTest.h
index ceb097de0975..178f1b482d79 100644
--- a/test/AnalyzeView/MavlinkLogTest.h
+++ b/test/AnalyzeView/MavlinkLogTest.h
@@ -20,30 +20,29 @@
 class MavlinkLogTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     MavlinkLogTest(void);
-    
+
 private slots:
     void init(void);
     void cleanup(void);
-    
+
     void _bootLogDetectionCancel_test(void);
     void _bootLogDetectionSave_test(void);
     void _bootLogDetectionZeroLength_test(void);
     void _connectLogNoArm_test(void);
     void _connectLogArm_test(void);
     void _deleteTempLogFiles_test(void);
-    
+
 signals:
     void checkForLostLogFiles(void);
-    
+
 private:
     void _createTempLogFile(bool zeroLength);
     void _connectLogWorker(bool arm);
-    
+
     static const char* _tempLogFileTemplate;    ///< Template for temporary log file
     static const char* _logFileExtension;       ///< Extension for log files
     static const char* _saveLogFilename;        ///< Filename to save log files to
 };
-
diff --git a/test/AutoPilotPlugins/CMakeLists.txt b/test/AutoPilotPlugins/CMakeLists.txt
index 72f4d3eafda0..3b47eea698c7 100644
--- a/test/AutoPilotPlugins/CMakeLists.txt
+++ b/test/AutoPilotPlugins/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# AutoPilot Plugins Unit Tests
+# Tests for autopilot configuration and radio calibration
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         RadioConfigTest.cc
diff --git a/test/AutoPilotPlugins/RadioConfigTest.cc b/test/AutoPilotPlugins/RadioConfigTest.cc
index 54baf657c394..c46357a9fd13 100644
--- a/test/AutoPilotPlugins/RadioConfigTest.cc
+++ b/test/AutoPilotPlugins/RadioConfigTest.cc
@@ -188,20 +188,20 @@ RadioConfigTest::RadioConfigTest(void) :
     _calWidget(NULL),
     _controller(NULL)
 {
-    
+
 }
 
 void RadioConfigTest::_init(MAV_AUTOPILOT firmwareType)
 {
     _connectMockLink(firmwareType);
-    
+
     _autopilot = MultiVehicleManager::instance()->activeVehicle()->autopilotPlugin();
     Q_ASSERT(_autopilot);
 
     // This test is so quick that it tends to finish before the mission item protocol completes. This causes an error to pop up.
     // So we wait a little to let mission items sync.
     QTest::qWait(500);
-    
+
     // This will instatiate the widget with an active uas with ready parameters
     _calWidget = new QGCQmlWidgetHolder(QString(), NULL);
     _calWidget->resize(600, 600);
@@ -229,18 +229,18 @@ void RadioConfigTest::_init(MAV_AUTOPILOT firmwareType)
 
     _calWidget->setContextPropertyObject("vehicleComponent", vehicleComponent);
     _calWidget->setSource(QUrl::fromUserInput("qrc:/qml/QGroundControl/AutoPilotPlugins/Common/RadioComponent.qml"));
-    
+
     // Nasty hack to get to controller
     _controller = RadioComponentController::_unitTestController;
     Q_ASSERT(_controller);
 
     _controller->_setUnitTestMode();
-    
+
     _rgSignals[0] = SIGNAL(nextButtonMessageBoxDisplayed());
     _multiSpyNextButtonMessageBox = new MultiSignalSpy();
     Q_CHECK_PTR(_multiSpyNextButtonMessageBox);
     QCOMPARE(_multiSpyNextButtonMessageBox->init(_controller, _rgSignals, 1), true);
-    
+
     QCOMPARE(_controller->_currentStep, -1);
 }
 
@@ -248,7 +248,7 @@ void RadioConfigTest::cleanup(void)
 {
     Q_ASSERT(_calWidget);
     delete _calWidget;
-    
+
     UnitTest::cleanup();
 }
 
@@ -257,7 +257,7 @@ void RadioConfigTest::_beginCalibration(void)
     CHK_BUTTONS(nextButtonMask | cancelButtonMask);
 
     // We should already have enough channels to proceed with calibration. Click next to start the process.
-    
+
     _controller->nextButtonClicked();
     QCOMPARE(_controller->_currentStep, 1);
     CHK_BUTTONS(cancelButtonMask);
@@ -269,13 +269,13 @@ void RadioConfigTest::_stickMoveWaitForSettle(int channel, int value)
 
     // Move the stick, this will initialized the settle checker
     _mockLink->emitRemoteControlChannelRawChanged(channel, value);
-    
+
     // Emit the signal again to start the settle timer
     _mockLink->emitRemoteControlChannelRawChanged(channel, value);
-    
+
     // Wait long enough for the settle timer to expire
     QTest::qWait(RadioComponentController::_stickDetectSettleMSecs * 1.5);
-    
+
     // Emit the signal again so that we detect stick settle
     _mockLink->emitRemoteControlChannelRawChanged(channel, value);
 }
@@ -284,33 +284,33 @@ void RadioConfigTest::_stickMoveAutoStep(const char* functionStr, enum RadioComp
 {
     Q_UNUSED(functionStr);
     qCDebug(RadioConfigTestLog) << "_stickMoveAutoStep function:direction:reversed:identifyStep" << functionStr << function << direction << identifyStep;
-    
+
     CHK_BUTTONS(cancelButtonMask);
-    
+
     int channel = _rgFunctionChannelMap[function];
     int saveStep = _controller->_currentStep;
-    
+
     bool reversed = _channelSettings()[channel].reversed;
-    
+
     if (!identifyStep && direction != moveToCenter) {
         // We have already identified the function channel mapping. Move other channels around to make sure there is no impact.
-        
+
         int otherChannel = channel + 1;
         if (otherChannel >= _chanMax()) {
             otherChannel = 0;
         }
-        
+
         _stickMoveWaitForSettle(otherChannel, _testMinValue);
         QCOMPARE(_controller->_currentStep, saveStep);
         CHK_BUTTONS(cancelButtonMask);
-        
+
         _stickMoveWaitForSettle(otherChannel, RadioComponentController::_rcCalPWMCenterPoint);
         QCOMPARE(_controller->_currentStep, saveStep);
         CHK_BUTTONS(cancelButtonMask);
     }
-    
+
     // Move channel to specified position to trigger next step
-    
+
     int value;
     if (direction == moveToMin) {
         value = reversed ? _testMaxValue : _testMinValue;
@@ -321,7 +321,7 @@ void RadioConfigTest::_stickMoveAutoStep(const char* functionStr, enum RadioComp
     } else {
         Q_ASSERT(false);
     }
-    
+
     _stickMoveWaitForSettle(channel, value);
     QCOMPARE(_controller->_currentStep, saveStep + 1);
 }
@@ -329,17 +329,17 @@ void RadioConfigTest::_stickMoveAutoStep(const char* functionStr, enum RadioComp
 void RadioConfigTest::_switchMinMaxStep(void)
 {
     CHK_BUTTONS(nextButtonMask | cancelButtonMask);
-    
+
     // Try setting a min/max value that is below the threshold to make sure min/max doesn't go valid
     _mockLink->emitRemoteControlChannelRawChanged(0, (float)(RadioComponentController::_rcCalPWMValidMinValue + 1));
     _mockLink->emitRemoteControlChannelRawChanged(0, (float)(RadioComponentController::_rcCalPWMValidMaxValue - 1));
-    
+
     // Send min/max values switch channels
     for (int chan=0; chan<_chanMax(); chan++) {
         _mockLink->emitRemoteControlChannelRawChanged(chan, _channelSettings()[chan].rcMin);
         _mockLink->emitRemoteControlChannelRawChanged(chan, _channelSettings()[chan].rcMax);
     }
-    
+
     _channelHomePosition();
 
     int saveStep = _controller->_currentStep;
@@ -357,21 +357,21 @@ void RadioConfigTest::_fullCalibrationWorker(MAV_AUTOPILOT firmwareType)
 
     /// _rgFunctionChannelMap maps from function index to channel index. For channels which are not part of
     /// rc cal set the mapping the the previous mapping.
-    
+
     for (int function=0; function<RadioComponentController::rcCalFunctionMax; function++) {
         bool found = false;
-        
+
         // If we are mapping this function during cal set it into _rgFunctionChannelMap
         for (int channel=0; channel<_chanMax(); channel++) {
             if (_channelSettings()[channel].function == function) {
-                
+
                 _rgFunctionChannelMap[function] = channel;
                 found = true;
-                
+
                 break;
             }
         }
-        
+
         // If we aren't mapping this function during calibration, set it to the previous setting
         if (!found) {
             const char* paramName = _functionInfo()[function].parameterName;
@@ -388,7 +388,7 @@ void RadioConfigTest::_fullCalibrationWorker(MAV_AUTOPILOT firmwareType)
             }
         }
     }
-    
+
     _channelHomePosition();
     _controller->nextButtonClicked();
     _beginCalibration();
@@ -426,7 +426,7 @@ void RadioConfigTest::_channelHomePosition(void)
     for (int i=0; i<_chanMax(); i++) {
         _mockLink->emitRemoteControlChannelRawChanged(i, (float)RadioComponentController::_rcCalPWMCenterPoint);
     }
-    
+
     // Throttle to min - 1 (throttle is not reversed). We do this so that the trim value is below the min value. This should end up
     // being validated and raised to min value. If not, something is wrong with RC Cal code.
     _mockLink->emitRemoteControlChannelRawChanged(_rgFunctionChannelMap[RadioComponentController::rcCalFunctionThrottle], _testMinValue - 1);
@@ -444,14 +444,14 @@ void RadioConfigTest::_validateParameters(void)
     // Check mapping for all fuctions
     for (int chanFunction=0; chanFunction<RadioComponentController::rcCalFunctionMax; chanFunction++) {
         int chanIndex = _rgFunctionChannelMap[chanFunction];
-        
+
         int expectedParameterValue;
         if (chanIndex == -1) {
             expectedParameterValue = 0;  // 0 signals no mapping
         } else {
             expectedParameterValue = chanIndex + 1; // 1-based parameter value
         }
-        
+
         const char* paramName = _functionInfo()[chanFunction].parameterName;
         if (paramName) {
             qCDebug(RadioConfigTestLog) << "Validate" << chanFunction << _vehicle->parameterManager()->getParameter(ParameterManager::defaultComponentId, paramName)->rawValue().toInt();
@@ -463,7 +463,7 @@ void RadioConfigTest::_validateParameters(void)
     for (int chan = 0; chan<_chanMax(); chan++) {
         int oneBasedChannel = chan + 1;
         bool convertOk;
-        
+
         // Required channels have min/max set on them. Remaining channels are left to default.
         int rcMinExpected = _channelSettingsValidate()[chan].rcMin;
         int rcMaxExpected = _channelSettingsValidate()[chan].rcMax;
@@ -485,7 +485,7 @@ void RadioConfigTest::_validateParameters(void)
         } else {
             rcReversedActual = _vehicle->parameterManager()->getParameter(ParameterManager::defaultComponentId, revTplAPM.arg(oneBasedChannel))->rawValue().toBool();
         }
-        
+
         qCDebug(RadioConfigTestLog) << "_validateParameters expected channel:min:max:trim:rev" << chan << rcMinExpected << rcMaxExpected << rcTrimExpected << rcReversedExpected;
         qCDebug(RadioConfigTestLog) << "_validateParameters actual channel:min:max:trim:rev" << chan << rcMinActual << rcMaxActual << rcTrimActual << rcReversedActual;
 
@@ -494,7 +494,7 @@ void RadioConfigTest::_validateParameters(void)
         QCOMPARE(rcTrimExpected, rcTrimActual);
         QCOMPARE(rcReversedExpected, rcReversedActual);
     }
-    
+
     // Check mapping for all fuctions
     for (int chanFunction=0; chanFunction<RadioComponentController::rcCalFunctionMax; chanFunction++) {
         int expectedValue;
diff --git a/test/AutoPilotPlugins/RadioConfigTest.h b/test/AutoPilotPlugins/RadioConfigTest.h
index a756d23cc2b7..0c2823c96e98 100644
--- a/test/AutoPilotPlugins/RadioConfigTest.h
+++ b/test/AutoPilotPlugins/RadioConfigTest.h
@@ -29,13 +29,13 @@ Q_DECLARE_LOGGING_CATEGORY(RadioConfigTestLog)
 class RadioConfigTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     RadioConfigTest(void);
-    
+
 private slots:
     void cleanup(void);
-    
+
     void _fullCalibration_px4_test(void);
     void _fullCalibration_apm_test(void);
 
@@ -46,13 +46,13 @@ private slots:
         testModePrerequisite,   ///< Setup prequisites for subsequent calibration state
         testModeFullSequence,   ///< Run as full calibration sequence
     };
-    
+
     enum MoveToDirection {
         moveToMax,
         moveToMin,
         moveToCenter,
     };
-    
+
     enum {
         validateMinMaxMask =    1 << 0,
         validateTrimsMask =     1 << 1,
@@ -82,37 +82,36 @@ private slots:
     const struct ChannelSettings* _channelSettingsValidate(void) const;
     void _fullCalibrationWorker(MAV_AUTOPILOT firmwareType);
     int _chanMax(void) const;
-    
+
     void _validateParameters(void);
-    
+
     AutoPilotPlugin*    _autopilot;
-    
+
     QGCQmlWidgetHolder* _calWidget;
-    
+
     enum {
         nextButtonMask =        1 << 0,
         cancelButtonMask =      1 << 1,
         skipButtonMask =        1 << 2
     };
-    
+
     const char*         _rgSignals[1];
     MultiSignalSpy*     _multiSpyNextButtonMessageBox;
-    
+
     // When settings values into min/max/trim we set them slightly different than the defaults so that
     // we can distinguish between the two values.
     static const int _testMinValue;
     static const int _testMaxValue;
     static const int _testCenterValue;
-    
+
     static const int _stickSettleWait;
-	
+
     static const struct ChannelSettings _rgChannelSettingsPX4[RadioComponentController::_chanMaxPX4];
     static const struct ChannelSettings _rgChannelSettingsAPM[RadioComponentController::_chanMaxAPM];
     static const struct ChannelSettings _rgChannelSettingsValidatePX4[RadioComponentController::_chanMaxPX4];
     static const struct ChannelSettings _rgChannelSettingsValidateAPM[RadioComponentController::_chanMaxAPM];
 
 	int _rgFunctionChannelMap[RadioComponentController::rcCalFunctionMax];
-    
+
     RadioComponentController*   _controller;
 };
-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b8463611974e..a91741e9f9dd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,17 +1,28 @@
+# ============================================================================
+# QGroundControl Unit Tests
+# ============================================================================
+
 if(NOT QGC_BUILD_TESTING)
     return()
 endif()
 
+# TODO: Android test utilities
 # if(ANDROID)
-    # include(AndroidTestUtilities)
+#     include(AndroidTestUtilities)
 # endif()
 
+# ----------------------------------------------------------------------------
+# Test Framework Sources
+# ----------------------------------------------------------------------------
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         UnitTestList.cc
         UnitTestList.h
 )
 
+# ----------------------------------------------------------------------------
+# Test Dependencies
+# ----------------------------------------------------------------------------
 find_package(Qt6 REQUIRED COMPONENTS Test)
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Test)
 
@@ -19,12 +30,21 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_
 
 target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE QGC_UNITTEST_BUILD)
 
+# ----------------------------------------------------------------------------
+# CTest Integration
+# ----------------------------------------------------------------------------
 include(CTest)
+
+# Custom target for running all tests
 add_custom_target(check
-    COMMAND ctest --output-on-failure .
+    COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure .
     USES_TERMINAL
+    COMMENT "Running all QGroundControl unit tests"
 )
 
+# ----------------------------------------------------------------------------
+# Helper Function for Adding Tests
+# ----------------------------------------------------------------------------
 function(add_qgc_test test_name)
     add_test(
         NAME ${test_name}
@@ -33,6 +53,10 @@ function(add_qgc_test test_name)
     add_dependencies(check ${PROJECT_NAME})
 endfunction()
 
+# ============================================================================
+# Test Subdirectories & Registration
+# ============================================================================
+
 add_subdirectory(ADSB)
 add_qgc_test(ADSBTest)
 
diff --git a/test/Camera/CMakeLists.txt b/test/Camera/CMakeLists.txt
index 25433ee6509d..1ada55b9d0e7 100644
--- a/test/Camera/CMakeLists.txt
+++ b/test/Camera/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Camera Unit Tests
+# Tests for camera management and control
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         QGCCameraManagerTest.cc
diff --git a/test/Camera/QGCCameraManagerTest.cc b/test/Camera/QGCCameraManagerTest.cc
index c856e82f7b54..2c21e65c2b3c 100644
--- a/test/Camera/QGCCameraManagerTest.cc
+++ b/test/Camera/QGCCameraManagerTest.cc
@@ -9,12 +9,13 @@
 
 #include "QGCCameraManagerTest.h"
 #include "QGCCameraManager.h"
+#include "CameraMetaData.h"
 
 #include <QtTest/QTest>
 
 void QGCCameraManagerTest::_testCameraList()
 {
-    const QList<CameraMetaData*> cameraList = QGCCameraManager::_parseCameraMetaData(QStringLiteral(":/json/CameraMetaData.json"));
+    const QList<CameraMetaData*> cameraList = CameraMetaData::parseCameraMetaData();
 
     QVERIFY(!cameraList.isEmpty());
 
diff --git a/test/Comms/CMakeLists.txt b/test/Comms/CMakeLists.txt
index 237420f33bf3..4c1966c15517 100644
--- a/test/Comms/CMakeLists.txt
+++ b/test/Comms/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Communications Unit Tests
+# Tests for serial port detection and communication links
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         QGCSerialPortInfoTest.cc
diff --git a/test/FactSystem/CMakeLists.txt b/test/FactSystem/CMakeLists.txt
index ee03d31d89b2..0e19834aa929 100644
--- a/test/FactSystem/CMakeLists.txt
+++ b/test/FactSystem/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Fact System Unit Tests
+# Tests for parameter management and fact metadata
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         FactSystemTestBase.cc
@@ -12,14 +17,18 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} "FactSystemTest_res"
     PREFIX "/unittest"
     FILES
         FactSystemTest.qml
 )
 
+# TODO: Enable QML module for fact system tests
 # qt_add_library(FactSystemTestModule STATIC)
-
+#
 # qt_add_qml_module(FactSystemTestModule
 #     URI QGroundControl.Test.FactSystem
 #     VERSION 1.0
@@ -28,5 +37,5 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "FactSystemTest_res"
 #         FactSystemTest.qml
 #     NO_PLUGIN
 # )
-
+#
 # target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE FactSystemTestModule)
diff --git a/test/FactSystem/FactSystemTestBase.cc b/test/FactSystem/FactSystemTestBase.cc
index 0e0217404d5f..aafb95e97d47 100644
--- a/test/FactSystem/FactSystemTestBase.cc
+++ b/test/FactSystem/FactSystemTestBase.cc
@@ -114,4 +114,3 @@ void FactSystemTestBase::_qmlUpdate_test(void)
     delete widget;
 #endif
 }
-
diff --git a/test/FactSystem/FactSystemTestBase.h b/test/FactSystem/FactSystemTestBase.h
index bacfeee6d0c8..024361c56bc4 100644
--- a/test/FactSystem/FactSystemTestBase.h
+++ b/test/FactSystem/FactSystemTestBase.h
@@ -17,19 +17,18 @@ class AutoPilotPlugin;
 class FactSystemTestBase : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     FactSystemTestBase(void);
-    
+
 protected:
     void _init(MAV_AUTOPILOT autopilot);
     void _cleanup(void);
-    
+
     void _parameter_default_component_id_test(void);
     void _parameter_specific_component_id_test(void);
     void _qml_test(void);
     void _qmlUpdate_test(void);
-    
+
     AutoPilotPlugin*                _plugin;
 };
-
diff --git a/test/FactSystem/FactSystemTestGeneric.cc b/test/FactSystem/FactSystemTestGeneric.cc
index 11a4def82110..18e8bb34c16a 100644
--- a/test/FactSystem/FactSystemTestGeneric.cc
+++ b/test/FactSystem/FactSystemTestGeneric.cc
@@ -17,7 +17,7 @@
 /// FactSystem Unit Test for PX4 autpilot
 FactSystemTestGeneric::FactSystemTestGeneric(void)
 {
-    
+
 }
 
 void FactSystemTestGeneric::init(void)
diff --git a/test/FactSystem/FactSystemTestGeneric.h b/test/FactSystem/FactSystemTestGeneric.h
index 2a172b5788d8..36acc7fe79d5 100644
--- a/test/FactSystem/FactSystemTestGeneric.h
+++ b/test/FactSystem/FactSystemTestGeneric.h
@@ -15,14 +15,14 @@
 class FactSystemTestGeneric : public FactSystemTestBase
 {
     Q_OBJECT
-    
+
 public:
     FactSystemTestGeneric(void);
-    
+
 private slots:
     void init(void);
     void cleanup(void) { _cleanup(); }
-    
+
     void parameter_default_component_id_test(void) { _parameter_default_component_id_test(); }
     void parameter_specific_component_id_test(void) { _parameter_specific_component_id_test(); }
     void qml_test(void) { _qml_test(); }
diff --git a/test/FactSystem/FactSystemTestPX4.cc b/test/FactSystem/FactSystemTestPX4.cc
index 98f1ea820c23..5ee8d8c6b553 100644
--- a/test/FactSystem/FactSystemTestPX4.cc
+++ b/test/FactSystem/FactSystemTestPX4.cc
@@ -17,7 +17,7 @@
 /// FactSystem Unit Test for PX4 autpilot
 FactSystemTestPX4::FactSystemTestPX4(void)
 {
-    
+
 }
 
 void FactSystemTestPX4::init(void)
diff --git a/test/FactSystem/FactSystemTestPX4.h b/test/FactSystem/FactSystemTestPX4.h
index b5bd45e66885..9833a3e4265b 100644
--- a/test/FactSystem/FactSystemTestPX4.h
+++ b/test/FactSystem/FactSystemTestPX4.h
@@ -15,14 +15,14 @@
 class FactSystemTestPX4 : public FactSystemTestBase
 {
     Q_OBJECT
-    
+
 public:
     FactSystemTestPX4(void);
-    
+
 private slots:
     void init(void);
     void cleanup(void) { _cleanup(); }
-    
+
     void parameter_default_component_id_test(void) { _parameter_default_component_id_test(); }
     void parameter_specific_component_id_test(void) { _parameter_specific_component_id_test(); }
     void qml_test(void) { _qml_test(); }
diff --git a/test/FactSystem/ParameterManagerTest.cc b/test/FactSystem/ParameterManagerTest.cc
index b99ba9e8492f..2f5752793d65 100644
--- a/test/FactSystem/ParameterManagerTest.cc
+++ b/test/FactSystem/ParameterManagerTest.cc
@@ -13,10 +13,15 @@
 #include "Vehicle.h"
 #include "ParameterManager.h"
 #include "MockLinkFTP.h"
+#include "QGC.h"
 
+#include <QtCore/QElapsedTimer>
 #include <QtTest/QTest>
 #include <QtTest/QSignalSpy>
 
+#include <cmath>
+#include <limits>
+
 /// Test failure modes which should still lead to param load success
 void ParameterManagerTest::_noFailureWorker(MockConfiguration::FailureMode_t failureMode)
 {
@@ -131,6 +136,208 @@ void ParameterManagerTest::_requestListMissingParamFail(void)
     QCOMPARE(vehicle->parameterManager()->missingParameters(), true);
 }
 
+void ParameterManagerTest::_paramWriteNoAckRetry(void)
+{
+    _setParamWithFailureMode(MockLink::FailParamSetFirstAttemptNoAck, true /* expectSuccess */);
+}
+
+void ParameterManagerTest::_paramWriteNoAckPermanent(void)
+{
+    _setParamWithFailureMode(MockLink::FailParamSetNoAck, false /* expectSuccess */);
+}
+
+void ParameterManagerTest::_paramReadFirstAttemptNoResponseRetry(void)
+{
+    Q_ASSERT(!_mockLink);
+
+    _connectMockLink();
+    QVERIFY(_mockLink);
+    QVERIFY(_vehicle);
+
+    ParameterManager *const paramManager = _vehicle->parameterManager();
+    QVERIFY(paramManager);
+
+    _mockLink->setParamRequestReadFailureMode(MockLink::FailParamRequestReadFirstAttemptNoResponse);
+
+    Fact *const fact = paramManager->getParameter(MAV_COMP_ID_AUTOPILOT1, QStringLiteral("BAT1_V_CHARGED"));
+    QVERIFY(fact);
+
+    QSignalSpy vehicleUpdatedSpy(fact, &Fact::vehicleUpdated);
+    QSignalSpy paramReadSuccessSpy(paramManager, &ParameterManager::_paramRequestReadSuccess);
+
+    QVERIFY(vehicleUpdatedSpy.isValid());
+    QVERIFY(paramReadSuccessSpy.isValid());
+
+    paramManager->refreshParameter(MAV_COMP_ID_AUTOPILOT1, fact->name());
+
+    const int maxWaitTimeMs = ParameterManager::kWaitForParamValueAckMs * (ParameterManager::kParamRequestReadRetryCount + 1) + 500;
+
+    QVERIFY(paramReadSuccessSpy.wait(maxWaitTimeMs));
+    QCOMPARE(paramReadSuccessSpy.count(), 1);
+
+    QCOMPARE(vehicleUpdatedSpy.count(), 1);
+
+    _disconnectMockLink();
+}
+
+void ParameterManagerTest::_paramReadNoResponse(void)
+{
+    Q_ASSERT(!_mockLink);
+
+    _connectMockLink();
+    QVERIFY(_mockLink);
+    QVERIFY(_vehicle);
+
+    ParameterManager *const paramManager = _vehicle->parameterManager();
+    QVERIFY(paramManager);
+
+    Fact *const fact = paramManager->getParameter(MAV_COMP_ID_AUTOPILOT1, QStringLiteral("BAT1_V_CHARGED"));
+    QVERIFY(fact);
+
+    QSignalSpy vehicleUpdatedSpy(fact, &Fact::vehicleUpdated);
+    QSignalSpy paramReadFailureSpy(paramManager, &ParameterManager::_paramRequestReadFailure);
+
+    QVERIFY(vehicleUpdatedSpy.isValid());
+    QVERIFY(paramReadFailureSpy.isValid());
+
+    _mockLink->setParamRequestReadFailureMode(MockLink::FailParamRequestReadNoResponse);
+
+    paramManager->refreshParameter(MAV_COMP_ID_AUTOPILOT1, fact->name());
+
+    const int maxWaitTimeMs = ParameterManager::kWaitForParamValueAckMs * (ParameterManager::kParamRequestReadRetryCount + 1) + 500;
+
+    QVERIFY(paramReadFailureSpy.wait(maxWaitTimeMs));
+    QCOMPARE(paramReadFailureSpy.count(), 1);
+
+    QCOMPARE(vehicleUpdatedSpy.count(), 0);
+
+    _disconnectMockLink();
+}
+
+void ParameterManagerTest::_setParamWithFailureMode(MockLink::ParamSetFailureMode_t failureMode, bool expectSuccess)
+{
+    Q_ASSERT(!_mockLink);
+
+    // Bring up a clean mock vehicle for each run
+    _connectMockLink();
+    QVERIFY(_mockLink);
+    QVERIFY(_vehicle);
+
+    _mockLink->setParamSetFailureMode(failureMode);
+
+    MultiVehicleManager* vehicleMgr = MultiVehicleManager::instance();
+    QVERIFY(vehicleMgr);
+    ParameterManager *const paramManager = _vehicle->parameterManager();
+    QVERIFY(paramManager);
+    QVERIFY(!_vehicle->parameterManager()->pendingWrites());
+
+    // Use a parameter that exists in the mock PX4 set and has floating point range
+    Fact *const fact = paramManager->getParameter(MAV_COMP_ID_AUTOPILOT1, QStringLiteral("BAT1_V_CHARGED"));
+    QVERIFY(fact);
+    QSignalSpy rawValueChangedSpy(fact, &Fact::rawValueChanged);
+
+    const QVariant originalValue = fact->rawValue();
+    const double originalDouble = originalValue.toDouble();
+
+    const FactMetaData *const metaData = fact->metaData();
+    const double minValue = (metaData && metaData->rawMin().isValid()) ? metaData->rawMin().toDouble() : -std::numeric_limits<double>::infinity();
+    const double maxValue = (metaData && metaData->rawMax().isValid()) ? metaData->rawMax().toDouble() : std::numeric_limits<double>::infinity();
+    const double step = 0.1;
+
+    auto adjustedValue = [&](double candidate) -> double {
+        if (candidate > maxValue) {
+            candidate = originalDouble - step;
+        }
+        if (candidate < minValue) {
+            candidate = originalDouble + step;
+        }
+        if (qFuzzyCompare(candidate + 1.0, originalDouble + 1.0)) {
+            candidate = originalDouble + (step * 2.0);
+        }
+        if (candidate > maxValue) {
+            candidate = originalDouble - (step * 2.0);
+        }
+        if (candidate < minValue) {
+            candidate = originalDouble;
+        }
+        return candidate;
+    };
+
+    const double newValueDouble = adjustedValue(originalDouble + step);
+    QVERIFY(!qFuzzyCompare(newValueDouble + 1.0, originalDouble + 1.0));
+    const QVariant newValue(newValueDouble);
+
+    QSignalSpy pendingSpy(paramManager, &ParameterManager::pendingWritesChanged);
+    QVERIFY(pendingSpy.isValid());
+    QSignalSpy paramSetSuccessSpy(paramManager, &ParameterManager::_paramSetSuccess);
+    QVERIFY(paramSetSuccessSpy.isValid());
+    QSignalSpy paramSetFailureSpy(paramManager, &ParameterManager::_paramSetFailure);
+    QVERIFY(paramSetFailureSpy.isValid());
+
+    fact->setRawValue(newValue);
+
+    // We should see pendingWrites go to true and then back to false
+
+    bool sawPendingTrue = false;
+    bool sawPendingFalse = false;
+    int processedCount = 0;
+    QElapsedTimer waitTimer;
+    waitTimer.start();
+
+    while ((!sawPendingTrue || !sawPendingFalse) && waitTimer.elapsed() < 20000) {
+        (void) pendingSpy.wait(500);
+        while (processedCount < pendingSpy.count()) {
+            const QList<QVariant> arguments = pendingSpy.at(processedCount++);
+            QCOMPARE(arguments.count(), 1);
+            const bool isPending = arguments.at(0).toBool();
+            if (isPending) {
+                sawPendingTrue = true;
+            } else {
+                sawPendingFalse = true;
+            }
+        }
+    }
+
+    QVERIFY2(sawPendingTrue, "Expected pendingWritesChanged(true) signal");
+    QVERIFY2(sawPendingFalse, "Expected pendingWritesChanged(false) signal");
+
+    // We should get two rawValueChanged signals if unsuccessful (one for the set, one for the refresh)
+    // We should get one rawValueChanged signal if successful (just the set)
+
+    bool rawValueChangedCountMatches = false;
+    rawValueChangedSpy.wait(ParameterManager::kWaitForParamValueAckMs * ParameterManager::kParamSetRetryCount + 500);
+    if (expectSuccess) {
+        QCOMPARE(rawValueChangedSpy.count(), 1);
+        QCOMPARE(paramSetSuccessSpy.count(), 1);
+        QCOMPARE(paramSetFailureSpy.count(), 0);
+    } else {
+        QVERIFY(rawValueChangedSpy.count() == 1 || rawValueChangedSpy.count() == 2);
+        QCOMPARE(paramSetSuccessSpy.count(), 0);
+        QCOMPARE(paramSetFailureSpy.count(), 1);
+    }
+
+    // The first signal is the change we made, so we start checking from there
+    QVERIFY(QGC::fuzzyCompare(rawValueChangedSpy[0][0].toDouble(), newValueDouble, 0.00001));
+
+    if (!expectSuccess) {
+        // If the write failed the second signal should be the value reverting to original
+        if (rawValueChangedSpy.count() == 1) {
+            // Wait a bit longer for the refresh to come in
+            rawValueChangedSpy.wait(1000);
+        }
+        QCOMPARE(rawValueChangedSpy.count(), 2);
+        QVERIFY(QGC::fuzzyCompare(rawValueChangedSpy[1][0].toDouble(), originalDouble, 0.00001));
+
+        // We should have also alerted the user of the failure
+        // Note that we can't easily check for the ShowAppMessageState usage here due to the
+        // complexity of the state machine and timing of the signals.
+    }
+
+    _mockLink->setParamSetFailureMode(MockLink::FailParamSetNone);
+
+    _disconnectMockLink();
+}
+
 #if 0
 void ParameterManagerTest::_FTPnoFailure()
 {
diff --git a/test/FactSystem/ParameterManagerTest.h b/test/FactSystem/ParameterManagerTest.h
index 1551ed959451..0e835240bd95 100644
--- a/test/FactSystem/ParameterManagerTest.h
+++ b/test/FactSystem/ParameterManagerTest.h
@@ -11,20 +11,26 @@
 
 #include "UnitTest.h"
 #include "MockConfiguration.h"
+#include "MockLink.h"
 
 class ParameterManagerTest : public UnitTest
 {
     Q_OBJECT
-    
+
 private slots:
     void _noFailure(void);
     void _requestListNoResponse(void);
     void _requestListMissingParamSuccess(void);
     void _requestListMissingParamFail(void);
+    void _paramWriteNoAckRetry(void);
+    void _paramWriteNoAckPermanent(void);
+    void _paramReadFirstAttemptNoResponseRetry(void);
+    void _paramReadNoResponse(void);
     // void _FTPnoFailure(void);
     // void _FTPChangeParam(void);
 
 
 private:
     void _noFailureWorker(MockConfiguration::FailureMode_t failureMode);
+    void _setParamWithFailureMode(MockLink::ParamSetFailureMode_t failureMode, bool expectSuccess);
 };
diff --git a/test/FollowMe/CMakeLists.txt b/test/FollowMe/CMakeLists.txt
index 5013adcf03c8..b3b89bd07687 100644
--- a/test/FollowMe/CMakeLists.txt
+++ b/test/FollowMe/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Follow Me Unit Tests
+# Tests for Follow Me mode and vehicle tracking
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         FollowMeTest.cc
diff --git a/test/GPS/CMakeLists.txt b/test/GPS/CMakeLists.txt
index 744d82c57fec..19b3fb5d9416 100644
--- a/test/GPS/CMakeLists.txt
+++ b/test/GPS/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# GPS Unit Tests
+# Tests for GPS/GNSS positioning and RTK corrections
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         GpsTest.cc
diff --git a/test/MAVLink/CMakeLists.txt b/test/MAVLink/CMakeLists.txt
index 06153b9d433f..1d2a52965d73 100644
--- a/test/MAVLink/CMakeLists.txt
+++ b/test/MAVLink/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# MAVLink Unit Tests
+# Tests for MAVLink protocol, status text handling, and message signing
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         StatusTextHandlerTest.cc
diff --git a/test/MissionManager/800Waypoints.waypoints.txt b/test/MissionManager/800Waypoints.waypoints.txt
index 72008df6b14b..eee5b6103774 100644
--- a/test/MissionManager/800Waypoints.waypoints.txt
+++ b/test/MissionManager/800Waypoints.waypoints.txt
@@ -1,830 +1,830 @@
-QGC WPL 110
-0	1	0	16	0	0	0	0	34.577822	-112.469101	584.380005	1
-1	0	3	22	20.000000	0.000000	0.000000	0.000000	0.000000	0.000000	30.000000	1
-2	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469587	-112.534801	90.000000	1
-3	0	3	206	21.059999	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
-4	0	3	16	0.000000	0.000000	0.000000	0.000000	34.462736	-112.535401	90.000000	1
-5	0	3	16	0.000000	0.000000	0.000000	0.000000	34.462833	-112.535104	90.000000	1
-6	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484993	-112.533163	90.000000	1
-7	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500399	-112.531524	90.000000	1
-8	0	3	16	0.000000	0.000000	0.000000	0.000000	34.462930	-112.534807	90.000000	1
-9	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463027	-112.534510	90.000000	1
-10	0	3	16	0.000000	0.000000	0.000000	0.000000	34.515805	-112.529884	90.000000	1
-11	0	3	16	0.000000	0.000000	0.000000	0.000000	34.531211	-112.528244	90.000000	1
-12	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463124	-112.534213	90.000000	1
-13	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463221	-112.533916	90.000000	1
-14	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546616	-112.526604	90.000000	1
-15	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562022	-112.524963	90.000000	1
-16	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463317	-112.533619	90.000000	1
-17	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463414	-112.533322	90.000000	1
-18	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577428	-112.523322	90.000000	1
-19	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592834	-112.521680	90.000000	1
-20	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463511	-112.533025	90.000000	1
-21	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463608	-112.532728	90.000000	1
-22	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608239	-112.520037	90.000000	1
-23	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623645	-112.518395	90.000000	1
-24	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463705	-112.532431	90.000000	1
-25	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463802	-112.532134	90.000000	1
-26	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639051	-112.516751	90.000000	1
-27	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639722	-112.516403	90.000000	1
-28	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463899	-112.531837	90.000000	1
-29	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463996	-112.531540	90.000000	1
-30	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639439	-112.516139	90.000000	1
-31	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639157	-112.515874	90.000000	1
-32	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464092	-112.531243	90.000000	1
-33	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464189	-112.530946	90.000000	1
-34	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638874	-112.515610	90.000000	1
-35	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638592	-112.515346	90.000000	1
-36	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464286	-112.530649	90.000000	1
-37	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464383	-112.530352	90.000000	1
-38	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638309	-112.515081	90.000000	1
-39	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638027	-112.514817	90.000000	1
-40	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464480	-112.530054	90.000000	1
-41	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464577	-112.529757	90.000000	1
-42	0	3	16	0.000000	0.000000	0.000000	0.000000	34.637744	-112.514553	90.000000	1
-43	0	3	16	0.000000	0.000000	0.000000	0.000000	34.637462	-112.514289	90.000000	1
-44	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464674	-112.529460	90.000000	1
-45	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464771	-112.529163	90.000000	1
-46	0	3	16	0.000000	0.000000	0.000000	0.000000	34.637179	-112.514024	90.000000	1
-47	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636896	-112.513760	90.000000	1
-48	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464868	-112.528866	90.000000	1
-49	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464964	-112.528569	90.000000	1
-50	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636614	-112.513496	90.000000	1
-51	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636331	-112.513231	90.000000	1
-52	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465061	-112.528272	90.000000	1
-53	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465158	-112.527975	90.000000	1
-54	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636049	-112.512967	90.000000	1
-55	0	3	16	0.000000	0.000000	0.000000	0.000000	34.635766	-112.512703	90.000000	1
-56	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465255	-112.527678	90.000000	1
-57	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465352	-112.527381	90.000000	1
-58	0	3	16	0.000000	0.000000	0.000000	0.000000	34.635484	-112.512439	90.000000	1
-59	0	3	16	0.000000	0.000000	0.000000	0.000000	34.635201	-112.512174	90.000000	1
-60	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465449	-112.527084	90.000000	1
-61	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465546	-112.526787	90.000000	1
-62	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634918	-112.511910	90.000000	1
-63	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634636	-112.511646	90.000000	1
-64	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465643	-112.526490	90.000000	1
-65	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465739	-112.526193	90.000000	1
-66	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634353	-112.511381	90.000000	1
-67	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634071	-112.511117	90.000000	1
-68	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465836	-112.525896	90.000000	1
-69	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465933	-112.525599	90.000000	1
-70	0	3	16	0.000000	0.000000	0.000000	0.000000	34.633788	-112.510853	90.000000	1
-71	0	3	16	0.000000	0.000000	0.000000	0.000000	34.633506	-112.510589	90.000000	1
-72	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466030	-112.525302	90.000000	1
-73	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466127	-112.525005	90.000000	1
-74	0	3	16	0.000000	0.000000	0.000000	0.000000	34.633223	-112.510324	90.000000	1
-75	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632940	-112.510060	90.000000	1
-76	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466224	-112.524708	90.000000	1
-77	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466321	-112.524411	90.000000	1
-78	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632658	-112.509796	90.000000	1
-79	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632375	-112.509532	90.000000	1
-80	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466417	-112.524114	90.000000	1
-81	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466514	-112.523817	90.000000	1
-82	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632093	-112.509267	90.000000	1
-83	0	3	16	0.000000	0.000000	0.000000	0.000000	34.631810	-112.509003	90.000000	1
-84	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466611	-112.523519	90.000000	1
-85	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466708	-112.523222	90.000000	1
-86	0	3	16	0.000000	0.000000	0.000000	0.000000	34.631527	-112.508739	90.000000	1
-87	0	3	16	0.000000	0.000000	0.000000	0.000000	34.631245	-112.508474	90.000000	1
-88	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466805	-112.522925	90.000000	1
-89	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466902	-112.522628	90.000000	1
-90	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630962	-112.508210	90.000000	1
-91	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630680	-112.507946	90.000000	1
-92	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466999	-112.522331	90.000000	1
-93	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467096	-112.522034	90.000000	1
-94	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630397	-112.507682	90.000000	1
-95	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630115	-112.507417	90.000000	1
-96	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467192	-112.521737	90.000000	1
-97	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467289	-112.521440	90.000000	1
-98	0	3	16	0.000000	0.000000	0.000000	0.000000	34.629832	-112.507153	90.000000	1
-99	0	3	16	0.000000	0.000000	0.000000	0.000000	34.629549	-112.506889	90.000000	1
-100	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467386	-112.521143	90.000000	1
-101	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467483	-112.520846	90.000000	1
-102	0	3	16	0.000000	0.000000	0.000000	0.000000	34.629267	-112.506625	90.000000	1
-103	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628984	-112.506361	90.000000	1
-104	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467580	-112.520549	90.000000	1
-105	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467677	-112.520252	90.000000	1
-106	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628702	-112.506096	90.000000	1
-107	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628419	-112.505832	90.000000	1
-108	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467774	-112.519955	90.000000	1
-109	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467870	-112.519658	90.000000	1
-110	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628136	-112.505568	90.000000	1
-111	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627854	-112.505304	90.000000	1
-112	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467967	-112.519361	90.000000	1
-113	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468064	-112.519064	90.000000	1
-114	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627571	-112.505039	90.000000	1
-115	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627289	-112.504775	90.000000	1
-116	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468161	-112.518767	90.000000	1
-117	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468258	-112.518469	90.000000	1
-118	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627006	-112.504511	90.000000	1
-119	0	3	16	0.000000	0.000000	0.000000	0.000000	34.626724	-112.504247	90.000000	1
-120	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468355	-112.518172	90.000000	1
-121	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468452	-112.517875	90.000000	1
-122	0	3	16	0.000000	0.000000	0.000000	0.000000	34.626441	-112.503982	90.000000	1
-123	0	3	16	0.000000	0.000000	0.000000	0.000000	34.626158	-112.503718	90.000000	1
-124	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468548	-112.517578	90.000000	1
-125	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468645	-112.517281	90.000000	1
-126	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625876	-112.503454	90.000000	1
-127	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625593	-112.503190	90.000000	1
-128	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468742	-112.516984	90.000000	1
-129	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468839	-112.516687	90.000000	1
-130	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625311	-112.502926	90.000000	1
-131	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625028	-112.502661	90.000000	1
-132	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468936	-112.516390	90.000000	1
-133	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469033	-112.516093	90.000000	1
-134	0	3	16	0.000000	0.000000	0.000000	0.000000	34.624745	-112.502397	90.000000	1
-135	0	3	16	0.000000	0.000000	0.000000	0.000000	34.624463	-112.502133	90.000000	1
-136	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469129	-112.515796	90.000000	1
-137	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469226	-112.515499	90.000000	1
-138	0	3	16	0.000000	0.000000	0.000000	0.000000	34.624180	-112.501869	90.000000	1
-139	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623898	-112.501604	90.000000	1
-140	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469323	-112.515202	90.000000	1
-141	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469420	-112.514905	90.000000	1
-142	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623615	-112.501340	90.000000	1
-143	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623332	-112.501076	90.000000	1
-144	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469517	-112.514608	90.000000	1
-145	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469614	-112.514310	90.000000	1
-146	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623050	-112.500812	90.000000	1
-147	0	3	16	0.000000	0.000000	0.000000	0.000000	34.622767	-112.500548	90.000000	1
-148	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469711	-112.514013	90.000000	1
-149	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469807	-112.513716	90.000000	1
-150	0	3	16	0.000000	0.000000	0.000000	0.000000	34.622485	-112.500283	90.000000	1
-151	0	3	16	0.000000	0.000000	0.000000	0.000000	34.622202	-112.500019	90.000000	1
-152	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469904	-112.513419	90.000000	1
-153	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470001	-112.513122	90.000000	1
-154	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621919	-112.499755	90.000000	1
-155	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621637	-112.499491	90.000000	1
-156	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470098	-112.512825	90.000000	1
-157	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470195	-112.512528	90.000000	1
-158	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621354	-112.499227	90.000000	1
-159	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621072	-112.498962	90.000000	1
-160	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470292	-112.512231	90.000000	1
-161	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470388	-112.511934	90.000000	1
-162	0	3	16	0.000000	0.000000	0.000000	0.000000	34.620789	-112.498698	90.000000	1
-163	0	3	16	0.000000	0.000000	0.000000	0.000000	34.620506	-112.498434	90.000000	1
-164	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470485	-112.511637	90.000000	1
-165	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470582	-112.511340	90.000000	1
-166	0	3	16	0.000000	0.000000	0.000000	0.000000	34.620224	-112.498170	90.000000	1
-167	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619941	-112.497906	90.000000	1
-168	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470679	-112.511043	90.000000	1
-169	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470776	-112.510746	90.000000	1
-170	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619659	-112.497642	90.000000	1
-171	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619376	-112.497377	90.000000	1
-172	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470873	-112.510448	90.000000	1
-173	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470969	-112.510151	90.000000	1
-174	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619093	-112.497113	90.000000	1
-175	0	3	16	0.000000	0.000000	0.000000	0.000000	34.618811	-112.496849	90.000000	1
-176	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471066	-112.509854	90.000000	1
-177	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471163	-112.509557	90.000000	1
-178	0	3	16	0.000000	0.000000	0.000000	0.000000	34.618528	-112.496585	90.000000	1
-179	0	3	16	0.000000	0.000000	0.000000	0.000000	34.618245	-112.496321	90.000000	1
-180	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471260	-112.509260	90.000000	1
-181	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471357	-112.508963	90.000000	1
-182	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617963	-112.496056	90.000000	1
-183	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617680	-112.495792	90.000000	1
-184	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471454	-112.508666	90.000000	1
-185	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471550	-112.508369	90.000000	1
-186	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617398	-112.495528	90.000000	1
-187	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617115	-112.495264	90.000000	1
-188	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471647	-112.508072	90.000000	1
-189	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471744	-112.507775	90.000000	1
-190	0	3	16	0.000000	0.000000	0.000000	0.000000	34.616832	-112.495000	90.000000	1
-191	0	3	16	0.000000	0.000000	0.000000	0.000000	34.616550	-112.494736	90.000000	1
-192	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471841	-112.507478	90.000000	1
-193	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471938	-112.507180	90.000000	1
-194	0	3	16	0.000000	0.000000	0.000000	0.000000	34.616267	-112.494472	90.000000	1
-195	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615985	-112.494207	90.000000	1
-196	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472035	-112.506883	90.000000	1
-197	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472131	-112.506586	90.000000	1
-198	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615702	-112.493943	90.000000	1
-199	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615419	-112.493679	90.000000	1
-200	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472228	-112.506289	90.000000	1
-201	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472325	-112.505992	90.000000	1
-202	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615137	-112.493415	90.000000	1
-203	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614854	-112.493151	90.000000	1
-204	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472422	-112.505695	90.000000	1
-205	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472519	-112.505398	90.000000	1
-206	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614572	-112.492887	90.000000	1
-207	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614289	-112.492622	90.000000	1
-208	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472615	-112.505101	90.000000	1
-209	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472712	-112.504804	90.000000	1
-210	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614006	-112.492358	90.000000	1
-211	0	3	16	0.000000	0.000000	0.000000	0.000000	34.613724	-112.492094	90.000000	1
-212	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472809	-112.504507	90.000000	1
-213	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472906	-112.504210	90.000000	1
-214	0	3	16	0.000000	0.000000	0.000000	0.000000	34.613441	-112.491830	90.000000	1
-215	0	3	16	0.000000	0.000000	0.000000	0.000000	34.613158	-112.491566	90.000000	1
-216	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473003	-112.503912	90.000000	1
-217	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473100	-112.503615	90.000000	1
-218	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612876	-112.491302	90.000000	1
-219	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612593	-112.491038	90.000000	1
-220	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473196	-112.503318	90.000000	1
-221	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473293	-112.503021	90.000000	1
-222	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612311	-112.490773	90.000000	1
-223	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612028	-112.490509	90.000000	1
-224	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473390	-112.502724	90.000000	1
-225	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473487	-112.502427	90.000000	1
-226	0	3	16	0.000000	0.000000	0.000000	0.000000	34.611745	-112.490245	90.000000	1
-227	0	3	16	0.000000	0.000000	0.000000	0.000000	34.611463	-112.489981	90.000000	1
-228	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473584	-112.502130	90.000000	1
-229	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473680	-112.501833	90.000000	1
-230	0	3	16	0.000000	0.000000	0.000000	0.000000	34.611180	-112.489717	90.000000	1
-231	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610897	-112.489453	90.000000	1
-232	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473777	-112.501536	90.000000	1
-233	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473874	-112.501238	90.000000	1
-234	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610615	-112.489189	90.000000	1
-235	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610332	-112.488925	90.000000	1
-236	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473971	-112.500941	90.000000	1
-237	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474068	-112.500644	90.000000	1
-238	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610050	-112.488660	90.000000	1
-239	0	3	16	0.000000	0.000000	0.000000	0.000000	34.609767	-112.488396	90.000000	1
-240	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474165	-112.500347	90.000000	1
-241	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474261	-112.500050	90.000000	1
-242	0	3	16	0.000000	0.000000	0.000000	0.000000	34.609484	-112.488132	90.000000	1
-243	0	3	16	0.000000	0.000000	0.000000	0.000000	34.609202	-112.487868	90.000000	1
-244	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474358	-112.499753	90.000000	1
-245	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474455	-112.499456	90.000000	1
-246	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608919	-112.487604	90.000000	1
-247	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608636	-112.487340	90.000000	1
-248	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474552	-112.499159	90.000000	1
-249	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474649	-112.498862	90.000000	1
-250	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608354	-112.487076	90.000000	1
-251	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608071	-112.486812	90.000000	1
-252	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474745	-112.498565	90.000000	1
-253	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474842	-112.498267	90.000000	1
-254	0	3	16	0.000000	0.000000	0.000000	0.000000	34.607788	-112.486548	90.000000	1
-255	0	3	16	0.000000	0.000000	0.000000	0.000000	34.607506	-112.486283	90.000000	1
-256	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474939	-112.497970	90.000000	1
-257	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475036	-112.497673	90.000000	1
-258	0	3	16	0.000000	0.000000	0.000000	0.000000	34.607223	-112.486019	90.000000	1
-259	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606941	-112.485755	90.000000	1
-260	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475133	-112.497376	90.000000	1
-261	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475229	-112.497079	90.000000	1
-262	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606658	-112.485491	90.000000	1
-263	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606375	-112.485227	90.000000	1
-264	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475326	-112.496782	90.000000	1
-265	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475423	-112.496485	90.000000	1
-266	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606093	-112.484963	90.000000	1
-267	0	3	16	0.000000	0.000000	0.000000	0.000000	34.605810	-112.484699	90.000000	1
-268	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475520	-112.496188	90.000000	1
-269	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475617	-112.495890	90.000000	1
-270	0	3	16	0.000000	0.000000	0.000000	0.000000	34.605527	-112.484435	90.000000	1
-271	0	3	16	0.000000	0.000000	0.000000	0.000000	34.605245	-112.484171	90.000000	1
-272	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475713	-112.495593	90.000000	1
-273	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475810	-112.495296	90.000000	1
-274	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604962	-112.483907	90.000000	1
-275	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604679	-112.483642	90.000000	1
-276	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475907	-112.494999	90.000000	1
-277	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476004	-112.494702	90.000000	1
-278	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604397	-112.483378	90.000000	1
-279	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604114	-112.483114	90.000000	1
-280	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476101	-112.494405	90.000000	1
-281	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476197	-112.494108	90.000000	1
-282	0	3	16	0.000000	0.000000	0.000000	0.000000	34.603832	-112.482850	90.000000	1
-283	0	3	16	0.000000	0.000000	0.000000	0.000000	34.603549	-112.482586	90.000000	1
-284	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476294	-112.493811	90.000000	1
-285	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476391	-112.493513	90.000000	1
-286	0	3	16	0.000000	0.000000	0.000000	0.000000	34.603266	-112.482322	90.000000	1
-287	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602984	-112.482058	90.000000	1
-288	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476488	-112.493216	90.000000	1
-289	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476585	-112.492919	90.000000	1
-290	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602701	-112.481794	90.000000	1
-291	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602418	-112.481530	90.000000	1
-292	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476681	-112.492622	90.000000	1
-293	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476778	-112.492325	90.000000	1
-294	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602136	-112.481266	90.000000	1
-295	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601853	-112.481002	90.000000	1
-296	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476875	-112.492028	90.000000	1
-297	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476972	-112.491731	90.000000	1
-298	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601570	-112.480738	90.000000	1
-299	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601288	-112.480474	90.000000	1
-300	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477069	-112.491434	90.000000	1
-301	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477165	-112.491136	90.000000	1
-302	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601005	-112.480210	90.000000	1
-303	0	3	16	0.000000	0.000000	0.000000	0.000000	34.600722	-112.479945	90.000000	1
-304	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477262	-112.490839	90.000000	1
-305	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477359	-112.490542	90.000000	1
-306	0	3	16	0.000000	0.000000	0.000000	0.000000	34.600440	-112.479681	90.000000	1
-307	0	3	16	0.000000	0.000000	0.000000	0.000000	34.600157	-112.479417	90.000000	1
-308	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477456	-112.490245	90.000000	1
-309	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477552	-112.489948	90.000000	1
-310	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599875	-112.479153	90.000000	1
-311	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599592	-112.478889	90.000000	1
-312	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477649	-112.489651	90.000000	1
-313	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477746	-112.489354	90.000000	1
-314	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599309	-112.478625	90.000000	1
-315	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599027	-112.478361	90.000000	1
-316	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477843	-112.489057	90.000000	1
-317	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477940	-112.488759	90.000000	1
-318	0	3	16	0.000000	0.000000	0.000000	0.000000	34.598744	-112.478097	90.000000	1
-319	0	3	16	0.000000	0.000000	0.000000	0.000000	34.598461	-112.477833	90.000000	1
-320	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478036	-112.488462	90.000000	1
-321	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478133	-112.488165	90.000000	1
-322	0	3	16	0.000000	0.000000	0.000000	0.000000	34.598179	-112.477569	90.000000	1
-323	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597896	-112.477305	90.000000	1
-324	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478230	-112.487868	90.000000	1
-325	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478327	-112.487571	90.000000	1
-326	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597613	-112.477041	90.000000	1
-327	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597331	-112.476777	90.000000	1
-328	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478423	-112.487274	90.000000	1
-329	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478520	-112.486977	90.000000	1
-330	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597048	-112.476513	90.000000	1
-331	0	3	16	0.000000	0.000000	0.000000	0.000000	34.596765	-112.476249	90.000000	1
-332	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478617	-112.486679	90.000000	1
-333	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478714	-112.486382	90.000000	1
-334	0	3	16	0.000000	0.000000	0.000000	0.000000	34.596483	-112.475985	90.000000	1
-335	0	3	16	0.000000	0.000000	0.000000	0.000000	34.596200	-112.475721	90.000000	1
-336	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478811	-112.486085	90.000000	1
-337	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478907	-112.485788	90.000000	1
-338	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595917	-112.475457	90.000000	1
-339	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595635	-112.475193	90.000000	1
-340	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479004	-112.485491	90.000000	1
-341	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479101	-112.485194	90.000000	1
-342	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595352	-112.474929	90.000000	1
-343	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595069	-112.474665	90.000000	1
-344	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479198	-112.484897	90.000000	1
-345	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479294	-112.484599	90.000000	1
-346	0	3	16	0.000000	0.000000	0.000000	0.000000	34.594787	-112.474401	90.000000	1
-347	0	3	16	0.000000	0.000000	0.000000	0.000000	34.594504	-112.474137	90.000000	1
-348	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479391	-112.484302	90.000000	1
-349	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479488	-112.484005	90.000000	1
-350	0	3	16	0.000000	0.000000	0.000000	0.000000	34.594221	-112.473873	90.000000	1
-351	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593939	-112.473609	90.000000	1
-352	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479585	-112.483708	90.000000	1
-353	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479682	-112.483411	90.000000	1
-354	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593656	-112.473345	90.000000	1
-355	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593373	-112.473081	90.000000	1
-356	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479778	-112.483114	90.000000	1
-357	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479875	-112.482817	90.000000	1
-358	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593091	-112.472816	90.000000	1
-359	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592808	-112.472552	90.000000	1
-360	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479972	-112.482519	90.000000	1
-361	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480069	-112.482222	90.000000	1
-362	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592525	-112.472288	90.000000	1
-363	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592243	-112.472024	90.000000	1
-364	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480165	-112.481925	90.000000	1
-365	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480262	-112.481628	90.000000	1
-366	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591960	-112.471760	90.000000	1
-367	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591677	-112.471496	90.000000	1
-368	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480359	-112.481331	90.000000	1
-369	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480456	-112.481034	90.000000	1
-370	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591395	-112.471232	90.000000	1
-371	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591112	-112.470968	90.000000	1
-372	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480552	-112.480736	90.000000	1
-373	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480649	-112.480439	90.000000	1
-374	0	3	16	0.000000	0.000000	0.000000	0.000000	34.590829	-112.470704	90.000000	1
-375	0	3	16	0.000000	0.000000	0.000000	0.000000	34.590547	-112.470440	90.000000	1
-376	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480746	-112.480142	90.000000	1
-377	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480843	-112.479845	90.000000	1
-378	0	3	16	0.000000	0.000000	0.000000	0.000000	34.590264	-112.470176	90.000000	1
-379	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589981	-112.469912	90.000000	1
-380	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480939	-112.479548	90.000000	1
-381	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481036	-112.479251	90.000000	1
-382	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589699	-112.469648	90.000000	1
-383	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589416	-112.469385	90.000000	1
-384	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481133	-112.478954	90.000000	1
-385	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481230	-112.478656	90.000000	1
-386	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589133	-112.469121	90.000000	1
-387	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588851	-112.468857	90.000000	1
-388	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481327	-112.478359	90.000000	1
-389	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481423	-112.478062	90.000000	1
-390	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588568	-112.468593	90.000000	1
-391	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588285	-112.468329	90.000000	1
-392	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481520	-112.477765	90.000000	1
-393	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481617	-112.477468	90.000000	1
-394	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588003	-112.468065	90.000000	1
-395	0	3	16	0.000000	0.000000	0.000000	0.000000	34.587720	-112.467801	90.000000	1
-396	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481714	-112.477171	90.000000	1
-397	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481810	-112.476873	90.000000	1
-398	0	3	16	0.000000	0.000000	0.000000	0.000000	34.587437	-112.467537	90.000000	1
-399	0	3	16	0.000000	0.000000	0.000000	0.000000	34.587155	-112.467273	90.000000	1
-400	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481907	-112.476576	90.000000	1
-401	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482004	-112.476279	90.000000	1
-402	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586872	-112.467009	90.000000	1
-403	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586589	-112.466745	90.000000	1
-404	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482101	-112.475982	90.000000	1
-405	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482197	-112.475685	90.000000	1
-406	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586307	-112.466481	90.000000	1
-407	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586024	-112.466217	90.000000	1
-408	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482294	-112.475388	90.000000	1
-409	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482391	-112.475090	90.000000	1
-410	0	3	16	0.000000	0.000000	0.000000	0.000000	34.585741	-112.465953	90.000000	1
-411	0	3	16	0.000000	0.000000	0.000000	0.000000	34.585458	-112.465689	90.000000	1
-412	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482488	-112.474793	90.000000	1
-413	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482584	-112.474496	90.000000	1
-414	0	3	16	0.000000	0.000000	0.000000	0.000000	34.585176	-112.465425	90.000000	1
-415	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584893	-112.465161	90.000000	1
-416	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482681	-112.474199	90.000000	1
-417	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482778	-112.473902	90.000000	1
-418	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584610	-112.464897	90.000000	1
-419	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584328	-112.464633	90.000000	1
-420	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482875	-112.473605	90.000000	1
-421	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482971	-112.473307	90.000000	1
-422	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584045	-112.464369	90.000000	1
-423	0	3	16	0.000000	0.000000	0.000000	0.000000	34.583762	-112.464105	90.000000	1
-424	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483068	-112.473010	90.000000	1
-425	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483165	-112.472713	90.000000	1
-426	0	3	16	0.000000	0.000000	0.000000	0.000000	34.583480	-112.463841	90.000000	1
-427	0	3	16	0.000000	0.000000	0.000000	0.000000	34.583197	-112.463577	90.000000	1
-428	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483262	-112.472416	90.000000	1
-429	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483358	-112.472119	90.000000	1
-430	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582914	-112.463313	90.000000	1
-431	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582632	-112.463049	90.000000	1
-432	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483455	-112.471821	90.000000	1
-433	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483552	-112.471524	90.000000	1
-434	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582349	-112.462785	90.000000	1
-435	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582066	-112.462521	90.000000	1
-436	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483649	-112.471227	90.000000	1
-437	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483745	-112.470930	90.000000	1
-438	0	3	16	0.000000	0.000000	0.000000	0.000000	34.581784	-112.462257	90.000000	1
-439	0	3	16	0.000000	0.000000	0.000000	0.000000	34.581501	-112.461994	90.000000	1
-440	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483842	-112.470633	90.000000	1
-441	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483939	-112.470336	90.000000	1
-442	0	3	16	0.000000	0.000000	0.000000	0.000000	34.581218	-112.461730	90.000000	1
-443	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580935	-112.461466	90.000000	1
-444	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484035	-112.470038	90.000000	1
-445	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484132	-112.469741	90.000000	1
-446	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580653	-112.461202	90.000000	1
-447	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580370	-112.460938	90.000000	1
-448	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484229	-112.469444	90.000000	1
-449	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484326	-112.469147	90.000000	1
-450	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580087	-112.460674	90.000000	1
-451	0	3	16	0.000000	0.000000	0.000000	0.000000	34.579805	-112.460410	90.000000	1
-452	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484422	-112.468850	90.000000	1
-453	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484519	-112.468552	90.000000	1
-454	0	3	16	0.000000	0.000000	0.000000	0.000000	34.579522	-112.460146	90.000000	1
-455	0	3	16	0.000000	0.000000	0.000000	0.000000	34.579239	-112.459882	90.000000	1
-456	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484616	-112.468255	90.000000	1
-457	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484713	-112.467958	90.000000	1
-458	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578957	-112.459618	90.000000	1
-459	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578674	-112.459354	90.000000	1
-460	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484809	-112.467661	90.000000	1
-461	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484906	-112.467364	90.000000	1
-462	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578391	-112.459090	90.000000	1
-463	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578109	-112.458826	90.000000	1
-464	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485003	-112.467067	90.000000	1
-465	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485100	-112.466769	90.000000	1
-466	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577826	-112.458563	90.000000	1
-467	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577543	-112.458299	90.000000	1
-468	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485196	-112.466472	90.000000	1
-469	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485293	-112.466175	90.000000	1
-470	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577260	-112.458035	90.000000	1
-471	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576978	-112.457771	90.000000	1
-472	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485390	-112.465878	90.000000	1
-473	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485486	-112.465581	90.000000	1
-474	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576695	-112.457507	90.000000	1
-475	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576412	-112.457243	90.000000	1
-476	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485583	-112.465283	90.000000	1
-477	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485680	-112.464986	90.000000	1
-478	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576130	-112.456979	90.000000	1
-479	0	3	16	0.000000	0.000000	0.000000	0.000000	34.575847	-112.456715	90.000000	1
-480	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485777	-112.464689	90.000000	1
-481	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485873	-112.464392	90.000000	1
-482	0	3	16	0.000000	0.000000	0.000000	0.000000	34.575564	-112.456451	90.000000	1
-483	0	3	16	0.000000	0.000000	0.000000	0.000000	34.575281	-112.456187	90.000000	1
-484	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485970	-112.464095	90.000000	1
-485	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486067	-112.463797	90.000000	1
-486	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574999	-112.455923	90.000000	1
-487	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574716	-112.455660	90.000000	1
-488	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486164	-112.463500	90.000000	1
-489	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486260	-112.463203	90.000000	1
-490	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574433	-112.455396	90.000000	1
-491	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574151	-112.455132	90.000000	1
-492	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486357	-112.462906	90.000000	1
-493	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486454	-112.462609	90.000000	1
-494	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573868	-112.454868	90.000000	1
-495	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573585	-112.454604	90.000000	1
-496	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486550	-112.462311	90.000000	1
-497	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486647	-112.462014	90.000000	1
-498	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573303	-112.454340	90.000000	1
-499	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573020	-112.454076	90.000000	1
-500	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486744	-112.461717	90.000000	1
-501	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486841	-112.461420	90.000000	1
-502	0	3	16	0.000000	0.000000	0.000000	0.000000	34.572737	-112.453812	90.000000	1
-503	0	3	16	0.000000	0.000000	0.000000	0.000000	34.572454	-112.453548	90.000000	1
-504	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486937	-112.461123	90.000000	1
-505	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487034	-112.460825	90.000000	1
-506	0	3	16	0.000000	0.000000	0.000000	0.000000	34.572172	-112.453285	90.000000	1
-507	0	3	16	0.000000	0.000000	0.000000	0.000000	34.571889	-112.453021	90.000000	1
-508	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487131	-112.460528	90.000000	1
-509	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487227	-112.460231	90.000000	1
-510	0	3	16	0.000000	0.000000	0.000000	0.000000	34.571606	-112.452757	90.000000	1
-511	0	3	16	0.000000	0.000000	0.000000	0.000000	34.571250	-112.452500	90.000000	1
-512	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487324	-112.459934	90.000000	1
-513	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487421	-112.459637	90.000000	1
-514	0	3	16	0.000000	0.000000	0.000000	0.000000	34.570815	-112.452249	90.000000	1
-515	0	3	16	0.000000	0.000000	0.000000	0.000000	34.570381	-112.451999	90.000000	1
-516	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487518	-112.459339	90.000000	1
-517	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487614	-112.459042	90.000000	1
-518	0	3	16	0.000000	0.000000	0.000000	0.000000	34.569946	-112.451748	90.000000	1
-519	0	3	16	0.000000	0.000000	0.000000	0.000000	34.569512	-112.451498	90.000000	1
-520	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487711	-112.458745	90.000000	1
-521	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487808	-112.458448	90.000000	1
-522	0	3	16	0.000000	0.000000	0.000000	0.000000	34.569077	-112.451247	90.000000	1
-523	0	3	16	0.000000	0.000000	0.000000	0.000000	34.568643	-112.450997	90.000000	1
-524	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487904	-112.458151	90.000000	1
-525	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488001	-112.457853	90.000000	1
-526	0	3	16	0.000000	0.000000	0.000000	0.000000	34.568208	-112.450747	90.000000	1
-527	0	3	16	0.000000	0.000000	0.000000	0.000000	34.567774	-112.450496	90.000000	1
-528	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488098	-112.457556	90.000000	1
-529	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488195	-112.457259	90.000000	1
-530	0	3	16	0.000000	0.000000	0.000000	0.000000	34.567339	-112.450246	90.000000	1
-531	0	3	16	0.000000	0.000000	0.000000	0.000000	34.566905	-112.449995	90.000000	1
-532	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488291	-112.456962	90.000000	1
-533	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488388	-112.456665	90.000000	1
-534	0	3	16	0.000000	0.000000	0.000000	0.000000	34.566470	-112.449745	90.000000	1
-535	0	3	16	0.000000	0.000000	0.000000	0.000000	34.566036	-112.449495	90.000000	1
-536	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488485	-112.456367	90.000000	1
-537	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488581	-112.456070	90.000000	1
-538	0	3	16	0.000000	0.000000	0.000000	0.000000	34.565601	-112.449244	90.000000	1
-539	0	3	16	0.000000	0.000000	0.000000	0.000000	34.565167	-112.448994	90.000000	1
-540	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488678	-112.455773	90.000000	1
-541	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488775	-112.455476	90.000000	1
-542	0	3	16	0.000000	0.000000	0.000000	0.000000	34.564732	-112.448744	90.000000	1
-543	0	3	16	0.000000	0.000000	0.000000	0.000000	34.564298	-112.448493	90.000000	1
-544	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488871	-112.455178	90.000000	1
-545	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488968	-112.454881	90.000000	1
-546	0	3	16	0.000000	0.000000	0.000000	0.000000	34.563863	-112.448243	90.000000	1
-547	0	3	16	0.000000	0.000000	0.000000	0.000000	34.563429	-112.447992	90.000000	1
-548	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489065	-112.454584	90.000000	1
-549	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489162	-112.454287	90.000000	1
-550	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562994	-112.447742	90.000000	1
-551	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562560	-112.447492	90.000000	1
-552	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489258	-112.453990	90.000000	1
-553	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489355	-112.453692	90.000000	1
-554	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562125	-112.447241	90.000000	1
-555	0	3	16	0.000000	0.000000	0.000000	0.000000	34.561691	-112.446991	90.000000	1
-556	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489452	-112.453395	90.000000	1
-557	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489548	-112.453098	90.000000	1
-558	0	3	16	0.000000	0.000000	0.000000	0.000000	34.561256	-112.446741	90.000000	1
-559	0	3	16	0.000000	0.000000	0.000000	0.000000	34.560822	-112.446490	90.000000	1
-560	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489645	-112.452801	90.000000	1
-561	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489742	-112.452503	90.000000	1
-562	0	3	16	0.000000	0.000000	0.000000	0.000000	34.560387	-112.446240	90.000000	1
-563	0	3	16	0.000000	0.000000	0.000000	0.000000	34.559953	-112.445990	90.000000	1
-564	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489838	-112.452206	90.000000	1
-565	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489935	-112.451909	90.000000	1
-566	0	3	16	0.000000	0.000000	0.000000	0.000000	34.559518	-112.445739	90.000000	1
-567	0	3	16	0.000000	0.000000	0.000000	0.000000	34.559084	-112.445489	90.000000	1
-568	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490032	-112.451612	90.000000	1
-569	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490129	-112.451315	90.000000	1
-570	0	3	16	0.000000	0.000000	0.000000	0.000000	34.558649	-112.445239	90.000000	1
-571	0	3	16	0.000000	0.000000	0.000000	0.000000	34.558215	-112.444988	90.000000	1
-572	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490225	-112.451017	90.000000	1
-573	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490322	-112.450720	90.000000	1
-574	0	3	16	0.000000	0.000000	0.000000	0.000000	34.557780	-112.444738	90.000000	1
-575	0	3	16	0.000000	0.000000	0.000000	0.000000	34.557346	-112.444488	90.000000	1
-576	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490419	-112.450423	90.000000	1
-577	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490515	-112.450126	90.000000	1
-578	0	3	16	0.000000	0.000000	0.000000	0.000000	34.556911	-112.444237	90.000000	1
-579	0	3	16	0.000000	0.000000	0.000000	0.000000	34.556477	-112.443987	90.000000	1
-580	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490612	-112.449828	90.000000	1
-581	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490709	-112.449531	90.000000	1
-582	0	3	16	0.000000	0.000000	0.000000	0.000000	34.556042	-112.443737	90.000000	1
-583	0	3	16	0.000000	0.000000	0.000000	0.000000	34.555608	-112.443486	90.000000	1
-584	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490805	-112.449234	90.000000	1
-585	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490902	-112.448937	90.000000	1
-586	0	3	16	0.000000	0.000000	0.000000	0.000000	34.555173	-112.443236	90.000000	1
-587	0	3	16	0.000000	0.000000	0.000000	0.000000	34.554739	-112.442986	90.000000	1
-588	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490999	-112.448640	90.000000	1
-589	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491095	-112.448342	90.000000	1
-590	0	3	16	0.000000	0.000000	0.000000	0.000000	34.554304	-112.442735	90.000000	1
-591	0	3	16	0.000000	0.000000	0.000000	0.000000	34.553870	-112.442485	90.000000	1
-592	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491192	-112.448045	90.000000	1
-593	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491289	-112.447748	90.000000	1
-594	0	3	16	0.000000	0.000000	0.000000	0.000000	34.553435	-112.442235	90.000000	1
-595	0	3	16	0.000000	0.000000	0.000000	0.000000	34.553001	-112.441984	90.000000	1
-596	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491385	-112.447451	90.000000	1
-597	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491482	-112.447153	90.000000	1
-598	0	3	16	0.000000	0.000000	0.000000	0.000000	34.552566	-112.441734	90.000000	1
-599	0	3	16	0.000000	0.000000	0.000000	0.000000	34.552132	-112.441484	90.000000	1
-600	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491579	-112.446856	90.000000	1
-601	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491676	-112.446559	90.000000	1
-602	0	3	16	0.000000	0.000000	0.000000	0.000000	34.551697	-112.441233	90.000000	1
-603	0	3	16	0.000000	0.000000	0.000000	0.000000	34.551263	-112.440983	90.000000	1
-604	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491772	-112.446262	90.000000	1
-605	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491869	-112.445964	90.000000	1
-606	0	3	16	0.000000	0.000000	0.000000	0.000000	34.550828	-112.440733	90.000000	1
-607	0	3	16	0.000000	0.000000	0.000000	0.000000	34.550394	-112.440483	90.000000	1
-608	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491966	-112.445667	90.000000	1
-609	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492062	-112.445370	90.000000	1
-610	0	3	16	0.000000	0.000000	0.000000	0.000000	34.549959	-112.440232	90.000000	1
-611	0	3	16	0.000000	0.000000	0.000000	0.000000	34.549525	-112.439982	90.000000	1
-612	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492159	-112.445073	90.000000	1
-613	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492256	-112.444775	90.000000	1
-614	0	3	16	0.000000	0.000000	0.000000	0.000000	34.549090	-112.439732	90.000000	1
-615	0	3	16	0.000000	0.000000	0.000000	0.000000	34.548656	-112.439481	90.000000	1
-616	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492352	-112.444478	90.000000	1
-617	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492449	-112.444181	90.000000	1
-618	0	3	16	0.000000	0.000000	0.000000	0.000000	34.548221	-112.439231	90.000000	1
-619	0	3	16	0.000000	0.000000	0.000000	0.000000	34.547787	-112.438981	90.000000	1
-620	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492546	-112.443884	90.000000	1
-621	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492642	-112.443586	90.000000	1
-622	0	3	16	0.000000	0.000000	0.000000	0.000000	34.547352	-112.438731	90.000000	1
-623	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546918	-112.438480	90.000000	1
-624	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492739	-112.443289	90.000000	1
-625	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492836	-112.442992	90.000000	1
-626	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546483	-112.438230	90.000000	1
-627	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546049	-112.437980	90.000000	1
-628	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492932	-112.442695	90.000000	1
-629	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493029	-112.442398	90.000000	1
-630	0	3	16	0.000000	0.000000	0.000000	0.000000	34.545614	-112.437730	90.000000	1
-631	0	3	16	0.000000	0.000000	0.000000	0.000000	34.545180	-112.437479	90.000000	1
-632	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493126	-112.442100	90.000000	1
-633	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493222	-112.441803	90.000000	1
-634	0	3	16	0.000000	0.000000	0.000000	0.000000	34.544745	-112.437229	90.000000	1
-635	0	3	16	0.000000	0.000000	0.000000	0.000000	34.544311	-112.436979	90.000000	1
-636	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493319	-112.441506	90.000000	1
-637	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493416	-112.441209	90.000000	1
-638	0	3	16	0.000000	0.000000	0.000000	0.000000	34.543876	-112.436728	90.000000	1
-639	0	3	16	0.000000	0.000000	0.000000	0.000000	34.543442	-112.436478	90.000000	1
-640	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493512	-112.440911	90.000000	1
-641	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493609	-112.440614	90.000000	1
-642	0	3	16	0.000000	0.000000	0.000000	0.000000	34.543007	-112.436228	90.000000	1
-643	0	3	16	0.000000	0.000000	0.000000	0.000000	34.542573	-112.435978	90.000000	1
-644	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493706	-112.440317	90.000000	1
-645	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493802	-112.440020	90.000000	1
-646	0	3	16	0.000000	0.000000	0.000000	0.000000	34.542138	-112.435728	90.000000	1
-647	0	3	16	0.000000	0.000000	0.000000	0.000000	34.541704	-112.435477	90.000000	1
-648	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493899	-112.439722	90.000000	1
-649	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493996	-112.439425	90.000000	1
-650	0	3	16	0.000000	0.000000	0.000000	0.000000	34.541269	-112.435227	90.000000	1
-651	0	3	16	0.000000	0.000000	0.000000	0.000000	34.540834	-112.434977	90.000000	1
-652	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494092	-112.439128	90.000000	1
-653	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494189	-112.438831	90.000000	1
-654	0	3	16	0.000000	0.000000	0.000000	0.000000	34.540400	-112.434727	90.000000	1
-655	0	3	16	0.000000	0.000000	0.000000	0.000000	34.539965	-112.434476	90.000000	1
-656	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494286	-112.438533	90.000000	1
-657	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494382	-112.438236	90.000000	1
-658	0	3	16	0.000000	0.000000	0.000000	0.000000	34.539531	-112.434226	90.000000	1
-659	0	3	16	0.000000	0.000000	0.000000	0.000000	34.539096	-112.433976	90.000000	1
-660	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494479	-112.437939	90.000000	1
-661	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494576	-112.437641	90.000000	1
-662	0	3	16	0.000000	0.000000	0.000000	0.000000	34.538662	-112.433726	90.000000	1
-663	0	3	16	0.000000	0.000000	0.000000	0.000000	34.538227	-112.433475	90.000000	1
-664	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494672	-112.437344	90.000000	1
-665	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494769	-112.437047	90.000000	1
-666	0	3	16	0.000000	0.000000	0.000000	0.000000	34.537793	-112.433225	90.000000	1
-667	0	3	16	0.000000	0.000000	0.000000	0.000000	34.537358	-112.432975	90.000000	1
-668	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494866	-112.436750	90.000000	1
-669	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494962	-112.436452	90.000000	1
-670	0	3	16	0.000000	0.000000	0.000000	0.000000	34.536924	-112.432725	90.000000	1
-671	0	3	16	0.000000	0.000000	0.000000	0.000000	34.536489	-112.432475	90.000000	1
-672	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495059	-112.436155	90.000000	1
-673	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495156	-112.435858	90.000000	1
-674	0	3	16	0.000000	0.000000	0.000000	0.000000	34.536055	-112.432224	90.000000	1
-675	0	3	16	0.000000	0.000000	0.000000	0.000000	34.535620	-112.431974	90.000000	1
-676	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495252	-112.435561	90.000000	1
-677	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495349	-112.435263	90.000000	1
-678	0	3	16	0.000000	0.000000	0.000000	0.000000	34.535186	-112.431724	90.000000	1
-679	0	3	16	0.000000	0.000000	0.000000	0.000000	34.534751	-112.431474	90.000000	1
-680	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495446	-112.434966	90.000000	1
-681	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495542	-112.434669	90.000000	1
-682	0	3	16	0.000000	0.000000	0.000000	0.000000	34.534317	-112.431224	90.000000	1
-683	0	3	16	0.000000	0.000000	0.000000	0.000000	34.533882	-112.430973	90.000000	1
-684	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495639	-112.434372	90.000000	1
-685	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495736	-112.434074	90.000000	1
-686	0	3	16	0.000000	0.000000	0.000000	0.000000	34.533447	-112.430723	90.000000	1
-687	0	3	16	0.000000	0.000000	0.000000	0.000000	34.533013	-112.430473	90.000000	1
-688	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495832	-112.433777	90.000000	1
-689	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495929	-112.433480	90.000000	1
-690	0	3	16	0.000000	0.000000	0.000000	0.000000	34.532578	-112.430223	90.000000	1
-691	0	3	16	0.000000	0.000000	0.000000	0.000000	34.532144	-112.429973	90.000000	1
-692	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496026	-112.433183	90.000000	1
-693	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496122	-112.432885	90.000000	1
-694	0	3	16	0.000000	0.000000	0.000000	0.000000	34.531709	-112.429723	90.000000	1
-695	0	3	16	0.000000	0.000000	0.000000	0.000000	34.531275	-112.429472	90.000000	1
-696	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496219	-112.432588	90.000000	1
-697	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496315	-112.432291	90.000000	1
-698	0	3	16	0.000000	0.000000	0.000000	0.000000	34.530840	-112.429222	90.000000	1
-699	0	3	16	0.000000	0.000000	0.000000	0.000000	34.530406	-112.428972	90.000000	1
-700	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496412	-112.431993	90.000000	1
-701	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496509	-112.431696	90.000000	1
-702	0	3	16	0.000000	0.000000	0.000000	0.000000	34.529971	-112.428722	90.000000	1
-703	0	3	16	0.000000	0.000000	0.000000	0.000000	34.529537	-112.428472	90.000000	1
-704	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496605	-112.431399	90.000000	1
-705	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496702	-112.431102	90.000000	1
-706	0	3	16	0.000000	0.000000	0.000000	0.000000	34.529102	-112.428222	90.000000	1
-707	0	3	16	0.000000	0.000000	0.000000	0.000000	34.528668	-112.427971	90.000000	1
-708	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496799	-112.430804	90.000000	1
-709	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496895	-112.430507	90.000000	1
-710	0	3	16	0.000000	0.000000	0.000000	0.000000	34.528233	-112.427721	90.000000	1
-711	0	3	16	0.000000	0.000000	0.000000	0.000000	34.527798	-112.427471	90.000000	1
-712	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496992	-112.430210	90.000000	1
-713	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497089	-112.429913	90.000000	1
-714	0	3	16	0.000000	0.000000	0.000000	0.000000	34.527364	-112.427221	90.000000	1
-715	0	3	16	0.000000	0.000000	0.000000	0.000000	34.526929	-112.426971	90.000000	1
-716	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497185	-112.429615	90.000000	1
-717	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497282	-112.429318	90.000000	1
-718	0	3	16	0.000000	0.000000	0.000000	0.000000	34.526495	-112.426721	90.000000	1
-719	0	3	16	0.000000	0.000000	0.000000	0.000000	34.526060	-112.426470	90.000000	1
-720	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497379	-112.429021	90.000000	1
-721	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497475	-112.428723	90.000000	1
-722	0	3	16	0.000000	0.000000	0.000000	0.000000	34.525626	-112.426220	90.000000	1
-723	0	3	16	0.000000	0.000000	0.000000	0.000000	34.525191	-112.425970	90.000000	1
-724	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497572	-112.428426	90.000000	1
-725	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497668	-112.428129	90.000000	1
-726	0	3	16	0.000000	0.000000	0.000000	0.000000	34.524757	-112.425720	90.000000	1
-727	0	3	16	0.000000	0.000000	0.000000	0.000000	34.524322	-112.425470	90.000000	1
-728	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497765	-112.427832	90.000000	1
-729	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497862	-112.427534	90.000000	1
-730	0	3	16	0.000000	0.000000	0.000000	0.000000	34.523888	-112.425220	90.000000	1
-731	0	3	16	0.000000	0.000000	0.000000	0.000000	34.523453	-112.424970	90.000000	1
-732	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497958	-112.427237	90.000000	1
-733	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498055	-112.426940	90.000000	1
-734	0	3	16	0.000000	0.000000	0.000000	0.000000	34.523019	-112.424720	90.000000	1
-735	0	3	16	0.000000	0.000000	0.000000	0.000000	34.522584	-112.424469	90.000000	1
-736	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498152	-112.426642	90.000000	1
-737	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498248	-112.426345	90.000000	1
-738	0	3	16	0.000000	0.000000	0.000000	0.000000	34.522149	-112.424219	90.000000	1
-739	0	3	16	0.000000	0.000000	0.000000	0.000000	34.521715	-112.423969	90.000000	1
-740	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498345	-112.426048	90.000000	1
-741	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498442	-112.425751	90.000000	1
-742	0	3	16	0.000000	0.000000	0.000000	0.000000	34.521280	-112.423719	90.000000	1
-743	0	3	16	0.000000	0.000000	0.000000	0.000000	34.520846	-112.423469	90.000000	1
-744	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498538	-112.425453	90.000000	1
-745	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498635	-112.425156	90.000000	1
-746	0	3	16	0.000000	0.000000	0.000000	0.000000	34.520411	-112.423219	90.000000	1
-747	0	3	16	0.000000	0.000000	0.000000	0.000000	34.519977	-112.422969	90.000000	1
-748	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498731	-112.424859	90.000000	1
-749	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498828	-112.424561	90.000000	1
-750	0	3	16	0.000000	0.000000	0.000000	0.000000	34.519542	-112.422719	90.000000	1
-751	0	3	16	0.000000	0.000000	0.000000	0.000000	34.519108	-112.422469	90.000000	1
-752	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498925	-112.424264	90.000000	1
-753	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499021	-112.423967	90.000000	1
-754	0	3	16	0.000000	0.000000	0.000000	0.000000	34.518673	-112.422218	90.000000	1
-755	0	3	16	0.000000	0.000000	0.000000	0.000000	34.518238	-112.421968	90.000000	1
-756	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499118	-112.423670	90.000000	1
-757	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499215	-112.423372	90.000000	1
-758	0	3	16	0.000000	0.000000	0.000000	0.000000	34.517804	-112.421718	90.000000	1
-759	0	3	16	0.000000	0.000000	0.000000	0.000000	34.517369	-112.421468	90.000000	1
-760	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499311	-112.423075	90.000000	1
-761	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499408	-112.422778	90.000000	1
-762	0	3	16	0.000000	0.000000	0.000000	0.000000	34.516935	-112.421218	90.000000	1
-763	0	3	16	0.000000	0.000000	0.000000	0.000000	34.516500	-112.420968	90.000000	1
-764	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499504	-112.422480	90.000000	1
-765	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499601	-112.422183	90.000000	1
-766	0	3	16	0.000000	0.000000	0.000000	0.000000	34.516066	-112.420718	90.000000	1
-767	0	3	16	0.000000	0.000000	0.000000	0.000000	34.515631	-112.420468	90.000000	1
-768	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499698	-112.421886	90.000000	1
-769	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499794	-112.421588	90.000000	1
-770	0	3	16	0.000000	0.000000	0.000000	0.000000	34.515197	-112.420218	90.000000	1
-771	0	3	16	0.000000	0.000000	0.000000	0.000000	34.514762	-112.419968	90.000000	1
-772	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499891	-112.421291	90.000000	1
-773	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499988	-112.420994	90.000000	1
-774	0	3	16	0.000000	0.000000	0.000000	0.000000	34.514327	-112.419718	90.000000	1
-775	0	3	16	0.000000	0.000000	0.000000	0.000000	34.513893	-112.419468	90.000000	1
-776	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500084	-112.420697	90.000000	1
-777	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500181	-112.420399	90.000000	1
-778	0	3	16	0.000000	0.000000	0.000000	0.000000	34.513458	-112.419218	90.000000	1
-779	0	3	16	0.000000	0.000000	0.000000	0.000000	34.513024	-112.418967	90.000000	1
-780	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500277	-112.420102	90.000000	1
-781	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500374	-112.419805	90.000000	1
-782	0	3	16	0.000000	0.000000	0.000000	0.000000	34.512589	-112.418717	90.000000	1
-783	0	3	16	0.000000	0.000000	0.000000	0.000000	34.512155	-112.418467	90.000000	1
-784	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500471	-112.419507	90.000000	1
-785	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500567	-112.419210	90.000000	1
-786	0	3	16	0.000000	0.000000	0.000000	0.000000	34.511720	-112.418217	90.000000	1
-787	0	3	16	0.000000	0.000000	0.000000	0.000000	34.511285	-112.417967	90.000000	1
-788	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500664	-112.418913	90.000000	1
-789	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500761	-112.418615	90.000000	1
-790	0	3	16	0.000000	0.000000	0.000000	0.000000	34.510851	-112.417717	90.000000	1
-791	0	3	16	0.000000	0.000000	0.000000	0.000000	34.510416	-112.417467	90.000000	1
-792	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500857	-112.418318	90.000000	1
-793	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500954	-112.418021	90.000000	1
-794	0	3	16	0.000000	0.000000	0.000000	0.000000	34.509982	-112.417217	90.000000	1
-795	0	3	16	0.000000	0.000000	0.000000	0.000000	34.509547	-112.416967	90.000000	1
-796	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501050	-112.417724	90.000000	1
-797	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501147	-112.417426	90.000000	1
-798	0	3	16	0.000000	0.000000	0.000000	0.000000	34.509113	-112.416717	90.000000	1
-799	0	3	16	0.000000	0.000000	0.000000	0.000000	34.508678	-112.416467	90.000000	1
-800	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501244	-112.417129	90.000000	1
-801	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501340	-112.416832	90.000000	1
-802	0	3	16	0.000000	0.000000	0.000000	0.000000	34.508244	-112.416217	90.000000	1
-803	0	3	16	0.000000	0.000000	0.000000	0.000000	34.507809	-112.415967	90.000000	1
-804	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501437	-112.416534	90.000000	1
-805	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501533	-112.416237	90.000000	1
-806	0	3	16	0.000000	0.000000	0.000000	0.000000	34.507374	-112.415717	90.000000	1
-807	0	3	16	0.000000	0.000000	0.000000	0.000000	34.506940	-112.415467	90.000000	1
-808	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501630	-112.415940	90.000000	1
-809	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501727	-112.415642	90.000000	1
-810	0	3	16	0.000000	0.000000	0.000000	0.000000	34.506505	-112.415217	90.000000	1
-811	0	3	16	0.000000	0.000000	0.000000	0.000000	34.506071	-112.414967	90.000000	1
-812	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501823	-112.415345	90.000000	1
-813	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501920	-112.415048	90.000000	1
-814	0	3	16	0.000000	0.000000	0.000000	0.000000	34.505636	-112.414717	90.000000	1
-815	0	3	16	0.000000	0.000000	0.000000	0.000000	34.505202	-112.414467	90.000000	1
-816	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502016	-112.414750	90.000000	1
-817	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502113	-112.414453	90.000000	1
-818	0	3	16	0.000000	0.000000	0.000000	0.000000	34.504767	-112.414217	90.000000	1
-819	0	3	16	0.000000	0.000000	0.000000	0.000000	34.504332	-112.413967	90.000000	1
-820	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502210	-112.414156	90.000000	1
-821	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502306	-112.413859	90.000000	1
-822	0	3	16	0.000000	0.000000	0.000000	0.000000	34.503898	-112.413717	90.000000	1
-823	0	3	16	0.000000	0.000000	0.000000	0.000000	34.503463	-112.413467	90.000000	1
-824	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502403	-112.413561	90.000000	1
-825	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502499	-112.413264	90.000000	1
-826	0	3	16	0.000000	0.000000	0.000000	0.000000	34.503029	-112.413217	90.000000	1
-827	0	3	206	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
-828	0	3	20	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
+QGC WPL 110
+0	1	0	16	0	0	0	0	34.577822	-112.469101	584.380005	1
+1	0	3	22	20.000000	0.000000	0.000000	0.000000	0.000000	0.000000	30.000000	1
+2	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469587	-112.534801	90.000000	1
+3	0	3	206	21.059999	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
+4	0	3	16	0.000000	0.000000	0.000000	0.000000	34.462736	-112.535401	90.000000	1
+5	0	3	16	0.000000	0.000000	0.000000	0.000000	34.462833	-112.535104	90.000000	1
+6	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484993	-112.533163	90.000000	1
+7	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500399	-112.531524	90.000000	1
+8	0	3	16	0.000000	0.000000	0.000000	0.000000	34.462930	-112.534807	90.000000	1
+9	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463027	-112.534510	90.000000	1
+10	0	3	16	0.000000	0.000000	0.000000	0.000000	34.515805	-112.529884	90.000000	1
+11	0	3	16	0.000000	0.000000	0.000000	0.000000	34.531211	-112.528244	90.000000	1
+12	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463124	-112.534213	90.000000	1
+13	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463221	-112.533916	90.000000	1
+14	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546616	-112.526604	90.000000	1
+15	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562022	-112.524963	90.000000	1
+16	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463317	-112.533619	90.000000	1
+17	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463414	-112.533322	90.000000	1
+18	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577428	-112.523322	90.000000	1
+19	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592834	-112.521680	90.000000	1
+20	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463511	-112.533025	90.000000	1
+21	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463608	-112.532728	90.000000	1
+22	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608239	-112.520037	90.000000	1
+23	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623645	-112.518395	90.000000	1
+24	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463705	-112.532431	90.000000	1
+25	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463802	-112.532134	90.000000	1
+26	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639051	-112.516751	90.000000	1
+27	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639722	-112.516403	90.000000	1
+28	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463899	-112.531837	90.000000	1
+29	0	3	16	0.000000	0.000000	0.000000	0.000000	34.463996	-112.531540	90.000000	1
+30	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639439	-112.516139	90.000000	1
+31	0	3	16	0.000000	0.000000	0.000000	0.000000	34.639157	-112.515874	90.000000	1
+32	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464092	-112.531243	90.000000	1
+33	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464189	-112.530946	90.000000	1
+34	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638874	-112.515610	90.000000	1
+35	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638592	-112.515346	90.000000	1
+36	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464286	-112.530649	90.000000	1
+37	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464383	-112.530352	90.000000	1
+38	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638309	-112.515081	90.000000	1
+39	0	3	16	0.000000	0.000000	0.000000	0.000000	34.638027	-112.514817	90.000000	1
+40	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464480	-112.530054	90.000000	1
+41	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464577	-112.529757	90.000000	1
+42	0	3	16	0.000000	0.000000	0.000000	0.000000	34.637744	-112.514553	90.000000	1
+43	0	3	16	0.000000	0.000000	0.000000	0.000000	34.637462	-112.514289	90.000000	1
+44	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464674	-112.529460	90.000000	1
+45	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464771	-112.529163	90.000000	1
+46	0	3	16	0.000000	0.000000	0.000000	0.000000	34.637179	-112.514024	90.000000	1
+47	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636896	-112.513760	90.000000	1
+48	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464868	-112.528866	90.000000	1
+49	0	3	16	0.000000	0.000000	0.000000	0.000000	34.464964	-112.528569	90.000000	1
+50	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636614	-112.513496	90.000000	1
+51	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636331	-112.513231	90.000000	1
+52	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465061	-112.528272	90.000000	1
+53	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465158	-112.527975	90.000000	1
+54	0	3	16	0.000000	0.000000	0.000000	0.000000	34.636049	-112.512967	90.000000	1
+55	0	3	16	0.000000	0.000000	0.000000	0.000000	34.635766	-112.512703	90.000000	1
+56	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465255	-112.527678	90.000000	1
+57	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465352	-112.527381	90.000000	1
+58	0	3	16	0.000000	0.000000	0.000000	0.000000	34.635484	-112.512439	90.000000	1
+59	0	3	16	0.000000	0.000000	0.000000	0.000000	34.635201	-112.512174	90.000000	1
+60	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465449	-112.527084	90.000000	1
+61	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465546	-112.526787	90.000000	1
+62	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634918	-112.511910	90.000000	1
+63	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634636	-112.511646	90.000000	1
+64	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465643	-112.526490	90.000000	1
+65	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465739	-112.526193	90.000000	1
+66	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634353	-112.511381	90.000000	1
+67	0	3	16	0.000000	0.000000	0.000000	0.000000	34.634071	-112.511117	90.000000	1
+68	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465836	-112.525896	90.000000	1
+69	0	3	16	0.000000	0.000000	0.000000	0.000000	34.465933	-112.525599	90.000000	1
+70	0	3	16	0.000000	0.000000	0.000000	0.000000	34.633788	-112.510853	90.000000	1
+71	0	3	16	0.000000	0.000000	0.000000	0.000000	34.633506	-112.510589	90.000000	1
+72	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466030	-112.525302	90.000000	1
+73	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466127	-112.525005	90.000000	1
+74	0	3	16	0.000000	0.000000	0.000000	0.000000	34.633223	-112.510324	90.000000	1
+75	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632940	-112.510060	90.000000	1
+76	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466224	-112.524708	90.000000	1
+77	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466321	-112.524411	90.000000	1
+78	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632658	-112.509796	90.000000	1
+79	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632375	-112.509532	90.000000	1
+80	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466417	-112.524114	90.000000	1
+81	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466514	-112.523817	90.000000	1
+82	0	3	16	0.000000	0.000000	0.000000	0.000000	34.632093	-112.509267	90.000000	1
+83	0	3	16	0.000000	0.000000	0.000000	0.000000	34.631810	-112.509003	90.000000	1
+84	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466611	-112.523519	90.000000	1
+85	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466708	-112.523222	90.000000	1
+86	0	3	16	0.000000	0.000000	0.000000	0.000000	34.631527	-112.508739	90.000000	1
+87	0	3	16	0.000000	0.000000	0.000000	0.000000	34.631245	-112.508474	90.000000	1
+88	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466805	-112.522925	90.000000	1
+89	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466902	-112.522628	90.000000	1
+90	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630962	-112.508210	90.000000	1
+91	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630680	-112.507946	90.000000	1
+92	0	3	16	0.000000	0.000000	0.000000	0.000000	34.466999	-112.522331	90.000000	1
+93	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467096	-112.522034	90.000000	1
+94	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630397	-112.507682	90.000000	1
+95	0	3	16	0.000000	0.000000	0.000000	0.000000	34.630115	-112.507417	90.000000	1
+96	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467192	-112.521737	90.000000	1
+97	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467289	-112.521440	90.000000	1
+98	0	3	16	0.000000	0.000000	0.000000	0.000000	34.629832	-112.507153	90.000000	1
+99	0	3	16	0.000000	0.000000	0.000000	0.000000	34.629549	-112.506889	90.000000	1
+100	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467386	-112.521143	90.000000	1
+101	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467483	-112.520846	90.000000	1
+102	0	3	16	0.000000	0.000000	0.000000	0.000000	34.629267	-112.506625	90.000000	1
+103	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628984	-112.506361	90.000000	1
+104	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467580	-112.520549	90.000000	1
+105	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467677	-112.520252	90.000000	1
+106	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628702	-112.506096	90.000000	1
+107	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628419	-112.505832	90.000000	1
+108	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467774	-112.519955	90.000000	1
+109	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467870	-112.519658	90.000000	1
+110	0	3	16	0.000000	0.000000	0.000000	0.000000	34.628136	-112.505568	90.000000	1
+111	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627854	-112.505304	90.000000	1
+112	0	3	16	0.000000	0.000000	0.000000	0.000000	34.467967	-112.519361	90.000000	1
+113	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468064	-112.519064	90.000000	1
+114	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627571	-112.505039	90.000000	1
+115	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627289	-112.504775	90.000000	1
+116	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468161	-112.518767	90.000000	1
+117	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468258	-112.518469	90.000000	1
+118	0	3	16	0.000000	0.000000	0.000000	0.000000	34.627006	-112.504511	90.000000	1
+119	0	3	16	0.000000	0.000000	0.000000	0.000000	34.626724	-112.504247	90.000000	1
+120	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468355	-112.518172	90.000000	1
+121	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468452	-112.517875	90.000000	1
+122	0	3	16	0.000000	0.000000	0.000000	0.000000	34.626441	-112.503982	90.000000	1
+123	0	3	16	0.000000	0.000000	0.000000	0.000000	34.626158	-112.503718	90.000000	1
+124	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468548	-112.517578	90.000000	1
+125	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468645	-112.517281	90.000000	1
+126	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625876	-112.503454	90.000000	1
+127	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625593	-112.503190	90.000000	1
+128	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468742	-112.516984	90.000000	1
+129	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468839	-112.516687	90.000000	1
+130	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625311	-112.502926	90.000000	1
+131	0	3	16	0.000000	0.000000	0.000000	0.000000	34.625028	-112.502661	90.000000	1
+132	0	3	16	0.000000	0.000000	0.000000	0.000000	34.468936	-112.516390	90.000000	1
+133	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469033	-112.516093	90.000000	1
+134	0	3	16	0.000000	0.000000	0.000000	0.000000	34.624745	-112.502397	90.000000	1
+135	0	3	16	0.000000	0.000000	0.000000	0.000000	34.624463	-112.502133	90.000000	1
+136	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469129	-112.515796	90.000000	1
+137	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469226	-112.515499	90.000000	1
+138	0	3	16	0.000000	0.000000	0.000000	0.000000	34.624180	-112.501869	90.000000	1
+139	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623898	-112.501604	90.000000	1
+140	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469323	-112.515202	90.000000	1
+141	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469420	-112.514905	90.000000	1
+142	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623615	-112.501340	90.000000	1
+143	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623332	-112.501076	90.000000	1
+144	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469517	-112.514608	90.000000	1
+145	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469614	-112.514310	90.000000	1
+146	0	3	16	0.000000	0.000000	0.000000	0.000000	34.623050	-112.500812	90.000000	1
+147	0	3	16	0.000000	0.000000	0.000000	0.000000	34.622767	-112.500548	90.000000	1
+148	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469711	-112.514013	90.000000	1
+149	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469807	-112.513716	90.000000	1
+150	0	3	16	0.000000	0.000000	0.000000	0.000000	34.622485	-112.500283	90.000000	1
+151	0	3	16	0.000000	0.000000	0.000000	0.000000	34.622202	-112.500019	90.000000	1
+152	0	3	16	0.000000	0.000000	0.000000	0.000000	34.469904	-112.513419	90.000000	1
+153	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470001	-112.513122	90.000000	1
+154	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621919	-112.499755	90.000000	1
+155	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621637	-112.499491	90.000000	1
+156	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470098	-112.512825	90.000000	1
+157	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470195	-112.512528	90.000000	1
+158	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621354	-112.499227	90.000000	1
+159	0	3	16	0.000000	0.000000	0.000000	0.000000	34.621072	-112.498962	90.000000	1
+160	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470292	-112.512231	90.000000	1
+161	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470388	-112.511934	90.000000	1
+162	0	3	16	0.000000	0.000000	0.000000	0.000000	34.620789	-112.498698	90.000000	1
+163	0	3	16	0.000000	0.000000	0.000000	0.000000	34.620506	-112.498434	90.000000	1
+164	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470485	-112.511637	90.000000	1
+165	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470582	-112.511340	90.000000	1
+166	0	3	16	0.000000	0.000000	0.000000	0.000000	34.620224	-112.498170	90.000000	1
+167	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619941	-112.497906	90.000000	1
+168	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470679	-112.511043	90.000000	1
+169	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470776	-112.510746	90.000000	1
+170	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619659	-112.497642	90.000000	1
+171	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619376	-112.497377	90.000000	1
+172	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470873	-112.510448	90.000000	1
+173	0	3	16	0.000000	0.000000	0.000000	0.000000	34.470969	-112.510151	90.000000	1
+174	0	3	16	0.000000	0.000000	0.000000	0.000000	34.619093	-112.497113	90.000000	1
+175	0	3	16	0.000000	0.000000	0.000000	0.000000	34.618811	-112.496849	90.000000	1
+176	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471066	-112.509854	90.000000	1
+177	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471163	-112.509557	90.000000	1
+178	0	3	16	0.000000	0.000000	0.000000	0.000000	34.618528	-112.496585	90.000000	1
+179	0	3	16	0.000000	0.000000	0.000000	0.000000	34.618245	-112.496321	90.000000	1
+180	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471260	-112.509260	90.000000	1
+181	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471357	-112.508963	90.000000	1
+182	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617963	-112.496056	90.000000	1
+183	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617680	-112.495792	90.000000	1
+184	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471454	-112.508666	90.000000	1
+185	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471550	-112.508369	90.000000	1
+186	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617398	-112.495528	90.000000	1
+187	0	3	16	0.000000	0.000000	0.000000	0.000000	34.617115	-112.495264	90.000000	1
+188	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471647	-112.508072	90.000000	1
+189	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471744	-112.507775	90.000000	1
+190	0	3	16	0.000000	0.000000	0.000000	0.000000	34.616832	-112.495000	90.000000	1
+191	0	3	16	0.000000	0.000000	0.000000	0.000000	34.616550	-112.494736	90.000000	1
+192	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471841	-112.507478	90.000000	1
+193	0	3	16	0.000000	0.000000	0.000000	0.000000	34.471938	-112.507180	90.000000	1
+194	0	3	16	0.000000	0.000000	0.000000	0.000000	34.616267	-112.494472	90.000000	1
+195	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615985	-112.494207	90.000000	1
+196	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472035	-112.506883	90.000000	1
+197	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472131	-112.506586	90.000000	1
+198	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615702	-112.493943	90.000000	1
+199	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615419	-112.493679	90.000000	1
+200	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472228	-112.506289	90.000000	1
+201	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472325	-112.505992	90.000000	1
+202	0	3	16	0.000000	0.000000	0.000000	0.000000	34.615137	-112.493415	90.000000	1
+203	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614854	-112.493151	90.000000	1
+204	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472422	-112.505695	90.000000	1
+205	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472519	-112.505398	90.000000	1
+206	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614572	-112.492887	90.000000	1
+207	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614289	-112.492622	90.000000	1
+208	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472615	-112.505101	90.000000	1
+209	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472712	-112.504804	90.000000	1
+210	0	3	16	0.000000	0.000000	0.000000	0.000000	34.614006	-112.492358	90.000000	1
+211	0	3	16	0.000000	0.000000	0.000000	0.000000	34.613724	-112.492094	90.000000	1
+212	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472809	-112.504507	90.000000	1
+213	0	3	16	0.000000	0.000000	0.000000	0.000000	34.472906	-112.504210	90.000000	1
+214	0	3	16	0.000000	0.000000	0.000000	0.000000	34.613441	-112.491830	90.000000	1
+215	0	3	16	0.000000	0.000000	0.000000	0.000000	34.613158	-112.491566	90.000000	1
+216	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473003	-112.503912	90.000000	1
+217	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473100	-112.503615	90.000000	1
+218	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612876	-112.491302	90.000000	1
+219	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612593	-112.491038	90.000000	1
+220	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473196	-112.503318	90.000000	1
+221	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473293	-112.503021	90.000000	1
+222	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612311	-112.490773	90.000000	1
+223	0	3	16	0.000000	0.000000	0.000000	0.000000	34.612028	-112.490509	90.000000	1
+224	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473390	-112.502724	90.000000	1
+225	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473487	-112.502427	90.000000	1
+226	0	3	16	0.000000	0.000000	0.000000	0.000000	34.611745	-112.490245	90.000000	1
+227	0	3	16	0.000000	0.000000	0.000000	0.000000	34.611463	-112.489981	90.000000	1
+228	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473584	-112.502130	90.000000	1
+229	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473680	-112.501833	90.000000	1
+230	0	3	16	0.000000	0.000000	0.000000	0.000000	34.611180	-112.489717	90.000000	1
+231	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610897	-112.489453	90.000000	1
+232	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473777	-112.501536	90.000000	1
+233	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473874	-112.501238	90.000000	1
+234	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610615	-112.489189	90.000000	1
+235	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610332	-112.488925	90.000000	1
+236	0	3	16	0.000000	0.000000	0.000000	0.000000	34.473971	-112.500941	90.000000	1
+237	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474068	-112.500644	90.000000	1
+238	0	3	16	0.000000	0.000000	0.000000	0.000000	34.610050	-112.488660	90.000000	1
+239	0	3	16	0.000000	0.000000	0.000000	0.000000	34.609767	-112.488396	90.000000	1
+240	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474165	-112.500347	90.000000	1
+241	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474261	-112.500050	90.000000	1
+242	0	3	16	0.000000	0.000000	0.000000	0.000000	34.609484	-112.488132	90.000000	1
+243	0	3	16	0.000000	0.000000	0.000000	0.000000	34.609202	-112.487868	90.000000	1
+244	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474358	-112.499753	90.000000	1
+245	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474455	-112.499456	90.000000	1
+246	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608919	-112.487604	90.000000	1
+247	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608636	-112.487340	90.000000	1
+248	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474552	-112.499159	90.000000	1
+249	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474649	-112.498862	90.000000	1
+250	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608354	-112.487076	90.000000	1
+251	0	3	16	0.000000	0.000000	0.000000	0.000000	34.608071	-112.486812	90.000000	1
+252	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474745	-112.498565	90.000000	1
+253	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474842	-112.498267	90.000000	1
+254	0	3	16	0.000000	0.000000	0.000000	0.000000	34.607788	-112.486548	90.000000	1
+255	0	3	16	0.000000	0.000000	0.000000	0.000000	34.607506	-112.486283	90.000000	1
+256	0	3	16	0.000000	0.000000	0.000000	0.000000	34.474939	-112.497970	90.000000	1
+257	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475036	-112.497673	90.000000	1
+258	0	3	16	0.000000	0.000000	0.000000	0.000000	34.607223	-112.486019	90.000000	1
+259	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606941	-112.485755	90.000000	1
+260	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475133	-112.497376	90.000000	1
+261	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475229	-112.497079	90.000000	1
+262	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606658	-112.485491	90.000000	1
+263	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606375	-112.485227	90.000000	1
+264	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475326	-112.496782	90.000000	1
+265	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475423	-112.496485	90.000000	1
+266	0	3	16	0.000000	0.000000	0.000000	0.000000	34.606093	-112.484963	90.000000	1
+267	0	3	16	0.000000	0.000000	0.000000	0.000000	34.605810	-112.484699	90.000000	1
+268	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475520	-112.496188	90.000000	1
+269	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475617	-112.495890	90.000000	1
+270	0	3	16	0.000000	0.000000	0.000000	0.000000	34.605527	-112.484435	90.000000	1
+271	0	3	16	0.000000	0.000000	0.000000	0.000000	34.605245	-112.484171	90.000000	1
+272	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475713	-112.495593	90.000000	1
+273	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475810	-112.495296	90.000000	1
+274	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604962	-112.483907	90.000000	1
+275	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604679	-112.483642	90.000000	1
+276	0	3	16	0.000000	0.000000	0.000000	0.000000	34.475907	-112.494999	90.000000	1
+277	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476004	-112.494702	90.000000	1
+278	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604397	-112.483378	90.000000	1
+279	0	3	16	0.000000	0.000000	0.000000	0.000000	34.604114	-112.483114	90.000000	1
+280	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476101	-112.494405	90.000000	1
+281	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476197	-112.494108	90.000000	1
+282	0	3	16	0.000000	0.000000	0.000000	0.000000	34.603832	-112.482850	90.000000	1
+283	0	3	16	0.000000	0.000000	0.000000	0.000000	34.603549	-112.482586	90.000000	1
+284	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476294	-112.493811	90.000000	1
+285	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476391	-112.493513	90.000000	1
+286	0	3	16	0.000000	0.000000	0.000000	0.000000	34.603266	-112.482322	90.000000	1
+287	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602984	-112.482058	90.000000	1
+288	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476488	-112.493216	90.000000	1
+289	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476585	-112.492919	90.000000	1
+290	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602701	-112.481794	90.000000	1
+291	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602418	-112.481530	90.000000	1
+292	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476681	-112.492622	90.000000	1
+293	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476778	-112.492325	90.000000	1
+294	0	3	16	0.000000	0.000000	0.000000	0.000000	34.602136	-112.481266	90.000000	1
+295	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601853	-112.481002	90.000000	1
+296	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476875	-112.492028	90.000000	1
+297	0	3	16	0.000000	0.000000	0.000000	0.000000	34.476972	-112.491731	90.000000	1
+298	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601570	-112.480738	90.000000	1
+299	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601288	-112.480474	90.000000	1
+300	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477069	-112.491434	90.000000	1
+301	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477165	-112.491136	90.000000	1
+302	0	3	16	0.000000	0.000000	0.000000	0.000000	34.601005	-112.480210	90.000000	1
+303	0	3	16	0.000000	0.000000	0.000000	0.000000	34.600722	-112.479945	90.000000	1
+304	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477262	-112.490839	90.000000	1
+305	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477359	-112.490542	90.000000	1
+306	0	3	16	0.000000	0.000000	0.000000	0.000000	34.600440	-112.479681	90.000000	1
+307	0	3	16	0.000000	0.000000	0.000000	0.000000	34.600157	-112.479417	90.000000	1
+308	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477456	-112.490245	90.000000	1
+309	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477552	-112.489948	90.000000	1
+310	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599875	-112.479153	90.000000	1
+311	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599592	-112.478889	90.000000	1
+312	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477649	-112.489651	90.000000	1
+313	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477746	-112.489354	90.000000	1
+314	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599309	-112.478625	90.000000	1
+315	0	3	16	0.000000	0.000000	0.000000	0.000000	34.599027	-112.478361	90.000000	1
+316	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477843	-112.489057	90.000000	1
+317	0	3	16	0.000000	0.000000	0.000000	0.000000	34.477940	-112.488759	90.000000	1
+318	0	3	16	0.000000	0.000000	0.000000	0.000000	34.598744	-112.478097	90.000000	1
+319	0	3	16	0.000000	0.000000	0.000000	0.000000	34.598461	-112.477833	90.000000	1
+320	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478036	-112.488462	90.000000	1
+321	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478133	-112.488165	90.000000	1
+322	0	3	16	0.000000	0.000000	0.000000	0.000000	34.598179	-112.477569	90.000000	1
+323	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597896	-112.477305	90.000000	1
+324	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478230	-112.487868	90.000000	1
+325	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478327	-112.487571	90.000000	1
+326	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597613	-112.477041	90.000000	1
+327	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597331	-112.476777	90.000000	1
+328	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478423	-112.487274	90.000000	1
+329	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478520	-112.486977	90.000000	1
+330	0	3	16	0.000000	0.000000	0.000000	0.000000	34.597048	-112.476513	90.000000	1
+331	0	3	16	0.000000	0.000000	0.000000	0.000000	34.596765	-112.476249	90.000000	1
+332	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478617	-112.486679	90.000000	1
+333	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478714	-112.486382	90.000000	1
+334	0	3	16	0.000000	0.000000	0.000000	0.000000	34.596483	-112.475985	90.000000	1
+335	0	3	16	0.000000	0.000000	0.000000	0.000000	34.596200	-112.475721	90.000000	1
+336	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478811	-112.486085	90.000000	1
+337	0	3	16	0.000000	0.000000	0.000000	0.000000	34.478907	-112.485788	90.000000	1
+338	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595917	-112.475457	90.000000	1
+339	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595635	-112.475193	90.000000	1
+340	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479004	-112.485491	90.000000	1
+341	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479101	-112.485194	90.000000	1
+342	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595352	-112.474929	90.000000	1
+343	0	3	16	0.000000	0.000000	0.000000	0.000000	34.595069	-112.474665	90.000000	1
+344	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479198	-112.484897	90.000000	1
+345	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479294	-112.484599	90.000000	1
+346	0	3	16	0.000000	0.000000	0.000000	0.000000	34.594787	-112.474401	90.000000	1
+347	0	3	16	0.000000	0.000000	0.000000	0.000000	34.594504	-112.474137	90.000000	1
+348	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479391	-112.484302	90.000000	1
+349	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479488	-112.484005	90.000000	1
+350	0	3	16	0.000000	0.000000	0.000000	0.000000	34.594221	-112.473873	90.000000	1
+351	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593939	-112.473609	90.000000	1
+352	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479585	-112.483708	90.000000	1
+353	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479682	-112.483411	90.000000	1
+354	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593656	-112.473345	90.000000	1
+355	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593373	-112.473081	90.000000	1
+356	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479778	-112.483114	90.000000	1
+357	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479875	-112.482817	90.000000	1
+358	0	3	16	0.000000	0.000000	0.000000	0.000000	34.593091	-112.472816	90.000000	1
+359	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592808	-112.472552	90.000000	1
+360	0	3	16	0.000000	0.000000	0.000000	0.000000	34.479972	-112.482519	90.000000	1
+361	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480069	-112.482222	90.000000	1
+362	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592525	-112.472288	90.000000	1
+363	0	3	16	0.000000	0.000000	0.000000	0.000000	34.592243	-112.472024	90.000000	1
+364	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480165	-112.481925	90.000000	1
+365	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480262	-112.481628	90.000000	1
+366	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591960	-112.471760	90.000000	1
+367	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591677	-112.471496	90.000000	1
+368	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480359	-112.481331	90.000000	1
+369	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480456	-112.481034	90.000000	1
+370	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591395	-112.471232	90.000000	1
+371	0	3	16	0.000000	0.000000	0.000000	0.000000	34.591112	-112.470968	90.000000	1
+372	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480552	-112.480736	90.000000	1
+373	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480649	-112.480439	90.000000	1
+374	0	3	16	0.000000	0.000000	0.000000	0.000000	34.590829	-112.470704	90.000000	1
+375	0	3	16	0.000000	0.000000	0.000000	0.000000	34.590547	-112.470440	90.000000	1
+376	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480746	-112.480142	90.000000	1
+377	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480843	-112.479845	90.000000	1
+378	0	3	16	0.000000	0.000000	0.000000	0.000000	34.590264	-112.470176	90.000000	1
+379	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589981	-112.469912	90.000000	1
+380	0	3	16	0.000000	0.000000	0.000000	0.000000	34.480939	-112.479548	90.000000	1
+381	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481036	-112.479251	90.000000	1
+382	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589699	-112.469648	90.000000	1
+383	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589416	-112.469385	90.000000	1
+384	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481133	-112.478954	90.000000	1
+385	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481230	-112.478656	90.000000	1
+386	0	3	16	0.000000	0.000000	0.000000	0.000000	34.589133	-112.469121	90.000000	1
+387	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588851	-112.468857	90.000000	1
+388	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481327	-112.478359	90.000000	1
+389	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481423	-112.478062	90.000000	1
+390	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588568	-112.468593	90.000000	1
+391	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588285	-112.468329	90.000000	1
+392	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481520	-112.477765	90.000000	1
+393	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481617	-112.477468	90.000000	1
+394	0	3	16	0.000000	0.000000	0.000000	0.000000	34.588003	-112.468065	90.000000	1
+395	0	3	16	0.000000	0.000000	0.000000	0.000000	34.587720	-112.467801	90.000000	1
+396	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481714	-112.477171	90.000000	1
+397	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481810	-112.476873	90.000000	1
+398	0	3	16	0.000000	0.000000	0.000000	0.000000	34.587437	-112.467537	90.000000	1
+399	0	3	16	0.000000	0.000000	0.000000	0.000000	34.587155	-112.467273	90.000000	1
+400	0	3	16	0.000000	0.000000	0.000000	0.000000	34.481907	-112.476576	90.000000	1
+401	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482004	-112.476279	90.000000	1
+402	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586872	-112.467009	90.000000	1
+403	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586589	-112.466745	90.000000	1
+404	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482101	-112.475982	90.000000	1
+405	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482197	-112.475685	90.000000	1
+406	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586307	-112.466481	90.000000	1
+407	0	3	16	0.000000	0.000000	0.000000	0.000000	34.586024	-112.466217	90.000000	1
+408	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482294	-112.475388	90.000000	1
+409	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482391	-112.475090	90.000000	1
+410	0	3	16	0.000000	0.000000	0.000000	0.000000	34.585741	-112.465953	90.000000	1
+411	0	3	16	0.000000	0.000000	0.000000	0.000000	34.585458	-112.465689	90.000000	1
+412	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482488	-112.474793	90.000000	1
+413	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482584	-112.474496	90.000000	1
+414	0	3	16	0.000000	0.000000	0.000000	0.000000	34.585176	-112.465425	90.000000	1
+415	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584893	-112.465161	90.000000	1
+416	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482681	-112.474199	90.000000	1
+417	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482778	-112.473902	90.000000	1
+418	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584610	-112.464897	90.000000	1
+419	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584328	-112.464633	90.000000	1
+420	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482875	-112.473605	90.000000	1
+421	0	3	16	0.000000	0.000000	0.000000	0.000000	34.482971	-112.473307	90.000000	1
+422	0	3	16	0.000000	0.000000	0.000000	0.000000	34.584045	-112.464369	90.000000	1
+423	0	3	16	0.000000	0.000000	0.000000	0.000000	34.583762	-112.464105	90.000000	1
+424	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483068	-112.473010	90.000000	1
+425	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483165	-112.472713	90.000000	1
+426	0	3	16	0.000000	0.000000	0.000000	0.000000	34.583480	-112.463841	90.000000	1
+427	0	3	16	0.000000	0.000000	0.000000	0.000000	34.583197	-112.463577	90.000000	1
+428	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483262	-112.472416	90.000000	1
+429	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483358	-112.472119	90.000000	1
+430	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582914	-112.463313	90.000000	1
+431	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582632	-112.463049	90.000000	1
+432	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483455	-112.471821	90.000000	1
+433	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483552	-112.471524	90.000000	1
+434	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582349	-112.462785	90.000000	1
+435	0	3	16	0.000000	0.000000	0.000000	0.000000	34.582066	-112.462521	90.000000	1
+436	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483649	-112.471227	90.000000	1
+437	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483745	-112.470930	90.000000	1
+438	0	3	16	0.000000	0.000000	0.000000	0.000000	34.581784	-112.462257	90.000000	1
+439	0	3	16	0.000000	0.000000	0.000000	0.000000	34.581501	-112.461994	90.000000	1
+440	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483842	-112.470633	90.000000	1
+441	0	3	16	0.000000	0.000000	0.000000	0.000000	34.483939	-112.470336	90.000000	1
+442	0	3	16	0.000000	0.000000	0.000000	0.000000	34.581218	-112.461730	90.000000	1
+443	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580935	-112.461466	90.000000	1
+444	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484035	-112.470038	90.000000	1
+445	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484132	-112.469741	90.000000	1
+446	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580653	-112.461202	90.000000	1
+447	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580370	-112.460938	90.000000	1
+448	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484229	-112.469444	90.000000	1
+449	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484326	-112.469147	90.000000	1
+450	0	3	16	0.000000	0.000000	0.000000	0.000000	34.580087	-112.460674	90.000000	1
+451	0	3	16	0.000000	0.000000	0.000000	0.000000	34.579805	-112.460410	90.000000	1
+452	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484422	-112.468850	90.000000	1
+453	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484519	-112.468552	90.000000	1
+454	0	3	16	0.000000	0.000000	0.000000	0.000000	34.579522	-112.460146	90.000000	1
+455	0	3	16	0.000000	0.000000	0.000000	0.000000	34.579239	-112.459882	90.000000	1
+456	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484616	-112.468255	90.000000	1
+457	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484713	-112.467958	90.000000	1
+458	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578957	-112.459618	90.000000	1
+459	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578674	-112.459354	90.000000	1
+460	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484809	-112.467661	90.000000	1
+461	0	3	16	0.000000	0.000000	0.000000	0.000000	34.484906	-112.467364	90.000000	1
+462	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578391	-112.459090	90.000000	1
+463	0	3	16	0.000000	0.000000	0.000000	0.000000	34.578109	-112.458826	90.000000	1
+464	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485003	-112.467067	90.000000	1
+465	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485100	-112.466769	90.000000	1
+466	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577826	-112.458563	90.000000	1
+467	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577543	-112.458299	90.000000	1
+468	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485196	-112.466472	90.000000	1
+469	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485293	-112.466175	90.000000	1
+470	0	3	16	0.000000	0.000000	0.000000	0.000000	34.577260	-112.458035	90.000000	1
+471	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576978	-112.457771	90.000000	1
+472	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485390	-112.465878	90.000000	1
+473	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485486	-112.465581	90.000000	1
+474	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576695	-112.457507	90.000000	1
+475	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576412	-112.457243	90.000000	1
+476	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485583	-112.465283	90.000000	1
+477	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485680	-112.464986	90.000000	1
+478	0	3	16	0.000000	0.000000	0.000000	0.000000	34.576130	-112.456979	90.000000	1
+479	0	3	16	0.000000	0.000000	0.000000	0.000000	34.575847	-112.456715	90.000000	1
+480	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485777	-112.464689	90.000000	1
+481	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485873	-112.464392	90.000000	1
+482	0	3	16	0.000000	0.000000	0.000000	0.000000	34.575564	-112.456451	90.000000	1
+483	0	3	16	0.000000	0.000000	0.000000	0.000000	34.575281	-112.456187	90.000000	1
+484	0	3	16	0.000000	0.000000	0.000000	0.000000	34.485970	-112.464095	90.000000	1
+485	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486067	-112.463797	90.000000	1
+486	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574999	-112.455923	90.000000	1
+487	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574716	-112.455660	90.000000	1
+488	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486164	-112.463500	90.000000	1
+489	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486260	-112.463203	90.000000	1
+490	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574433	-112.455396	90.000000	1
+491	0	3	16	0.000000	0.000000	0.000000	0.000000	34.574151	-112.455132	90.000000	1
+492	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486357	-112.462906	90.000000	1
+493	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486454	-112.462609	90.000000	1
+494	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573868	-112.454868	90.000000	1
+495	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573585	-112.454604	90.000000	1
+496	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486550	-112.462311	90.000000	1
+497	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486647	-112.462014	90.000000	1
+498	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573303	-112.454340	90.000000	1
+499	0	3	16	0.000000	0.000000	0.000000	0.000000	34.573020	-112.454076	90.000000	1
+500	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486744	-112.461717	90.000000	1
+501	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486841	-112.461420	90.000000	1
+502	0	3	16	0.000000	0.000000	0.000000	0.000000	34.572737	-112.453812	90.000000	1
+503	0	3	16	0.000000	0.000000	0.000000	0.000000	34.572454	-112.453548	90.000000	1
+504	0	3	16	0.000000	0.000000	0.000000	0.000000	34.486937	-112.461123	90.000000	1
+505	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487034	-112.460825	90.000000	1
+506	0	3	16	0.000000	0.000000	0.000000	0.000000	34.572172	-112.453285	90.000000	1
+507	0	3	16	0.000000	0.000000	0.000000	0.000000	34.571889	-112.453021	90.000000	1
+508	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487131	-112.460528	90.000000	1
+509	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487227	-112.460231	90.000000	1
+510	0	3	16	0.000000	0.000000	0.000000	0.000000	34.571606	-112.452757	90.000000	1
+511	0	3	16	0.000000	0.000000	0.000000	0.000000	34.571250	-112.452500	90.000000	1
+512	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487324	-112.459934	90.000000	1
+513	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487421	-112.459637	90.000000	1
+514	0	3	16	0.000000	0.000000	0.000000	0.000000	34.570815	-112.452249	90.000000	1
+515	0	3	16	0.000000	0.000000	0.000000	0.000000	34.570381	-112.451999	90.000000	1
+516	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487518	-112.459339	90.000000	1
+517	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487614	-112.459042	90.000000	1
+518	0	3	16	0.000000	0.000000	0.000000	0.000000	34.569946	-112.451748	90.000000	1
+519	0	3	16	0.000000	0.000000	0.000000	0.000000	34.569512	-112.451498	90.000000	1
+520	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487711	-112.458745	90.000000	1
+521	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487808	-112.458448	90.000000	1
+522	0	3	16	0.000000	0.000000	0.000000	0.000000	34.569077	-112.451247	90.000000	1
+523	0	3	16	0.000000	0.000000	0.000000	0.000000	34.568643	-112.450997	90.000000	1
+524	0	3	16	0.000000	0.000000	0.000000	0.000000	34.487904	-112.458151	90.000000	1
+525	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488001	-112.457853	90.000000	1
+526	0	3	16	0.000000	0.000000	0.000000	0.000000	34.568208	-112.450747	90.000000	1
+527	0	3	16	0.000000	0.000000	0.000000	0.000000	34.567774	-112.450496	90.000000	1
+528	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488098	-112.457556	90.000000	1
+529	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488195	-112.457259	90.000000	1
+530	0	3	16	0.000000	0.000000	0.000000	0.000000	34.567339	-112.450246	90.000000	1
+531	0	3	16	0.000000	0.000000	0.000000	0.000000	34.566905	-112.449995	90.000000	1
+532	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488291	-112.456962	90.000000	1
+533	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488388	-112.456665	90.000000	1
+534	0	3	16	0.000000	0.000000	0.000000	0.000000	34.566470	-112.449745	90.000000	1
+535	0	3	16	0.000000	0.000000	0.000000	0.000000	34.566036	-112.449495	90.000000	1
+536	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488485	-112.456367	90.000000	1
+537	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488581	-112.456070	90.000000	1
+538	0	3	16	0.000000	0.000000	0.000000	0.000000	34.565601	-112.449244	90.000000	1
+539	0	3	16	0.000000	0.000000	0.000000	0.000000	34.565167	-112.448994	90.000000	1
+540	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488678	-112.455773	90.000000	1
+541	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488775	-112.455476	90.000000	1
+542	0	3	16	0.000000	0.000000	0.000000	0.000000	34.564732	-112.448744	90.000000	1
+543	0	3	16	0.000000	0.000000	0.000000	0.000000	34.564298	-112.448493	90.000000	1
+544	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488871	-112.455178	90.000000	1
+545	0	3	16	0.000000	0.000000	0.000000	0.000000	34.488968	-112.454881	90.000000	1
+546	0	3	16	0.000000	0.000000	0.000000	0.000000	34.563863	-112.448243	90.000000	1
+547	0	3	16	0.000000	0.000000	0.000000	0.000000	34.563429	-112.447992	90.000000	1
+548	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489065	-112.454584	90.000000	1
+549	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489162	-112.454287	90.000000	1
+550	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562994	-112.447742	90.000000	1
+551	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562560	-112.447492	90.000000	1
+552	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489258	-112.453990	90.000000	1
+553	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489355	-112.453692	90.000000	1
+554	0	3	16	0.000000	0.000000	0.000000	0.000000	34.562125	-112.447241	90.000000	1
+555	0	3	16	0.000000	0.000000	0.000000	0.000000	34.561691	-112.446991	90.000000	1
+556	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489452	-112.453395	90.000000	1
+557	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489548	-112.453098	90.000000	1
+558	0	3	16	0.000000	0.000000	0.000000	0.000000	34.561256	-112.446741	90.000000	1
+559	0	3	16	0.000000	0.000000	0.000000	0.000000	34.560822	-112.446490	90.000000	1
+560	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489645	-112.452801	90.000000	1
+561	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489742	-112.452503	90.000000	1
+562	0	3	16	0.000000	0.000000	0.000000	0.000000	34.560387	-112.446240	90.000000	1
+563	0	3	16	0.000000	0.000000	0.000000	0.000000	34.559953	-112.445990	90.000000	1
+564	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489838	-112.452206	90.000000	1
+565	0	3	16	0.000000	0.000000	0.000000	0.000000	34.489935	-112.451909	90.000000	1
+566	0	3	16	0.000000	0.000000	0.000000	0.000000	34.559518	-112.445739	90.000000	1
+567	0	3	16	0.000000	0.000000	0.000000	0.000000	34.559084	-112.445489	90.000000	1
+568	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490032	-112.451612	90.000000	1
+569	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490129	-112.451315	90.000000	1
+570	0	3	16	0.000000	0.000000	0.000000	0.000000	34.558649	-112.445239	90.000000	1
+571	0	3	16	0.000000	0.000000	0.000000	0.000000	34.558215	-112.444988	90.000000	1
+572	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490225	-112.451017	90.000000	1
+573	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490322	-112.450720	90.000000	1
+574	0	3	16	0.000000	0.000000	0.000000	0.000000	34.557780	-112.444738	90.000000	1
+575	0	3	16	0.000000	0.000000	0.000000	0.000000	34.557346	-112.444488	90.000000	1
+576	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490419	-112.450423	90.000000	1
+577	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490515	-112.450126	90.000000	1
+578	0	3	16	0.000000	0.000000	0.000000	0.000000	34.556911	-112.444237	90.000000	1
+579	0	3	16	0.000000	0.000000	0.000000	0.000000	34.556477	-112.443987	90.000000	1
+580	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490612	-112.449828	90.000000	1
+581	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490709	-112.449531	90.000000	1
+582	0	3	16	0.000000	0.000000	0.000000	0.000000	34.556042	-112.443737	90.000000	1
+583	0	3	16	0.000000	0.000000	0.000000	0.000000	34.555608	-112.443486	90.000000	1
+584	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490805	-112.449234	90.000000	1
+585	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490902	-112.448937	90.000000	1
+586	0	3	16	0.000000	0.000000	0.000000	0.000000	34.555173	-112.443236	90.000000	1
+587	0	3	16	0.000000	0.000000	0.000000	0.000000	34.554739	-112.442986	90.000000	1
+588	0	3	16	0.000000	0.000000	0.000000	0.000000	34.490999	-112.448640	90.000000	1
+589	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491095	-112.448342	90.000000	1
+590	0	3	16	0.000000	0.000000	0.000000	0.000000	34.554304	-112.442735	90.000000	1
+591	0	3	16	0.000000	0.000000	0.000000	0.000000	34.553870	-112.442485	90.000000	1
+592	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491192	-112.448045	90.000000	1
+593	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491289	-112.447748	90.000000	1
+594	0	3	16	0.000000	0.000000	0.000000	0.000000	34.553435	-112.442235	90.000000	1
+595	0	3	16	0.000000	0.000000	0.000000	0.000000	34.553001	-112.441984	90.000000	1
+596	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491385	-112.447451	90.000000	1
+597	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491482	-112.447153	90.000000	1
+598	0	3	16	0.000000	0.000000	0.000000	0.000000	34.552566	-112.441734	90.000000	1
+599	0	3	16	0.000000	0.000000	0.000000	0.000000	34.552132	-112.441484	90.000000	1
+600	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491579	-112.446856	90.000000	1
+601	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491676	-112.446559	90.000000	1
+602	0	3	16	0.000000	0.000000	0.000000	0.000000	34.551697	-112.441233	90.000000	1
+603	0	3	16	0.000000	0.000000	0.000000	0.000000	34.551263	-112.440983	90.000000	1
+604	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491772	-112.446262	90.000000	1
+605	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491869	-112.445964	90.000000	1
+606	0	3	16	0.000000	0.000000	0.000000	0.000000	34.550828	-112.440733	90.000000	1
+607	0	3	16	0.000000	0.000000	0.000000	0.000000	34.550394	-112.440483	90.000000	1
+608	0	3	16	0.000000	0.000000	0.000000	0.000000	34.491966	-112.445667	90.000000	1
+609	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492062	-112.445370	90.000000	1
+610	0	3	16	0.000000	0.000000	0.000000	0.000000	34.549959	-112.440232	90.000000	1
+611	0	3	16	0.000000	0.000000	0.000000	0.000000	34.549525	-112.439982	90.000000	1
+612	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492159	-112.445073	90.000000	1
+613	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492256	-112.444775	90.000000	1
+614	0	3	16	0.000000	0.000000	0.000000	0.000000	34.549090	-112.439732	90.000000	1
+615	0	3	16	0.000000	0.000000	0.000000	0.000000	34.548656	-112.439481	90.000000	1
+616	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492352	-112.444478	90.000000	1
+617	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492449	-112.444181	90.000000	1
+618	0	3	16	0.000000	0.000000	0.000000	0.000000	34.548221	-112.439231	90.000000	1
+619	0	3	16	0.000000	0.000000	0.000000	0.000000	34.547787	-112.438981	90.000000	1
+620	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492546	-112.443884	90.000000	1
+621	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492642	-112.443586	90.000000	1
+622	0	3	16	0.000000	0.000000	0.000000	0.000000	34.547352	-112.438731	90.000000	1
+623	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546918	-112.438480	90.000000	1
+624	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492739	-112.443289	90.000000	1
+625	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492836	-112.442992	90.000000	1
+626	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546483	-112.438230	90.000000	1
+627	0	3	16	0.000000	0.000000	0.000000	0.000000	34.546049	-112.437980	90.000000	1
+628	0	3	16	0.000000	0.000000	0.000000	0.000000	34.492932	-112.442695	90.000000	1
+629	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493029	-112.442398	90.000000	1
+630	0	3	16	0.000000	0.000000	0.000000	0.000000	34.545614	-112.437730	90.000000	1
+631	0	3	16	0.000000	0.000000	0.000000	0.000000	34.545180	-112.437479	90.000000	1
+632	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493126	-112.442100	90.000000	1
+633	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493222	-112.441803	90.000000	1
+634	0	3	16	0.000000	0.000000	0.000000	0.000000	34.544745	-112.437229	90.000000	1
+635	0	3	16	0.000000	0.000000	0.000000	0.000000	34.544311	-112.436979	90.000000	1
+636	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493319	-112.441506	90.000000	1
+637	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493416	-112.441209	90.000000	1
+638	0	3	16	0.000000	0.000000	0.000000	0.000000	34.543876	-112.436728	90.000000	1
+639	0	3	16	0.000000	0.000000	0.000000	0.000000	34.543442	-112.436478	90.000000	1
+640	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493512	-112.440911	90.000000	1
+641	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493609	-112.440614	90.000000	1
+642	0	3	16	0.000000	0.000000	0.000000	0.000000	34.543007	-112.436228	90.000000	1
+643	0	3	16	0.000000	0.000000	0.000000	0.000000	34.542573	-112.435978	90.000000	1
+644	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493706	-112.440317	90.000000	1
+645	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493802	-112.440020	90.000000	1
+646	0	3	16	0.000000	0.000000	0.000000	0.000000	34.542138	-112.435728	90.000000	1
+647	0	3	16	0.000000	0.000000	0.000000	0.000000	34.541704	-112.435477	90.000000	1
+648	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493899	-112.439722	90.000000	1
+649	0	3	16	0.000000	0.000000	0.000000	0.000000	34.493996	-112.439425	90.000000	1
+650	0	3	16	0.000000	0.000000	0.000000	0.000000	34.541269	-112.435227	90.000000	1
+651	0	3	16	0.000000	0.000000	0.000000	0.000000	34.540834	-112.434977	90.000000	1
+652	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494092	-112.439128	90.000000	1
+653	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494189	-112.438831	90.000000	1
+654	0	3	16	0.000000	0.000000	0.000000	0.000000	34.540400	-112.434727	90.000000	1
+655	0	3	16	0.000000	0.000000	0.000000	0.000000	34.539965	-112.434476	90.000000	1
+656	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494286	-112.438533	90.000000	1
+657	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494382	-112.438236	90.000000	1
+658	0	3	16	0.000000	0.000000	0.000000	0.000000	34.539531	-112.434226	90.000000	1
+659	0	3	16	0.000000	0.000000	0.000000	0.000000	34.539096	-112.433976	90.000000	1
+660	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494479	-112.437939	90.000000	1
+661	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494576	-112.437641	90.000000	1
+662	0	3	16	0.000000	0.000000	0.000000	0.000000	34.538662	-112.433726	90.000000	1
+663	0	3	16	0.000000	0.000000	0.000000	0.000000	34.538227	-112.433475	90.000000	1
+664	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494672	-112.437344	90.000000	1
+665	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494769	-112.437047	90.000000	1
+666	0	3	16	0.000000	0.000000	0.000000	0.000000	34.537793	-112.433225	90.000000	1
+667	0	3	16	0.000000	0.000000	0.000000	0.000000	34.537358	-112.432975	90.000000	1
+668	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494866	-112.436750	90.000000	1
+669	0	3	16	0.000000	0.000000	0.000000	0.000000	34.494962	-112.436452	90.000000	1
+670	0	3	16	0.000000	0.000000	0.000000	0.000000	34.536924	-112.432725	90.000000	1
+671	0	3	16	0.000000	0.000000	0.000000	0.000000	34.536489	-112.432475	90.000000	1
+672	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495059	-112.436155	90.000000	1
+673	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495156	-112.435858	90.000000	1
+674	0	3	16	0.000000	0.000000	0.000000	0.000000	34.536055	-112.432224	90.000000	1
+675	0	3	16	0.000000	0.000000	0.000000	0.000000	34.535620	-112.431974	90.000000	1
+676	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495252	-112.435561	90.000000	1
+677	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495349	-112.435263	90.000000	1
+678	0	3	16	0.000000	0.000000	0.000000	0.000000	34.535186	-112.431724	90.000000	1
+679	0	3	16	0.000000	0.000000	0.000000	0.000000	34.534751	-112.431474	90.000000	1
+680	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495446	-112.434966	90.000000	1
+681	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495542	-112.434669	90.000000	1
+682	0	3	16	0.000000	0.000000	0.000000	0.000000	34.534317	-112.431224	90.000000	1
+683	0	3	16	0.000000	0.000000	0.000000	0.000000	34.533882	-112.430973	90.000000	1
+684	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495639	-112.434372	90.000000	1
+685	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495736	-112.434074	90.000000	1
+686	0	3	16	0.000000	0.000000	0.000000	0.000000	34.533447	-112.430723	90.000000	1
+687	0	3	16	0.000000	0.000000	0.000000	0.000000	34.533013	-112.430473	90.000000	1
+688	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495832	-112.433777	90.000000	1
+689	0	3	16	0.000000	0.000000	0.000000	0.000000	34.495929	-112.433480	90.000000	1
+690	0	3	16	0.000000	0.000000	0.000000	0.000000	34.532578	-112.430223	90.000000	1
+691	0	3	16	0.000000	0.000000	0.000000	0.000000	34.532144	-112.429973	90.000000	1
+692	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496026	-112.433183	90.000000	1
+693	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496122	-112.432885	90.000000	1
+694	0	3	16	0.000000	0.000000	0.000000	0.000000	34.531709	-112.429723	90.000000	1
+695	0	3	16	0.000000	0.000000	0.000000	0.000000	34.531275	-112.429472	90.000000	1
+696	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496219	-112.432588	90.000000	1
+697	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496315	-112.432291	90.000000	1
+698	0	3	16	0.000000	0.000000	0.000000	0.000000	34.530840	-112.429222	90.000000	1
+699	0	3	16	0.000000	0.000000	0.000000	0.000000	34.530406	-112.428972	90.000000	1
+700	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496412	-112.431993	90.000000	1
+701	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496509	-112.431696	90.000000	1
+702	0	3	16	0.000000	0.000000	0.000000	0.000000	34.529971	-112.428722	90.000000	1
+703	0	3	16	0.000000	0.000000	0.000000	0.000000	34.529537	-112.428472	90.000000	1
+704	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496605	-112.431399	90.000000	1
+705	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496702	-112.431102	90.000000	1
+706	0	3	16	0.000000	0.000000	0.000000	0.000000	34.529102	-112.428222	90.000000	1
+707	0	3	16	0.000000	0.000000	0.000000	0.000000	34.528668	-112.427971	90.000000	1
+708	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496799	-112.430804	90.000000	1
+709	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496895	-112.430507	90.000000	1
+710	0	3	16	0.000000	0.000000	0.000000	0.000000	34.528233	-112.427721	90.000000	1
+711	0	3	16	0.000000	0.000000	0.000000	0.000000	34.527798	-112.427471	90.000000	1
+712	0	3	16	0.000000	0.000000	0.000000	0.000000	34.496992	-112.430210	90.000000	1
+713	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497089	-112.429913	90.000000	1
+714	0	3	16	0.000000	0.000000	0.000000	0.000000	34.527364	-112.427221	90.000000	1
+715	0	3	16	0.000000	0.000000	0.000000	0.000000	34.526929	-112.426971	90.000000	1
+716	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497185	-112.429615	90.000000	1
+717	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497282	-112.429318	90.000000	1
+718	0	3	16	0.000000	0.000000	0.000000	0.000000	34.526495	-112.426721	90.000000	1
+719	0	3	16	0.000000	0.000000	0.000000	0.000000	34.526060	-112.426470	90.000000	1
+720	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497379	-112.429021	90.000000	1
+721	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497475	-112.428723	90.000000	1
+722	0	3	16	0.000000	0.000000	0.000000	0.000000	34.525626	-112.426220	90.000000	1
+723	0	3	16	0.000000	0.000000	0.000000	0.000000	34.525191	-112.425970	90.000000	1
+724	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497572	-112.428426	90.000000	1
+725	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497668	-112.428129	90.000000	1
+726	0	3	16	0.000000	0.000000	0.000000	0.000000	34.524757	-112.425720	90.000000	1
+727	0	3	16	0.000000	0.000000	0.000000	0.000000	34.524322	-112.425470	90.000000	1
+728	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497765	-112.427832	90.000000	1
+729	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497862	-112.427534	90.000000	1
+730	0	3	16	0.000000	0.000000	0.000000	0.000000	34.523888	-112.425220	90.000000	1
+731	0	3	16	0.000000	0.000000	0.000000	0.000000	34.523453	-112.424970	90.000000	1
+732	0	3	16	0.000000	0.000000	0.000000	0.000000	34.497958	-112.427237	90.000000	1
+733	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498055	-112.426940	90.000000	1
+734	0	3	16	0.000000	0.000000	0.000000	0.000000	34.523019	-112.424720	90.000000	1
+735	0	3	16	0.000000	0.000000	0.000000	0.000000	34.522584	-112.424469	90.000000	1
+736	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498152	-112.426642	90.000000	1
+737	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498248	-112.426345	90.000000	1
+738	0	3	16	0.000000	0.000000	0.000000	0.000000	34.522149	-112.424219	90.000000	1
+739	0	3	16	0.000000	0.000000	0.000000	0.000000	34.521715	-112.423969	90.000000	1
+740	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498345	-112.426048	90.000000	1
+741	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498442	-112.425751	90.000000	1
+742	0	3	16	0.000000	0.000000	0.000000	0.000000	34.521280	-112.423719	90.000000	1
+743	0	3	16	0.000000	0.000000	0.000000	0.000000	34.520846	-112.423469	90.000000	1
+744	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498538	-112.425453	90.000000	1
+745	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498635	-112.425156	90.000000	1
+746	0	3	16	0.000000	0.000000	0.000000	0.000000	34.520411	-112.423219	90.000000	1
+747	0	3	16	0.000000	0.000000	0.000000	0.000000	34.519977	-112.422969	90.000000	1
+748	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498731	-112.424859	90.000000	1
+749	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498828	-112.424561	90.000000	1
+750	0	3	16	0.000000	0.000000	0.000000	0.000000	34.519542	-112.422719	90.000000	1
+751	0	3	16	0.000000	0.000000	0.000000	0.000000	34.519108	-112.422469	90.000000	1
+752	0	3	16	0.000000	0.000000	0.000000	0.000000	34.498925	-112.424264	90.000000	1
+753	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499021	-112.423967	90.000000	1
+754	0	3	16	0.000000	0.000000	0.000000	0.000000	34.518673	-112.422218	90.000000	1
+755	0	3	16	0.000000	0.000000	0.000000	0.000000	34.518238	-112.421968	90.000000	1
+756	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499118	-112.423670	90.000000	1
+757	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499215	-112.423372	90.000000	1
+758	0	3	16	0.000000	0.000000	0.000000	0.000000	34.517804	-112.421718	90.000000	1
+759	0	3	16	0.000000	0.000000	0.000000	0.000000	34.517369	-112.421468	90.000000	1
+760	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499311	-112.423075	90.000000	1
+761	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499408	-112.422778	90.000000	1
+762	0	3	16	0.000000	0.000000	0.000000	0.000000	34.516935	-112.421218	90.000000	1
+763	0	3	16	0.000000	0.000000	0.000000	0.000000	34.516500	-112.420968	90.000000	1
+764	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499504	-112.422480	90.000000	1
+765	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499601	-112.422183	90.000000	1
+766	0	3	16	0.000000	0.000000	0.000000	0.000000	34.516066	-112.420718	90.000000	1
+767	0	3	16	0.000000	0.000000	0.000000	0.000000	34.515631	-112.420468	90.000000	1
+768	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499698	-112.421886	90.000000	1
+769	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499794	-112.421588	90.000000	1
+770	0	3	16	0.000000	0.000000	0.000000	0.000000	34.515197	-112.420218	90.000000	1
+771	0	3	16	0.000000	0.000000	0.000000	0.000000	34.514762	-112.419968	90.000000	1
+772	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499891	-112.421291	90.000000	1
+773	0	3	16	0.000000	0.000000	0.000000	0.000000	34.499988	-112.420994	90.000000	1
+774	0	3	16	0.000000	0.000000	0.000000	0.000000	34.514327	-112.419718	90.000000	1
+775	0	3	16	0.000000	0.000000	0.000000	0.000000	34.513893	-112.419468	90.000000	1
+776	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500084	-112.420697	90.000000	1
+777	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500181	-112.420399	90.000000	1
+778	0	3	16	0.000000	0.000000	0.000000	0.000000	34.513458	-112.419218	90.000000	1
+779	0	3	16	0.000000	0.000000	0.000000	0.000000	34.513024	-112.418967	90.000000	1
+780	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500277	-112.420102	90.000000	1
+781	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500374	-112.419805	90.000000	1
+782	0	3	16	0.000000	0.000000	0.000000	0.000000	34.512589	-112.418717	90.000000	1
+783	0	3	16	0.000000	0.000000	0.000000	0.000000	34.512155	-112.418467	90.000000	1
+784	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500471	-112.419507	90.000000	1
+785	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500567	-112.419210	90.000000	1
+786	0	3	16	0.000000	0.000000	0.000000	0.000000	34.511720	-112.418217	90.000000	1
+787	0	3	16	0.000000	0.000000	0.000000	0.000000	34.511285	-112.417967	90.000000	1
+788	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500664	-112.418913	90.000000	1
+789	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500761	-112.418615	90.000000	1
+790	0	3	16	0.000000	0.000000	0.000000	0.000000	34.510851	-112.417717	90.000000	1
+791	0	3	16	0.000000	0.000000	0.000000	0.000000	34.510416	-112.417467	90.000000	1
+792	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500857	-112.418318	90.000000	1
+793	0	3	16	0.000000	0.000000	0.000000	0.000000	34.500954	-112.418021	90.000000	1
+794	0	3	16	0.000000	0.000000	0.000000	0.000000	34.509982	-112.417217	90.000000	1
+795	0	3	16	0.000000	0.000000	0.000000	0.000000	34.509547	-112.416967	90.000000	1
+796	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501050	-112.417724	90.000000	1
+797	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501147	-112.417426	90.000000	1
+798	0	3	16	0.000000	0.000000	0.000000	0.000000	34.509113	-112.416717	90.000000	1
+799	0	3	16	0.000000	0.000000	0.000000	0.000000	34.508678	-112.416467	90.000000	1
+800	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501244	-112.417129	90.000000	1
+801	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501340	-112.416832	90.000000	1
+802	0	3	16	0.000000	0.000000	0.000000	0.000000	34.508244	-112.416217	90.000000	1
+803	0	3	16	0.000000	0.000000	0.000000	0.000000	34.507809	-112.415967	90.000000	1
+804	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501437	-112.416534	90.000000	1
+805	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501533	-112.416237	90.000000	1
+806	0	3	16	0.000000	0.000000	0.000000	0.000000	34.507374	-112.415717	90.000000	1
+807	0	3	16	0.000000	0.000000	0.000000	0.000000	34.506940	-112.415467	90.000000	1
+808	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501630	-112.415940	90.000000	1
+809	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501727	-112.415642	90.000000	1
+810	0	3	16	0.000000	0.000000	0.000000	0.000000	34.506505	-112.415217	90.000000	1
+811	0	3	16	0.000000	0.000000	0.000000	0.000000	34.506071	-112.414967	90.000000	1
+812	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501823	-112.415345	90.000000	1
+813	0	3	16	0.000000	0.000000	0.000000	0.000000	34.501920	-112.415048	90.000000	1
+814	0	3	16	0.000000	0.000000	0.000000	0.000000	34.505636	-112.414717	90.000000	1
+815	0	3	16	0.000000	0.000000	0.000000	0.000000	34.505202	-112.414467	90.000000	1
+816	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502016	-112.414750	90.000000	1
+817	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502113	-112.414453	90.000000	1
+818	0	3	16	0.000000	0.000000	0.000000	0.000000	34.504767	-112.414217	90.000000	1
+819	0	3	16	0.000000	0.000000	0.000000	0.000000	34.504332	-112.413967	90.000000	1
+820	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502210	-112.414156	90.000000	1
+821	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502306	-112.413859	90.000000	1
+822	0	3	16	0.000000	0.000000	0.000000	0.000000	34.503898	-112.413717	90.000000	1
+823	0	3	16	0.000000	0.000000	0.000000	0.000000	34.503463	-112.413467	90.000000	1
+824	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502403	-112.413561	90.000000	1
+825	0	3	16	0.000000	0.000000	0.000000	0.000000	34.502499	-112.413264	90.000000	1
+826	0	3	16	0.000000	0.000000	0.000000	0.000000	34.503029	-112.413217	90.000000	1
+827	0	3	206	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
+828	0	3	20	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
diff --git a/test/MissionManager/CMakeLists.txt b/test/MissionManager/CMakeLists.txt
index d7e61bdb12f5..a8e711e5e537 100644
--- a/test/MissionManager/CMakeLists.txt
+++ b/test/MissionManager/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Mission Manager Unit Tests
+# Tests for mission planning, waypoints, and flight plan management
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         CameraCalcTest.cc CameraCalcTest.h
@@ -27,6 +32,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} "MissionManagerTest_res"
     PREFIX "/unittest"
     FILES
@@ -57,8 +65,9 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "MissionManagerTest_res1"
         MissionCommandTreeEditorTestWindow.qml
 )
 
+# TODO: Enable QML module for mission manager tests
 # qt_add_library(MissionManagerTestModule STATIC)
-
+#
 # qt_add_qml_module(MissionManagerTestModule
 #     URI QGroundControl.Test.MissionManager
 #     VERSION 1.0
@@ -67,5 +76,5 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "MissionManagerTest_res1"
 #         MissionCommandTreeEditorTestWindow.qml
 #     NO_PLUGIN
 # )
-
+#
 # target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE MissionManagerTestModule)
diff --git a/test/MissionManager/CameraCalcTest.cc b/test/MissionManager/CameraCalcTest.cc
index 116d329ae148..13cf3c6ab43b 100644
--- a/test/MissionManager/CameraCalcTest.cc
+++ b/test/MissionManager/CameraCalcTest.cc
@@ -36,7 +36,7 @@ void CameraCalcTest::init(void)
 void CameraCalcTest::cleanup(void)
 {
     UnitTest::cleanup();
-    
+
     delete _masterController;
     delete _cameraCalc;
     delete _multiSpy;
diff --git a/test/MissionManager/CameraCalcTest.h b/test/MissionManager/CameraCalcTest.h
index 22cde163e78c..7119d1dbbf81 100644
--- a/test/MissionManager/CameraCalcTest.h
+++ b/test/MissionManager/CameraCalcTest.h
@@ -18,14 +18,14 @@ class PlanMasterController;
 class CameraCalcTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     CameraCalcTest(void);
 
 protected:
     void init(void) final;
     void cleanup(void) final;
-    
+
 private slots:
     void _testDirty             (void);
     void _testAdjustedFootprint (void);
diff --git a/test/MissionManager/CameraSectionTest.cc b/test/MissionManager/CameraSectionTest.cc
index 5a292fcac17c..850545940a48 100644
--- a/test/MissionManager/CameraSectionTest.cc
+++ b/test/MissionManager/CameraSectionTest.cc
@@ -29,7 +29,7 @@ CameraSectionTest::CameraSectionTest(void)
     , _validCameraPhotoModeItem         (nullptr)
     , _validCameraVideoModeItem         (nullptr)
     , _validCameraSurveyPhotoModeItem   (nullptr)
-{    
+{
     rgCameraSignals[specifyGimbalChangedIndex] =        SIGNAL(specifyGimbalChanged(bool));
     rgCameraSignals[specifiedGimbalYawChangedIndex] =   SIGNAL(specifiedGimbalYawChanged(double));
     rgCameraSignals[specifiedGimbalPitchChangedIndex] = SIGNAL(specifiedGimbalPitchChanged(double));
diff --git a/test/MissionManager/CameraSectionTest.h b/test/MissionManager/CameraSectionTest.h
index d785785a1c0e..92b9e9280c8a 100644
--- a/test/MissionManager/CameraSectionTest.h
+++ b/test/MissionManager/CameraSectionTest.h
@@ -19,7 +19,7 @@ class SimpleMissionItem;
 class CameraSectionTest : public SectionTest
 {
     Q_OBJECT
-    
+
 public:
     CameraSectionTest(void);
 
diff --git a/test/MissionManager/CorridorScanComplexItemTest.cc b/test/MissionManager/CorridorScanComplexItemTest.cc
index 516db1d1cbc0..2da4978c1bb4 100644
--- a/test/MissionManager/CorridorScanComplexItemTest.cc
+++ b/test/MissionManager/CorridorScanComplexItemTest.cc
@@ -256,4 +256,3 @@ void CorridorScanComplexItemTest::_testItemGeneration(void)
         _testItemGenerationWorker(false /* imagesInTurnaround */, testCase.hasTurnaround, testCase.useConditionGate, _createExpectedCommands(testCase.hasTurnaround, testCase.useConditionGate));
     }
 }
-
diff --git a/test/MissionManager/CorridorScanComplexItemTest.h b/test/MissionManager/CorridorScanComplexItemTest.h
index 8625dcf323b9..3c7d3818aec6 100644
--- a/test/MissionManager/CorridorScanComplexItemTest.h
+++ b/test/MissionManager/CorridorScanComplexItemTest.h
@@ -19,14 +19,14 @@ class CorridorScanComplexItem;
 class CorridorScanComplexItemTest : public TransectStyleComplexItemTestBase
 {
     Q_OBJECT
-    
+
 public:
     CorridorScanComplexItemTest(void);
 
 protected:
     void init   (void) final;
     void cleanup(void) final;
-    
+
 #if 1
 private slots:
     void _testDirty         (void);
diff --git a/test/MissionManager/FWLandingPatternTest.cc b/test/MissionManager/FWLandingPatternTest.cc
index 85c2cd241438..2ef7dbc46990 100644
--- a/test/MissionManager/FWLandingPatternTest.cc
+++ b/test/MissionManager/FWLandingPatternTest.cc
@@ -17,7 +17,7 @@
 
 FWLandingPatternTest::FWLandingPatternTest(void)
 {
-    
+
 }
 
 void FWLandingPatternTest::init(void)
diff --git a/test/MissionManager/FWLandingPatternTest.h b/test/MissionManager/FWLandingPatternTest.h
index ed860e97321f..49d5fce3b4cf 100644
--- a/test/MissionManager/FWLandingPatternTest.h
+++ b/test/MissionManager/FWLandingPatternTest.h
@@ -18,7 +18,7 @@ class SimpleMissionItem;
 class FWLandingPatternTest : public VisualMissionItemTest
 {
     Q_OBJECT
-    
+
 public:
     FWLandingPatternTest(void);
 
diff --git a/test/MissionManager/LandingComplexItemTest.cc b/test/MissionManager/LandingComplexItemTest.cc
index 03bf3d9f0395..b75b72acc459 100644
--- a/test/MissionManager/LandingComplexItemTest.cc
+++ b/test/MissionManager/LandingComplexItemTest.cc
@@ -21,7 +21,7 @@ const char* SimpleLandingComplexItem::settingsGroup             = "SimpleLanding
 const char* SimpleLandingComplexItem::jsonComplexItemTypeValue  = "utSimpleLandingPattern";
 
 LandingComplexItemTest::LandingComplexItemTest(void)
-{    
+{
     rgSignals[finalApproachCoordinateChangedIndex]  = SIGNAL(finalApproachCoordinateChanged(QGeoCoordinate));
     rgSignals[slopeStartCoordinateChangedIndex]     = SIGNAL(slopeStartCoordinateChanged(QGeoCoordinate));
     rgSignals[landingCoordinateChangedIndex]        = SIGNAL(landingCoordinateChanged(QGeoCoordinate));
diff --git a/test/MissionManager/LandingComplexItemTest.h b/test/MissionManager/LandingComplexItemTest.h
index 0f7d257a2abb..0c54d618167f 100644
--- a/test/MissionManager/LandingComplexItemTest.h
+++ b/test/MissionManager/LandingComplexItemTest.h
@@ -19,7 +19,7 @@ class PlanMasterController;
 class LandingComplexItemTest : public VisualMissionItemTest
 {
     Q_OBJECT
-    
+
 public:
     LandingComplexItemTest(void);
 
diff --git a/test/MissionManager/MissionCommandTreeEditorTest.cc b/test/MissionManager/MissionCommandTreeEditorTest.cc
index 44e40ac75a53..43287607f897 100644
--- a/test/MissionManager/MissionCommandTreeEditorTest.cc
+++ b/test/MissionManager/MissionCommandTreeEditorTest.cc
@@ -22,7 +22,7 @@
 
 MissionCommandTreeEditorTest::MissionCommandTreeEditorTest(void)
 {
-    
+
 }
 
 void MissionCommandTreeEditorTest::_testEditorsWorker(QGCMAVLink::FirmwareClass_t firmwareClass, QGCMAVLink::VehicleClass_t vehicleClass)
@@ -68,4 +68,3 @@ void MissionCommandTreeEditorTest::testEditors(void)
         }
     }
 }
-
diff --git a/test/MissionManager/MissionCommandTreeEditorTest.h b/test/MissionManager/MissionCommandTreeEditorTest.h
index 0f8d80bf1b0b..45c2ef632e2f 100644
--- a/test/MissionManager/MissionCommandTreeEditorTest.h
+++ b/test/MissionManager/MissionCommandTreeEditorTest.h
@@ -16,10 +16,10 @@
 class MissionCommandTreeEditorTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     MissionCommandTreeEditorTest(void);
-    
+
 private slots:
     void testEditors(void);
 
diff --git a/test/MissionManager/MissionCommandTreeTest.cc b/test/MissionManager/MissionCommandTreeTest.cc
index a7298861e87b..252c606c3ca5 100644
--- a/test/MissionManager/MissionCommandTreeTest.cc
+++ b/test/MissionManager/MissionCommandTreeTest.cc
@@ -207,4 +207,3 @@ void MissionCommandTreeTest::testAllTrees()
     }
 
 }
-
diff --git a/test/MissionManager/MissionCommandTreeTest.h b/test/MissionManager/MissionCommandTreeTest.h
index cc06bb1b81fd..f12e64de7bd5 100644
--- a/test/MissionManager/MissionCommandTreeTest.h
+++ b/test/MissionManager/MissionCommandTreeTest.h
@@ -18,7 +18,7 @@ class MissionCommandUIInfo;
 class MissionCommandTreeTest : public UnitTest
 {
     Q_OBJECT
-    
+
 private slots:
     void init();
 
diff --git a/test/MissionManager/MissionControllerManagerTest.cc b/test/MissionManager/MissionControllerManagerTest.cc
index 2c4b07c17707..b5f2f293b217 100644
--- a/test/MissionManager/MissionControllerManagerTest.cc
+++ b/test/MissionManager/MissionControllerManagerTest.cc
@@ -17,7 +17,7 @@
 
 MissionControllerManagerTest::MissionControllerManagerTest(void)
 {
-    
+
 }
 
 void MissionControllerManagerTest::cleanup(void)
@@ -31,12 +31,12 @@ void MissionControllerManagerTest::cleanup(void)
 void MissionControllerManagerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareType)
 {
     _connectMockLink(firmwareType);
-    
+
     // Wait for the Mission Manager to finish it's initial load
-    
+
     _missionManager = MultiVehicleManager::instance()->activeVehicle()->missionManager();
     QVERIFY(_missionManager);
-    
+
     _rgMissionManagerSignals[newMissionItemsAvailableSignalIndex] = SIGNAL(newMissionItemsAvailable(bool));
     _rgMissionManagerSignals[sendCompleteSignalIndex] =             SIGNAL(sendComplete(bool));
     _rgMissionManagerSignals[inProgressChangedSignalIndex] =        SIGNAL(inProgressChanged(bool));
@@ -45,13 +45,13 @@ void MissionControllerManagerTest::_initForFirmwareType(MAV_AUTOPILOT firmwareTy
     _multiSpyMissionManager = new MultiSignalSpy();
     Q_CHECK_PTR(_multiSpyMissionManager);
     QCOMPARE(_multiSpyMissionManager->init(_missionManager, _rgMissionManagerSignals, _cMissionManagerSignals), true);
-    
+
     if (_missionManager->inProgress()) {
         _multiSpyMissionManager->waitForSignalByIndex(newMissionItemsAvailableSignalIndex, _missionManagerSignalWaitTime);
         _multiSpyMissionManager->waitForSignalByIndex(inProgressChangedSignalIndex, _missionManagerSignalWaitTime);
         QCOMPARE(_multiSpyMissionManager->checkSignalByMask(newMissionItemsAvailableSignalMask | inProgressChangedSignalMask), true);
     }
-    
+
     QVERIFY(!_missionManager->inProgress());
     QCOMPARE(_missionManager->missionItems().count(), 0);
     _multiSpyMissionManager->clearAllSignals();
diff --git a/test/MissionManager/MissionControllerManagerTest.h b/test/MissionManager/MissionControllerManagerTest.h
index 517faa1871c4..0f94702dcc8d 100644
--- a/test/MissionManager/MissionControllerManagerTest.h
+++ b/test/MissionManager/MissionControllerManagerTest.h
@@ -20,19 +20,19 @@ class MultiSignalSpy;
 class MissionControllerManagerTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     MissionControllerManagerTest(void);
-    
+
 protected slots:
     void cleanup(void);
-    
+
 protected:
     void _initForFirmwareType(MAV_AUTOPILOT firmwareType);
     void _checkInProgressValues(bool inProgress);
-    
+
     MissionManager* _missionManager;
-    
+
     typedef struct {
         int             sequenceNumber;
         QGeoCoordinate  coordinate;
@@ -45,7 +45,7 @@ protected slots:
         bool            isCurrentItem;
         MAV_FRAME       frame;
     } ItemInfo_t;
-    
+
     typedef struct {
         const char*         itemStream;
         const ItemInfo_t    expectedItem;
diff --git a/test/MissionManager/MissionControllerTest.cc b/test/MissionManager/MissionControllerTest.cc
index 8229f29213f8..aba24da80bcc 100644
--- a/test/MissionManager/MissionControllerTest.cc
+++ b/test/MissionManager/MissionControllerTest.cc
@@ -22,7 +22,7 @@
 
 MissionControllerTest::MissionControllerTest(void)
 {
-    
+
 }
 
 void MissionControllerTest::cleanup(void)
@@ -173,7 +173,7 @@ void MissionControllerTest::_testGimbalRecalc(void)
     item->cameraSection()->setSpecifyGimbal(true);
     item->cameraSection()->gimbalYaw()->setRawValue(0.0);
     SettingsManager::instance()->planViewSettings()->showGimbalOnlyWhenSet()->setRawValue(false);
-    QTest::qWait(100); // Recalcs in MissionController are queued to remove dups. Allow return to main message loop.
+    QTest::qWait(500); // Recalcs in MissionController are queued to remove dups. Allow return to main message loop.
     for (int i=1; i<_missionController->visualItems()->count(); i++) {
         //qDebug() << i;
         VisualMissionItem* visualItem = _missionController->visualItems()->value<VisualMissionItem*>(i);
@@ -202,7 +202,7 @@ void MissionControllerTest::_testVehicleYawRecalc(void)
         _missionController->insertSimpleMissionItem(currentCoord, i);
     }
 
-    QTest::qWait(100); // Recalcs in MissionController are queued to remove dups. Allow return to main message loop.
+    QTest::qWait(500); // Recalcs in MissionController are queued to remove dups. Allow return to main message loop.
 
     // No specific vehicle yaw set yet. Vehicle yaw should track flight path.
     double expectedVehicleYaw = wpAngleInc;
@@ -218,7 +218,7 @@ void MissionControllerTest::_testVehicleYawRecalc(void)
     SimpleMissionItem* simpleItem = _missionController->visualItems()->value<SimpleMissionItem*>(3);
     simpleItem->missionItem().setParam4(66);
 
-    QTest::qWait(100); // Recalcs in MissionController are queued to remove dups. Allow return to main message loop.
+    QTest::qWait(500); // Recalcs in MissionController are queued to remove dups. Allow return to main message loop.
 
     // All item should track vehicle path except for the one changed
     expectedVehicleYaw = wpAngleInc;
diff --git a/test/MissionManager/MissionControllerTest.h b/test/MissionManager/MissionControllerTest.h
index d49a001243e4..efa7537134fd 100644
--- a/test/MissionManager/MissionControllerTest.h
+++ b/test/MissionManager/MissionControllerTest.h
@@ -19,7 +19,7 @@ class VisualMissionItem;
 class MissionControllerTest : public MissionControllerManagerTest
 {
     Q_OBJECT
-    
+
 public:
     MissionControllerTest(void);
 
diff --git a/test/MissionManager/MissionItemTest.h b/test/MissionManager/MissionItemTest.h
index 0670c7a53754..d80f14facc89 100644
--- a/test/MissionManager/MissionItemTest.h
+++ b/test/MissionManager/MissionItemTest.h
@@ -18,10 +18,10 @@ class PlanMasterController;
 class MissionItemTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     MissionItemTest(void);
-    
+
     void init(void) override;
     void cleanup(void) override;
 
diff --git a/test/MissionManager/MissionManagerTest.cc b/test/MissionManager/MissionManagerTest.cc
index ac78d34bc3ce..832ddaa0db8d 100644
--- a/test/MissionManager/MissionManagerTest.cc
+++ b/test/MissionManager/MissionManagerTest.cc
@@ -27,16 +27,16 @@ const size_t MissionManagerTest::_cTestCases = sizeof(_rgTestCases)/sizeof(_rgTe
 
 MissionManagerTest::MissionManagerTest(void)
 {
-    
+
 }
 
 void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t failureMode, MAV_MISSION_RESULT failureAckResult, bool shouldFail)
 {
     _mockLink->setMissionItemFailureMode(failureMode, failureAckResult);
-    
+
     // Setup our test case data
     QList<MissionItem*> missionItems;
-    
+
     // Editor has a home position item on the front, so we do the same
     MissionItem* homeItem = new MissionItem(nullptr /* Vehicle */, this);
     homeItem->setCommand(MAV_CMD_NAV_WAYPOINT);
@@ -48,29 +48,29 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f
 
     for (size_t i=0; i<_cTestCases; i++) {
         const TestCase_t* testCase = &_rgTestCases[i];
-        
+
         MissionItem* missionItem = new MissionItem(this);
-        
+
         QTextStream loadStream(testCase->itemStream, QIODevice::ReadOnly);
         QVERIFY(missionItem->load(loadStream));
 
         // Mission Manager expects to get 1-base sequence numbers for write
         missionItem->setSequenceNumber(missionItem->sequenceNumber() + 1);
-        
+
         missionItems.append(missionItem);
     }
-    
+
     // Send the items to the vehicle
     _missionManager->writeMissionItems(missionItems);
-    
+
     // writeMissionItems should emit these signals before returning:
     //      inProgressChanged
     QVERIFY(_missionManager->inProgress());
     QCOMPARE(_multiSpyMissionManager->checkSignalByMask(inProgressChangedSignalMask), true);
     _checkInProgressValues(true);
-    
+
     _multiSpyMissionManager->clearAllSignals();
-    
+
     if (shouldFail) {
         // This should be a failed run
 
@@ -110,26 +110,26 @@ void MissionManagerTest::_writeItems(MockLinkMissionItemHandler::FailureMode_t f
 
         QCOMPARE(_missionManager->missionItems().count(), expectedCount);
     }
-    
+
     _multiSpyMissionManager->clearAllSignals();
 }
 
 void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode_t failureMode, MAV_MISSION_RESULT failureAckResult, bool shouldFail)
 {
     _writeItems(MockLinkMissionItemHandler::FailNone, failureAckResult, false);
-    
+
     _mockLink->setMissionItemFailureMode(failureMode, failureAckResult);
 
     // Read the items back from the vehicle
     _missionManager->loadFromVehicle();
-    
+
     // requestMissionItems should emit inProgressChanged signal before returning so no need to wait for it
     QVERIFY(_missionManager->inProgress());
     QCOMPARE(_multiSpyMissionManager->checkOnlySignalByMask(inProgressChangedSignalMask), true);
     _checkInProgressValues(true);
-    
+
     _multiSpyMissionManager->clearAllSignals();
-    
+
     if (shouldFail) {
         // This should be a failed run
 
@@ -158,13 +158,13 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
         QCOMPARE(_multiSpyMissionManager->checkSignalByMask(newMissionItemsAvailableSignalMask | inProgressChangedSignalMask), true);
         _checkInProgressValues(false);
     }
-    
+
     _multiSpyMissionManager->clearAllSignals();
 
     // Validate returned items
-    
+
     int cMissionItemsExpected;
-    
+
     if (shouldFail) {
         cMissionItemsExpected = 0;
     } else {
@@ -174,7 +174,7 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
             cMissionItemsExpected++;
         }
     }
-    
+
     QCOMPARE(_missionManager->missionItems().count(), (int)cMissionItemsExpected);
 
     int firstActualItem = 0;
@@ -194,7 +194,7 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
         }
 
         MissionItem* actual = _missionManager->missionItems()[actualItemIndex];
-        
+
         qCDebug(UnitTestLog) << "Test case" << testCaseIndex;
         QCOMPARE(actual->sequenceNumber(),          expectedSequenceNumber);
         QCOMPARE(actual->coordinate().latitude(),   testCase->expectedItem.coordinate.latitude());
@@ -210,7 +210,7 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
 
         testCaseIndex++;
     }
-    
+
 }
 
 void MissionManagerTest::_testWriteFailureHandlingWorker(void)
@@ -218,20 +218,20 @@ void MissionManagerTest::_testWriteFailureHandlingWorker(void)
     /*
     /// Called to send a MISSION_ACK message while the MissionManager is in idle state
     void sendUnexpectedMissionAck(MAV_MISSION_RESULT ackType) { _missionItemHandler.sendUnexpectedMissionAck(ackType); }
-    
+
     /// Called to send a MISSION_ITEM message while the MissionManager is in idle state
     void sendUnexpectedMissionItem(void) { _missionItemHandler.sendUnexpectedMissionItem(); }
-    
+
     /// Called to send a MISSION_REQUEST message while the MissionManager is in idle state
     void sendUnexpectedMissionRequest(void) { _missionItemHandler.sendUnexpectedMissionRequest(); }
     */
-    
+
     typedef struct {
         const char*                                 failureText;
         MockLinkMissionItemHandler::FailureMode_t   failureMode;
         bool                                        shouldFail;
     } WriteTestCase_t;
-    
+
     static const WriteTestCase_t rgTestCases[] = {
         { "No Failure",                         MockLinkMissionItemHandler::FailNone,                           false },
         { "FailWriteMissionCountNoResponse",    MockLinkMissionItemHandler::FailWriteMissionCountNoResponse,    true },
@@ -259,20 +259,20 @@ void MissionManagerTest::_testReadFailureHandlingWorker(void)
     /*
      /// Called to send a MISSION_ACK message while the MissionManager is in idle state
      void sendUnexpectedMissionAck(MAV_MISSION_RESULT ackType) { _missionItemHandler.sendUnexpectedMissionAck(ackType); }
-     
+
      /// Called to send a MISSION_ITEM message while the MissionManager is in idle state
      void sendUnexpectedMissionItem(void) { _missionItemHandler.sendUnexpectedMissionItem(); }
-     
+
      /// Called to send a MISSION_REQUEST message while the MissionManager is in idle state
      void sendUnexpectedMissionRequest(void) { _missionItemHandler.sendUnexpectedMissionRequest(); }
      */
-    
+
     typedef struct {
         const char*                                 failureText;
         MockLinkMissionItemHandler::FailureMode_t   failureMode;
         bool                                        shouldFail;
     } ReadTestCase_t;
-    
+
     /*
     static const ReadTestCase_t rgTestCases[] = {
         { "FailReadRequest1FirstResponse",      MockLinkMissionItemHandler::FailReadRequest1FirstResponse,      false },
diff --git a/test/MissionManager/MissionManagerTest.h b/test/MissionManager/MissionManagerTest.h
index de46b2f9103b..64071f1349ce 100644
--- a/test/MissionManager/MissionManagerTest.h
+++ b/test/MissionManager/MissionManagerTest.h
@@ -14,10 +14,10 @@
 class MissionManagerTest : public MissionControllerManagerTest
 {
     Q_OBJECT
-    
+
 public:
     MissionManagerTest(void);
-    
+
 private slots:
     //void _testWriteFailureHandlingPX4(void);
     //void _testWriteFailureHandlingAPM(void);
@@ -35,7 +35,7 @@ private slots:
     void _writeItems(MockLinkMissionItemHandler::FailureMode_t failureMode, MAV_MISSION_RESULT failureAckResult, bool shouldFail);
     void _testWriteFailureHandlingWorker(void);
     void _testReadFailureHandlingWorker(void);
-    
+
     static const TestCase_t _rgTestCases[];
     static const size_t     _cTestCases;
 };
diff --git a/test/MissionManager/MissionPlanner.waypoints b/test/MissionManager/MissionPlanner.waypoints
index 40c3175ee2eb..90a5d537e6c1 100644
--- a/test/MissionManager/MissionPlanner.waypoints
+++ b/test/MissionManager/MissionPlanner.waypoints
@@ -1,7 +1,7 @@
-QGC WPL 110
-0	1	0	16	0	0	0	0	47.660459	-122.103167	5.210000	1
-1	0	3	16	0.000000	0.000000	0.000000	0.000000	47.661298	-122.103274	100.000000	1
-2	0	3	16	0.000000	0.000000	0.000000	0.000000	47.661030	-122.101858	100.000000	1
-3	0	3	16	0.000000	0.000000	0.000000	0.000000	47.659961	-122.101525	100.000000	1
-4	0	3	16	0.000000	0.000000	0.000000	0.000000	47.659195	-122.103370	100.000000	1
-5	0	3	16	0.000000	0.000000	0.000000	0.000000	47.660459	-122.105538	100.000000	1
+QGC WPL 110
+0	1	0	16	0	0	0	0	47.660459	-122.103167	5.210000	1
+1	0	3	16	0.000000	0.000000	0.000000	0.000000	47.661298	-122.103274	100.000000	1
+2	0	3	16	0.000000	0.000000	0.000000	0.000000	47.661030	-122.101858	100.000000	1
+3	0	3	16	0.000000	0.000000	0.000000	0.000000	47.659961	-122.101525	100.000000	1
+4	0	3	16	0.000000	0.000000	0.000000	0.000000	47.659195	-122.103370	100.000000	1
+5	0	3	16	0.000000	0.000000	0.000000	0.000000	47.660459	-122.105538	100.000000	1
diff --git a/test/MissionManager/MissionPlanner.waypoints.txt b/test/MissionManager/MissionPlanner.waypoints.txt
index 01bb1b10c33b..af3f57a3d31b 100644
--- a/test/MissionManager/MissionPlanner.waypoints.txt
+++ b/test/MissionManager/MissionPlanner.waypoints.txt
@@ -1,16 +1,16 @@
-QGC WPL 110
-0	1	0	16	0	0	0	0	40.122269	-105.170967	1543.079956	1
-1	0	3	22	10.000000	0.000000	0.000000	0.000000	0.000000	0.000000	30.000000	1
-2	0	3	16	0.000000	0.000000	0.000000	0.000000	40.122993	-105.167717	100.000000	1
-3	0	3	16	0.000000	0.000000	0.000000	0.000000	40.120598	-105.167030	100.000000	1
-4	0	3	16	0.000000	0.000000	0.000000	0.000000	40.118942	-105.173714	100.000000	1
-5	0	3	16	0.000000	0.000000	0.000000	0.000000	40.120270	-105.175835	100.000000	1
-6	0	3	16	0.000000	0.000000	0.000000	0.000000	40.121994	-105.174843	100.000000	1
-7	0	3	177	2.000000	-1.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
-8	0	3	18	2.000000	0.000000	150.000000	0.000000	40.120483	-105.170555	100.000000	1
-9	0	3	16	0.000000	0.000000	0.000000	0.000000	40.120796	-105.169289	100.000000	1
-10	0	3	178	0.000000	15.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
-11	0	3	189	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
-12	0	3	16	0.000000	0.000000	0.000000	0.000000	40.119156	-105.175896	50.000000	1
-13	0	3	16	0.000000	0.000000	0.000000	0.000000	40.121551	-105.176829	25.000000	1
-14	0	3	21	0.000000	0.000000	0.000000	0.000000	40.122527	-105.170274	0.000000	1
+QGC WPL 110
+0	1	0	16	0	0	0	0	40.122269	-105.170967	1543.079956	1
+1	0	3	22	10.000000	0.000000	0.000000	0.000000	0.000000	0.000000	30.000000	1
+2	0	3	16	0.000000	0.000000	0.000000	0.000000	40.122993	-105.167717	100.000000	1
+3	0	3	16	0.000000	0.000000	0.000000	0.000000	40.120598	-105.167030	100.000000	1
+4	0	3	16	0.000000	0.000000	0.000000	0.000000	40.118942	-105.173714	100.000000	1
+5	0	3	16	0.000000	0.000000	0.000000	0.000000	40.120270	-105.175835	100.000000	1
+6	0	3	16	0.000000	0.000000	0.000000	0.000000	40.121994	-105.174843	100.000000	1
+7	0	3	177	2.000000	-1.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
+8	0	3	18	2.000000	0.000000	150.000000	0.000000	40.120483	-105.170555	100.000000	1
+9	0	3	16	0.000000	0.000000	0.000000	0.000000	40.120796	-105.169289	100.000000	1
+10	0	3	178	0.000000	15.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
+11	0	3	189	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	0.000000	1
+12	0	3	16	0.000000	0.000000	0.000000	0.000000	40.119156	-105.175896	50.000000	1
+13	0	3	16	0.000000	0.000000	0.000000	0.000000	40.121551	-105.176829	25.000000	1
+14	0	3	21	0.000000	0.000000	0.000000	0.000000	40.122527	-105.170274	0.000000	1
diff --git a/test/MissionManager/MissionSettingsTest.cc b/test/MissionManager/MissionSettingsTest.cc
index b0111da32469..0a5df2660d53 100644
--- a/test/MissionManager/MissionSettingsTest.cc
+++ b/test/MissionManager/MissionSettingsTest.cc
@@ -15,7 +15,7 @@
 MissionSettingsTest::MissionSettingsTest(void)
     : _settingsItem(nullptr)
 {
-    
+
 }
 
 void MissionSettingsTest::init(void)
diff --git a/test/MissionManager/MissionSettingsTest.h b/test/MissionManager/MissionSettingsTest.h
index 0f6a95c144cd..adfa85c3366d 100644
--- a/test/MissionManager/MissionSettingsTest.h
+++ b/test/MissionManager/MissionSettingsTest.h
@@ -17,7 +17,7 @@ class MissionSettingsItem;
 class MissionSettingsTest : public VisualMissionItemTest
 {
     Q_OBJECT
-    
+
 public:
     MissionSettingsTest(void);
 
diff --git a/test/MissionManager/OldFileFormat.mission b/test/MissionManager/OldFileFormat.mission
index e2b1be92865d..d90206c88124 100644
--- a/test/MissionManager/OldFileFormat.mission
+++ b/test/MissionManager/OldFileFormat.mission
@@ -1,120 +1,120 @@
-{
-    "firmwareType": 3,
-    "groundStation": "QGroundControl",
-    "items": [
-        {
-            "autoContinue": true,
-            "command": 22,
-            "coordinate": [
-                47.660137763851573,
-                -122.29411931627152,
-                50
-            ],
-            "doJumpId": 1,
-            "frame": 2,
-            "params": [
-                0,
-                0,
-                0,
-                0
-            ],
-            "type": "SimpleItem"
-        },
-        {
-            "autoContinue": true,
-            "command": 18,
-            "coordinate": [
-                47.660316610000002,
-                -122.29423867,
-                10
-            ],
-            "doJumpId": 2,
-            "frame": 3,
-            "params": [
-                1,
-                0,
-                0,
-                0
-            ],
-            "type": "SimpleItem"
-        },
-        {
-            "autoContinue": true,
-            "command": 18,
-            "coordinate": [
-                47.660299945473923,
-                -122.29402946102036,
-                20
-            ],
-            "doJumpId": 3,
-            "frame": 3,
-            "params": [
-                3,
-                0,
-                0,
-                0
-            ],
-            "type": "SimpleItem"
-        },
-        {
-            "autoContinue": true,
-            "command": 16,
-            "coordinate": [
-                47.660239429999997,
-                -122.29371564,
-                5
-            ],
-            "doJumpId": 4,
-            "frame": 3,
-            "params": [
-                0,
-                0,
-                0,
-                0
-            ],
-            "type": "SimpleItem"
-        },
-        {
-            "autoContinue": true,
-            "command": 16,
-            "coordinate": [
-                47.660368599999998,
-                -122.29426013,
-                5
-            ],
-            "doJumpId": 5,
-            "frame": 3,
-            "params": [
-                0,
-                0,
-                0,
-                0
-            ],
-            "type": "SimpleItem"
-        },
-        {
-            "autoContinue": true,
-            "command": 21,
-            "coordinate": [
-                47.660153620000003,
-                -122.29410455999999,
-                3
-            ],
-            "doJumpId": 6,
-            "frame": 3,
-            "params": [
-                0,
-                0,
-                0,
-                0
-            ],
-            "type": "SimpleItem"
-        }
-    ],
-    "plannedHomePosition": [
-        47.660137763851573,
-        -122.29411931627152,
-        0
-    ],
-    "version": 2
-}
+{
+    "firmwareType": 3,
+    "groundStation": "QGroundControl",
+    "items": [
+        {
+            "autoContinue": true,
+            "command": 22,
+            "coordinate": [
+                47.660137763851573,
+                -122.29411931627152,
+                50
+            ],
+            "doJumpId": 1,
+            "frame": 2,
+            "params": [
+                0,
+                0,
+                0,
+                0
+            ],
+            "type": "SimpleItem"
+        },
+        {
+            "autoContinue": true,
+            "command": 18,
+            "coordinate": [
+                47.660316610000002,
+                -122.29423867,
+                10
+            ],
+            "doJumpId": 2,
+            "frame": 3,
+            "params": [
+                1,
+                0,
+                0,
+                0
+            ],
+            "type": "SimpleItem"
+        },
+        {
+            "autoContinue": true,
+            "command": 18,
+            "coordinate": [
+                47.660299945473923,
+                -122.29402946102036,
+                20
+            ],
+            "doJumpId": 3,
+            "frame": 3,
+            "params": [
+                3,
+                0,
+                0,
+                0
+            ],
+            "type": "SimpleItem"
+        },
+        {
+            "autoContinue": true,
+            "command": 16,
+            "coordinate": [
+                47.660239429999997,
+                -122.29371564,
+                5
+            ],
+            "doJumpId": 4,
+            "frame": 3,
+            "params": [
+                0,
+                0,
+                0,
+                0
+            ],
+            "type": "SimpleItem"
+        },
+        {
+            "autoContinue": true,
+            "command": 16,
+            "coordinate": [
+                47.660368599999998,
+                -122.29426013,
+                5
+            ],
+            "doJumpId": 5,
+            "frame": 3,
+            "params": [
+                0,
+                0,
+                0,
+                0
+            ],
+            "type": "SimpleItem"
+        },
+        {
+            "autoContinue": true,
+            "command": 21,
+            "coordinate": [
+                47.660153620000003,
+                -122.29410455999999,
+                3
+            ],
+            "doJumpId": 6,
+            "frame": 3,
+            "params": [
+                0,
+                0,
+                0,
+                0
+            ],
+            "type": "SimpleItem"
+        }
+    ],
+    "plannedHomePosition": [
+        47.660137763851573,
+        -122.29411931627152,
+        0
+    ],
+    "version": 2
+}
diff --git a/test/MissionManager/PolygonAreaTest.kml b/test/MissionManager/PolygonAreaTest.kml
index 455643f37757..079c59d84ba4 100755
--- a/test/MissionManager/PolygonAreaTest.kml
+++ b/test/MissionManager/PolygonAreaTest.kml
@@ -38,7 +38,7 @@
 			<outerBoundaryIs>
 				<LinearRing>
 					<coordinates>
-						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0 
+						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0
 					</coordinates>
 				</LinearRing>
 			</outerBoundaryIs>
diff --git a/test/MissionManager/PolygonBadCoordinatesNode.kml b/test/MissionManager/PolygonBadCoordinatesNode.kml
index e9f6c3f91bfb..1f8e6f302a83 100755
--- a/test/MissionManager/PolygonBadCoordinatesNode.kml
+++ b/test/MissionManager/PolygonBadCoordinatesNode.kml
@@ -38,7 +38,7 @@ Incorrectly formed XML test file
 			<tessellate>1</tessellate>
 			<outerBoundaryIs>
 					<coordinates>
-						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0 
+						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0
 					</coordinates>
 			</outerBoundaryIs>
 		</Polygon>
diff --git a/test/MissionManager/PolygonBadXml.kml b/test/MissionManager/PolygonBadXml.kml
index 49840fd90549..e2002b6293ae 100755
--- a/test/MissionManager/PolygonBadXml.kml
+++ b/test/MissionManager/PolygonBadXml.kml
@@ -39,7 +39,7 @@ Incorrectly formed XML test file
 			<outerBoundaryIs>
 				<LinearRing>
 					<coordinates>
-						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0 
+						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0
 					</coordinates>
 				</LinearRing>
 			</outerBoundaryIs>
diff --git a/test/MissionManager/PolygonGood.kml b/test/MissionManager/PolygonGood.kml
index 712e859f3aa3..999678175096 100755
--- a/test/MissionManager/PolygonGood.kml
+++ b/test/MissionManager/PolygonGood.kml
@@ -38,7 +38,7 @@
 			<outerBoundaryIs>
 				<LinearRing>
 					<coordinates>
-						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0 
+						-122.1059149362712,47.65965281788451,0 -122.1044593196253,47.66002598220988,0 -122.1047336695092,47.66034166158975,0 -122.1061470943783,47.6599810708829,0 -122.1059149362712,47.65965281788451,0
 					</coordinates>
 				</LinearRing>
 			</outerBoundaryIs>
diff --git a/test/MissionManager/SectionTest.cc b/test/MissionManager/SectionTest.cc
index 3760fd060edf..db60e0c5690c 100644
--- a/test/MissionManager/SectionTest.cc
+++ b/test/MissionManager/SectionTest.cc
@@ -18,7 +18,7 @@
 SectionTest::SectionTest(void)
     : _simpleItem(nullptr)
 {
-    
+
 }
 
 void SectionTest::init(void)
diff --git a/test/MissionManager/SectionTest.h b/test/MissionManager/SectionTest.h
index 0593a63f357d..a11f1ef603af 100644
--- a/test/MissionManager/SectionTest.h
+++ b/test/MissionManager/SectionTest.h
@@ -18,7 +18,7 @@ class SimpleMissionItem;
 class SectionTest : public VisualMissionItemTest
 {
     Q_OBJECT
-    
+
 public:
     SectionTest(void);
 
diff --git a/test/MissionManager/SimpleMissionItemTest.cc b/test/MissionManager/SimpleMissionItemTest.cc
index 80b7cc148923..a301a6e7963b 100644
--- a/test/MissionManager/SimpleMissionItemTest.cc
+++ b/test/MissionManager/SimpleMissionItemTest.cc
@@ -73,7 +73,7 @@ const ItemExpected_t _rgItemExpected[] = {
 };
 
 SimpleMissionItemTest::SimpleMissionItemTest(void)
-{    
+{
     rgSimpleItemSignals[commandChangedIndex] =                          SIGNAL(commandChanged(int));
     rgSimpleItemSignals[altitudeModeChangedIndex] =                     SIGNAL(altitudeModeChanged());
     rgSimpleItemSignals[friendlyEditAllowedChangedIndex] =              SIGNAL(friendlyEditAllowedChanged(bool));
diff --git a/test/MissionManager/SimpleMissionItemTest.h b/test/MissionManager/SimpleMissionItemTest.h
index 6487c0b1c3bd..f5d53cee6396 100644
--- a/test/MissionManager/SimpleMissionItemTest.h
+++ b/test/MissionManager/SimpleMissionItemTest.h
@@ -39,7 +39,7 @@ typedef struct {
 class SimpleMissionItemTest : public VisualMissionItemTest
 {
     Q_OBJECT
-    
+
 public:
     SimpleMissionItemTest(void);
 
diff --git a/test/MissionManager/SpeedSectionTest.cc b/test/MissionManager/SpeedSectionTest.cc
index daa8eb66814a..a33ce147dbfa 100644
--- a/test/MissionManager/SpeedSectionTest.cc
+++ b/test/MissionManager/SpeedSectionTest.cc
@@ -20,7 +20,7 @@ SpeedSectionTest::SpeedSectionTest(void)
     , _spySection(nullptr)
     , _speedSection(nullptr)
 {
-    
+
 }
 
 void SpeedSectionTest::init(void)
diff --git a/test/MissionManager/SpeedSectionTest.h b/test/MissionManager/SpeedSectionTest.h
index a1f320d89d55..8f9150184939 100644
--- a/test/MissionManager/SpeedSectionTest.h
+++ b/test/MissionManager/SpeedSectionTest.h
@@ -17,7 +17,7 @@ class SpeedSection;
 class SpeedSectionTest : public SectionTest
 {
     Q_OBJECT
-    
+
 public:
     SpeedSectionTest(void);
 
diff --git a/test/MissionManager/StructureScanComplexItemTest.h b/test/MissionManager/StructureScanComplexItemTest.h
index 58e7abdba996..7722c2a4ce75 100644
--- a/test/MissionManager/StructureScanComplexItemTest.h
+++ b/test/MissionManager/StructureScanComplexItemTest.h
@@ -18,14 +18,14 @@ class MultiSignalSpy;
 class StructureScanComplexItemTest : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     StructureScanComplexItemTest(void);
 
 protected:
     void init(void) final;
     void cleanup(void) final;
-    
+
 private slots:
     void _testDirty(void);
     void _testSaveLoad(void);
diff --git a/test/MissionManager/SurveyComplexItemTest.cc b/test/MissionManager/SurveyComplexItemTest.cc
index 05546a3fbe06..5971a617189f 100644
--- a/test/MissionManager/SurveyComplexItemTest.cc
+++ b/test/MissionManager/SurveyComplexItemTest.cc
@@ -226,7 +226,7 @@ QList<MAV_CMD> SurveyComplexItemTest::_createExpectedCommands(bool hasTurnaround
         singleTransect.takeFirst();
         singleTransect.takeLast();
     }
-    
+
     for (int i=0; i<_expectedTransectCount; i++) {
         expectedCommands.append(singleTransect);
     }
diff --git a/test/MissionManager/SurveyComplexItemTest.h b/test/MissionManager/SurveyComplexItemTest.h
index 18df28341191..576ba7fa78e9 100644
--- a/test/MissionManager/SurveyComplexItemTest.h
+++ b/test/MissionManager/SurveyComplexItemTest.h
@@ -21,14 +21,14 @@ class MultiSignalSpy;
 class SurveyComplexItemTest : public TransectStyleComplexItemTestBase
 {
     Q_OBJECT
-    
+
 public:
     SurveyComplexItemTest(void);
 
 protected:
     void init(void) final;
     void cleanup(void) final;
-    
+
 #if 1
 private slots:
     void _testDirty(void);
diff --git a/test/MissionManager/TransectStyleComplexItemTest.cc b/test/MissionManager/TransectStyleComplexItemTest.cc
index 409f90c4e7e6..7024a3ec9484 100644
--- a/test/MissionManager/TransectStyleComplexItemTest.cc
+++ b/test/MissionManager/TransectStyleComplexItemTest.cc
@@ -272,4 +272,3 @@ void TestTransectStyleItem::adjustSurveAreaPolygon(void)
     vertex.setLatitude(vertex.latitude() + 1);
     surveyAreaPolygon()->adjustVertex(0, vertex);
 }
-
diff --git a/test/MissionManager/TransectStyleComplexItemTest.h b/test/MissionManager/TransectStyleComplexItemTest.h
index 959b9d747f22..5b2b30c0aab4 100644
--- a/test/MissionManager/TransectStyleComplexItemTest.h
+++ b/test/MissionManager/TransectStyleComplexItemTest.h
@@ -21,7 +21,7 @@ class PlanMasterController;
 class TransectStyleComplexItemTest : public TransectStyleComplexItemTestBase
 {
     Q_OBJECT
-    
+
 public:
     TransectStyleComplexItemTest(void);
 
diff --git a/test/MissionManager/TransectStyleComplexItemTestBase.h b/test/MissionManager/TransectStyleComplexItemTestBase.h
index 6bd535a71414..cb2a23d86b67 100644
--- a/test/MissionManager/TransectStyleComplexItemTestBase.h
+++ b/test/MissionManager/TransectStyleComplexItemTestBase.h
@@ -19,7 +19,7 @@ class Vehicle;
 class TransectStyleComplexItemTestBase : public UnitTest
 {
     Q_OBJECT
-    
+
 public:
     TransectStyleComplexItemTestBase(void);
 
diff --git a/test/MissionManager/VisualMissionItemTest.cc b/test/MissionManager/VisualMissionItemTest.cc
index d21bad6fa8c6..7a6c4869ee04 100644
--- a/test/MissionManager/VisualMissionItemTest.cc
+++ b/test/MissionManager/VisualMissionItemTest.cc
@@ -16,7 +16,7 @@
 
 VisualMissionItemTest::VisualMissionItemTest(void)
 {
-    
+
 }
 
 void VisualMissionItemTest::init(void)
diff --git a/test/Terrain/CMakeLists.txt b/test/Terrain/CMakeLists.txt
index f56374021ad3..23f5a07fb734 100644
--- a/test/Terrain/CMakeLists.txt
+++ b/test/Terrain/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Terrain Unit Tests
+# Tests for terrain elevation data and tile management
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         TerrainQueryTest.cc
diff --git a/test/UnitTestList.cc b/test/UnitTestList.cc
index 26a80aac29c3..4f8fb2043ad6 100644
--- a/test/UnitTestList.cc
+++ b/test/UnitTestList.cc
@@ -22,8 +22,6 @@
 #include "PX4LogParserTest.h"
 // #include "ULogParserTest.h"
 
-
-
 // AutoPilotPlugins
 // #include "RadioConfigTest.h"
 
@@ -114,9 +112,7 @@
 // #include "SendMavCommandTest.h"
 // #include "TCPLinkTest.h"
 
-QGC_LOGGING_CATEGORY(UnitTestsLog, "qgc.test.unittestlist")
-
-int runTests(bool stress, QStringView unitTestOptions)
+int QGCUnitTest::runTests(bool stress, const QStringList& unitTests)
 {
     // ADSB
     UT_REGISTER_TEST(ADSBTest)
@@ -218,15 +214,18 @@ int runTests(bool stress, QStringView unitTestOptions)
     // UT_REGISTER_TEST(TCPLinkTest)
 
     int result = 0;
-
     for (int i=0; i < (stress ? 20 : 1); i++) {
-        // Run the test
-        const int failures = UnitTest::run(unitTestOptions);
+        int failures = 0;
+        for (const QString& test: unitTests) {
+            // Run the test
+            failures += UnitTest::run(test);
+        }
+
         if (failures == 0) {
             qDebug() << "ALL TESTS PASSED";
             result = 0;
         } else {
-            qDebug() << failures << " TESTS FAILED!";
+            qWarning() << failures << "TESTS FAILED!";
             result = -failures;
             break;
         }
diff --git a/test/UnitTestList.h b/test/UnitTestList.h
index 118479171761..5469e705be48 100644
--- a/test/UnitTestList.h
+++ b/test/UnitTestList.h
@@ -1,7 +1,19 @@
+/****************************************************************************
+ *
+ * (c) 2009-2020 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
 #pragma once
 
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QStringList>
+
+namespace QGCUnitTest {
 
-Q_DECLARE_LOGGING_CATEGORY(UnitTestsLog)
+int runTests(bool stress, const QStringList& unitTests);
 
-int runTests(bool stress, QStringView unitTestOptions);
+}
diff --git a/test/Utilities/Audio/CMakeLists.txt b/test/Utilities/Audio/CMakeLists.txt
index b0358169396c..d90e3ed4c29f 100644
--- a/test/Utilities/Audio/CMakeLists.txt
+++ b/test/Utilities/Audio/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Audio Utilities Unit Tests
+# Tests for audio output and speech synthesis
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         AudioOutputTest.cc
diff --git a/test/Utilities/CMakeLists.txt b/test/Utilities/CMakeLists.txt
index 4f4e685a7613..8af46f46f8dc 100644
--- a/test/Utilities/CMakeLists.txt
+++ b/test/Utilities/CMakeLists.txt
@@ -1,8 +1,16 @@
+# ============================================================================
+# Utilities Unit Tests
+# Tests for various utility modules
+# ============================================================================
+
 add_subdirectory(Audio)
 add_subdirectory(Compression)
 add_subdirectory(FileSystem)
 add_subdirectory(Geo)
 
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} "UtilitiesTest_res"
     PREFIX "/unittest"
     FILES
diff --git a/test/Utilities/Compression/.gitignore b/test/Utilities/Compression/.gitignore
index 40c3c4a33e1f..2ddf5f27b162 100644
--- a/test/Utilities/Compression/.gitignore
+++ b/test/Utilities/Compression/.gitignore
@@ -1 +1 @@
-manifest.json
\ No newline at end of file
+manifest.json
diff --git a/test/Utilities/Compression/CMakeLists.txt b/test/Utilities/Compression/CMakeLists.txt
index 14f676294c17..ab97ee147373 100644
--- a/test/Utilities/Compression/CMakeLists.txt
+++ b/test/Utilities/Compression/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Compression Utilities Unit Tests
+# Tests for decompression (GZIP, XZ, ZIP)
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         DecompressionTest.cc
@@ -6,6 +11,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} "UtilitiesTest_CompressionTest_res"
     PREFIX "/unittest"
     FILES
diff --git a/test/Utilities/FileSystem/CMakeLists.txt b/test/Utilities/FileSystem/CMakeLists.txt
index 09ecbaa6fbef..a9bdd4d6ee93 100644
--- a/test/Utilities/FileSystem/CMakeLists.txt
+++ b/test/Utilities/FileSystem/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# FileSystem Utilities Unit Tests
+# Tests for file download and filesystem operations
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         QGCFileDownloadTest.cc
diff --git a/test/Utilities/Geo/CMakeLists.txt b/test/Utilities/Geo/CMakeLists.txt
index 9636465d38e2..877f485204eb 100644
--- a/test/Utilities/Geo/CMakeLists.txt
+++ b/test/Utilities/Geo/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Geo Utilities Unit Tests
+# Tests for geographic calculations, shapefile parsing, and KML handling
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         GeoTest.cc
@@ -8,6 +13,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} "Test_Utilities_Geo_res"
     PREFIX "/unittest"
     FILES
diff --git a/test/Utilities/Geo/pline.prj b/test/Utilities/Geo/pline.prj
index b13a71791932..40dd8c6cdcba 100644
--- a/test/Utilities/Geo/pline.prj
+++ b/test/Utilities/Geo/pline.prj
@@ -1 +1 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]]
diff --git a/test/Utilities/Geo/polygon.prj b/test/Utilities/Geo/polygon.prj
index b13a71791932..40dd8c6cdcba 100644
--- a/test/Utilities/Geo/polygon.prj
+++ b/test/Utilities/Geo/polygon.prj
@@ -1 +1 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]]
diff --git a/test/Utilities/arducopter.apj b/test/Utilities/arducopter.apj
index b487222417e9..145fd1fe65ae 100644
--- a/test/Utilities/arducopter.apj
+++ b/test/Utilities/arducopter.apj
@@ -16,4 +16,4 @@
     "git_identity": "2a3dc4b7",
     "board_revision": 0,
     "USBID": "0x2dae/0x1011"
-}
\ No newline at end of file
+}
diff --git a/test/Vehicle/CMakeLists.txt b/test/Vehicle/CMakeLists.txt
index fe119d1e3882..5d47fb4a7ca8 100644
--- a/test/Vehicle/CMakeLists.txt
+++ b/test/Vehicle/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Vehicle Unit Tests
+# Tests for vehicle connection, FTP, MAVLink commands, and link management
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         FTPManagerTest.cc
@@ -18,4 +23,7 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Component Information Tests
+# ----------------------------------------------------------------------------
 add_subdirectory(ComponentInformation)
diff --git a/test/Vehicle/ComponentInformation/CMakeLists.txt b/test/Vehicle/ComponentInformation/CMakeLists.txt
index 776a61f7903f..4e52641bc2b3 100644
--- a/test/Vehicle/ComponentInformation/CMakeLists.txt
+++ b/test/Vehicle/ComponentInformation/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# Component Information Unit Tests
+# Tests for vehicle component metadata caching and translation
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         ComponentInformationCacheTest.cc
@@ -8,6 +13,9 @@ target_sources(${CMAKE_PROJECT_NAME}
 
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
+# ----------------------------------------------------------------------------
+# Test Data Resources
+# ----------------------------------------------------------------------------
 qt_add_resources(${CMAKE_PROJECT_NAME} "VehicleTest_ComponentInformation_res"
     PREFIX "/unittest"
     FILES
diff --git a/test/Vehicle/ComponentInformation/ComponentInformationCacheTest.h b/test/Vehicle/ComponentInformation/ComponentInformationCacheTest.h
index 036a173c965b..93a569146888 100644
--- a/test/Vehicle/ComponentInformation/ComponentInformationCacheTest.h
+++ b/test/Vehicle/ComponentInformation/ComponentInformationCacheTest.h
@@ -42,4 +42,3 @@ private slots:
     QString _cacheDir;
     QString _tmpFilesDir;
 };
-
diff --git a/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.cc b/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.cc
index b5e78a23788a..3dee2caf9c67 100644
--- a/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.cc
+++ b/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.cc
@@ -47,4 +47,3 @@ void ComponentInformationTranslationTest::readJson(const QByteArray& bytes, QJso
     QTEST_ASSERT(parseError.error == QJsonParseError::NoError);
     QVERIFY(!jsonDoc.isEmpty());
 }
-
diff --git a/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.h b/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.h
index d27c0058ffbb..c9feebaaa9fa 100644
--- a/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.h
+++ b/test/Vehicle/ComponentInformation/ComponentInformationTranslationTest.h
@@ -28,4 +28,3 @@ private slots:
 private:
     void readJson(const QByteArray& bytes, QJsonDocument& jsonDoc);
 };
-
diff --git a/test/Vehicle/InitialConnectTest.cc b/test/Vehicle/InitialConnectTest.cc
index 4dfe40d0efa3..c2b8a2a09a87 100644
--- a/test/Vehicle/InitialConnectTest.cc
+++ b/test/Vehicle/InitialConnectTest.cc
@@ -25,8 +25,6 @@ void InitialConnectTest::_performTestCases(void)
     { MockConfiguration::FailNone,                                                   "No failures" },
     { MockConfiguration::FailInitialConnectRequestMessageAutopilotVersionFailure,    "REQUEST_MESSAGE:AUTOPILOT_VERSION returns failure" },
     { MockConfiguration::FailInitialConnectRequestMessageAutopilotVersionLost,       "REQUEST_MESSAGE:AUTOPILOT_VERSION success, AUTOPILOT_VERSION never sent" },
-    { MockConfiguration::FailInitialConnectRequestMessageProtocolVersionFailure,     "REQUEST_MESSAGE:PROTOCOL_VERSION returns failure" },
-    { MockConfiguration::FailInitialConnectRequestMessageProtocolVersionLost,        "REQUEST_MESSAGE:PROTOCOL_VERSION success, PROTOCOL_VERSION never sent" },
     };
 
     for (const struct TestCase_s& testCase: rgTestCases) {
diff --git a/test/Vehicle/RequestMessageTest.cc b/test/Vehicle/RequestMessageTest.cc
index 483f9a197406..9396b3ec0b67 100644
--- a/test/Vehicle/RequestMessageTest.cc
+++ b/test/Vehicle/RequestMessageTest.cc
@@ -38,12 +38,12 @@ void RequestMessageTest::_testCaseWorker(TestCase_t& testCase)
 
     MultiVehicleManager*    vehicleMgr  = MultiVehicleManager::instance();
     Vehicle*                vehicle     = vehicleMgr->activeVehicle();
-    
+
     // Gimbal controller sends message requests when receiving heartbeats, trying to find a gimbal, and it messes with this test so we disable it
-    vehicle->deleteGimbalController();
+    vehicle->_deleteGimbalController();
 
     // Camera manager also messes with it.
-    vehicle->deleteCameraManager();
+    vehicle->_deleteCameraManager();
 
     _mockLink->clearReceivedMavCommandCounts();
     _mockLink->setRequestMessageFailureMode(testCase.failureMode);
diff --git a/test/Vehicle/RequestMessageTest.h b/test/Vehicle/RequestMessageTest.h
index 89eccaf88813..6d46cfb74e31 100644
--- a/test/Vehicle/RequestMessageTest.h
+++ b/test/Vehicle/RequestMessageTest.h
@@ -20,7 +20,7 @@ class RequestMessageTest : public UnitTest
 
 signals:
     void resultHandlerCalled(void);
-    
+
 private slots:
     void _performTestCases(void);
     void _compIdAllFailure(void);
diff --git a/test/Vehicle/SendMavCommandWithHandlerTest.cc b/test/Vehicle/SendMavCommandWithHandlerTest.cc
index 52a5e04c5f2a..de0ed6dc5be3 100644
--- a/test/Vehicle/SendMavCommandWithHandlerTest.cc
+++ b/test/Vehicle/SendMavCommandWithHandlerTest.cc
@@ -77,7 +77,7 @@ void SendMavCommandWithHandlerTest::_testCaseWorker(TestCase_t& testCase)
     if (testCase.expectInProgressResult) {
         QVERIFY(QTest::qWaitFor([&]() { return _progressHandlerCalled; }, 10000));
     }
-    
+
     QVERIFY(QTest::qWaitFor([&]() { return _resultHandlerCalled; }, 10000));
     QCOMPARE(_mockLink->receivedMavCommandCount(testCase.command), testCase.expectedSendCount);
     QCOMPARE(vehicle->_findMavCommandListEntryIndex(MAV_COMP_ID_AUTOPILOT1, testCase.command), -1);
diff --git a/test/Vehicle/SendMavCommandWithHandlerTest.h b/test/Vehicle/SendMavCommandWithHandlerTest.h
index 1d97c5ef8c0f..435115732055 100644
--- a/test/Vehicle/SendMavCommandWithHandlerTest.h
+++ b/test/Vehicle/SendMavCommandWithHandlerTest.h
@@ -15,7 +15,7 @@
 class SendMavCommandWithHandlerTest : public UnitTest
 {
     Q_OBJECT
-    
+
 private slots:
     void _performTestCases(void);
     void _compIdAllFailure(void);
diff --git a/test/Vehicle/SendMavCommandWithSignallingTest.cc b/test/Vehicle/SendMavCommandWithSignallingTest.cc
index c18661c62c11..e16c71e14e0e 100644
--- a/test/Vehicle/SendMavCommandWithSignallingTest.cc
+++ b/test/Vehicle/SendMavCommandWithSignallingTest.cc
@@ -42,7 +42,7 @@ void SendMavCommandWithSignallingTest::_testCaseWorker(TestCase_t& testCase)
     QList<QVariant> arguments = spyResult.takeFirst();
 
     // Gimbal controler requests MAVLINK_MSG_ID_GIMBAL_MANAGER_INFORMATION on vehicle connection,
-    // and that messes with this test, as it receives response to that command instead. So if we 
+    // and that messes with this test, as it receives response to that command instead. So if we
     // are taking the response to that MAV_CMD_REQUEST_MESSAGE, we discard it and take the next
     // Also, the camera manager requests MAVLINK_MSG_ID_CAMERA_INFORMATION on vehicle connection,
     // so we need to ignore that as well.
@@ -51,7 +51,7 @@ void SendMavCommandWithSignallingTest::_testCaseWorker(TestCase_t& testCase)
         QCOMPARE(spyResult.wait(10000), true);
         arguments = spyResult.takeFirst();
     }
-    
+
     QCOMPARE(arguments.count(),                                             5);
     QCOMPARE(arguments.at(0).toInt(),                                       vehicle->id());
     QCOMPARE(arguments.at(1).toInt(),                                       MAV_COMP_ID_AUTOPILOT1);
diff --git a/test/Vehicle/SendMavCommandWithSignallingTest.h b/test/Vehicle/SendMavCommandWithSignallingTest.h
index 40b01e38676e..9c8089e7929e 100644
--- a/test/Vehicle/SendMavCommandWithSignallingTest.h
+++ b/test/Vehicle/SendMavCommandWithSignallingTest.h
@@ -15,7 +15,7 @@
 class SendMavCommandWithSignallingTest : public UnitTest
 {
     Q_OBJECT
-    
+
 private slots:
     void _performTestCases(void);
     void _duplicateCommand(void);
diff --git a/test/qgcunittest/CMakeLists.txt b/test/qgcunittest/CMakeLists.txt
index 8f6c555b722b..66dad0615024 100644
--- a/test/qgcunittest/CMakeLists.txt
+++ b/test/qgcunittest/CMakeLists.txt
@@ -1,3 +1,8 @@
+# ============================================================================
+# QGC Unit Test Framework
+# Core testing utilities and helpers
+# ============================================================================
+
 target_sources(${CMAKE_PROJECT_NAME}
     PRIVATE
         MultiSignalSpy.cc
diff --git a/test/qgcunittest/MultiSignalSpy.cc b/test/qgcunittest/MultiSignalSpy.cc
index 2a74bf2b1f52..19726a84112d 100644
--- a/test/qgcunittest/MultiSignalSpy.cc
+++ b/test/qgcunittest/MultiSignalSpy.cc
@@ -47,7 +47,7 @@ bool MultiSignalSpy::init(QObject*        signalEmitter,    ///< [in] object whi
         qDebug() << "Invalid arguments";
         return false;
     }
-    
+
     _signalEmitter = signalEmitter;
     _rgSignals = rgSignals;
     _cSignals = cSignals;
@@ -62,7 +62,7 @@ bool MultiSignalSpy::init(QObject*        signalEmitter,    ///< [in] object whi
             return false;
         }
     }
-    
+
     return true;
 }
 
@@ -72,7 +72,7 @@ bool MultiSignalSpy::_checkSignalByMaskWorker(quint32 mask, bool multipleSignals
         if ((1 << i) & mask) {
             QSignalSpy* spy = _rgSpys[i];
             Q_ASSERT(spy != nullptr);
-            
+
             if ((multipleSignalsAllowed && spy->count() ==  0) || (!multipleSignalsAllowed && spy->count() != 1)) {
                 qDebug() << "Failed index:" << i;
                 _printSignalState(mask);
@@ -80,7 +80,7 @@ bool MultiSignalSpy::_checkSignalByMaskWorker(quint32 mask, bool multipleSignals
             }
         }
     }
-    
+
     return true;
 }
 
@@ -102,7 +102,7 @@ bool MultiSignalSpy::_checkOnlySignalByMaskWorker(quint32 mask, bool multipleSig
             }
         }
     }
-    
+
     return true;
 }
 
@@ -140,7 +140,7 @@ bool MultiSignalSpy::checkNoSignalByMask(quint32 mask)
             }
         }
     }
-    
+
     return true;
 }
 
@@ -164,7 +164,7 @@ void MultiSignalSpy::clearSignalByIndex(quint32 index)
 {
     Q_ASSERT(index < _cSignals);
     Q_ASSERT(_rgSpys[index] != nullptr);
-    
+
     _rgSpys[index]->clear();
 }
 
@@ -204,7 +204,7 @@ bool MultiSignalSpy::waitForSignalByIndex(
     // Check input parameters
     if (msec < -1 || msec == 0)
         return false;
-    
+
     // activate the timeout
     _timeout = false;
     int timerId;
@@ -214,15 +214,15 @@ bool MultiSignalSpy::waitForSignalByIndex(
     } else {
         timerId = 0;
     }
-    
+
     // Begin waiting
     QSignalSpy* spy = _rgSpys[index];
     Q_ASSERT(spy);
-    
+
     while (spy->count() == 0 && !_timeout) {
         QTest::qWait(100);
     }
-    
+
     // Clean up and return status
     if (timerId) {
         killTimer(timerId);
diff --git a/test/qgcunittest/MultiSignalSpy.h b/test/qgcunittest/MultiSignalSpy.h
index 2065efa29da3..9063238496ef 100644
--- a/test/qgcunittest/MultiSignalSpy.h
+++ b/test/qgcunittest/MultiSignalSpy.h
@@ -24,7 +24,7 @@ class QSignalSpy;
 class MultiSignalSpy : public QObject
 {
     Q_OBJECT
-    
+
 public:
     MultiSignalSpy(QObject* parent = nullptr);
     ~MultiSignalSpy();
@@ -57,7 +57,7 @@ class MultiSignalSpy : public QObject
     void clearAllSignals(void);
 
     bool waitForSignalByIndex(quint32 index, int msec);
-    
+
     QSignalSpy* getSpyByIndex(quint32 index);
 
     // Returns the value type for the first parameter of the signal
@@ -68,7 +68,7 @@ class MultiSignalSpy : public QObject
 private:
     // QObject overrides
     void timerEvent(QTimerEvent * event);
-    
+
     void _printSignalState(quint32 mask);
     bool _checkSignalByMaskWorker(quint32 mask, bool multipleSignalsAllowed);
     bool _checkOnlySignalByMaskWorker(quint32 mask, bool multipleSignalsAllowed);
@@ -79,4 +79,3 @@ class MultiSignalSpy : public QObject
     size_t          _cSignals;
     bool            _timeout;
 };
-
diff --git a/test/qgcunittest/MultiSignalSpyV2.cc b/test/qgcunittest/MultiSignalSpyV2.cc
index efcca511d473..97996aef28ce 100644
--- a/test/qgcunittest/MultiSignalSpyV2.cc
+++ b/test/qgcunittest/MultiSignalSpyV2.cc
@@ -37,7 +37,7 @@ bool MultiSignalSpyV2::init(QObject* signalEmitter)
         qWarning() << "No signalEmitter specified";
         return false;
     }
-    
+
     _signalEmitter = signalEmitter;
 
     const QMetaObject* metaObject = signalEmitter->metaObject();
@@ -85,7 +85,7 @@ bool MultiSignalSpyV2::_checkSignalByMaskWorker(quint64 mask, bool multipleSigna
         if ((1ll << i) & mask) {
             QSignalSpy* spy = _rgSpys[i];
             Q_ASSERT(spy != nullptr);
-            
+
             if ((multipleSignalsAllowed && spy->count() ==  0) || (!multipleSignalsAllowed && spy->count() != 1)) {
                 qWarning() << "Failed index:" << i;
                 _printSignalState(mask);
@@ -93,7 +93,7 @@ bool MultiSignalSpyV2::_checkSignalByMaskWorker(quint64 mask, bool multipleSigna
             }
         }
     }
-    
+
     return true;
 }
 
@@ -115,7 +115,7 @@ bool MultiSignalSpyV2::_checkOnlySignalByMaskWorker(quint64 mask, bool multipleS
             }
         }
     }
-    
+
     return true;
 }
 
@@ -153,7 +153,7 @@ bool MultiSignalSpyV2::checkNoSignalByMask(quint64 mask)
             }
         }
     }
-    
+
     return true;
 }
 
@@ -216,7 +216,7 @@ bool MultiSignalSpyV2::waitForSignal(const char* signalName, int msecs)
     // Check input parameters
     if (msecs < -1 || msecs == 0)
         return false;
-    
+
     // activate the timeout
     _timeout = false;
     int timerId;
@@ -226,15 +226,15 @@ bool MultiSignalSpyV2::waitForSignal(const char* signalName, int msecs)
     } else {
         timerId = 0;
     }
-    
+
     // Begin waiting
     QSignalSpy* spy = getSpy(signalName);
     Q_ASSERT(spy);
-    
+
     while (spy->count() == 0 && !_timeout) {
         QTest::qWait(100);
     }
-    
+
     // Clean up and return status
     if (timerId) {
         killTimer(timerId);
diff --git a/test/qgcunittest/MultiSignalSpyV2.h b/test/qgcunittest/MultiSignalSpyV2.h
index 9efdd5de0dd0..daa85ba3bd75 100644
--- a/test/qgcunittest/MultiSignalSpyV2.h
+++ b/test/qgcunittest/MultiSignalSpyV2.h
@@ -21,7 +21,7 @@ class QSignalSpy;
 class MultiSignalSpyV2 : public QObject
 {
     Q_OBJECT
-    
+
 public:
     MultiSignalSpyV2(QObject* parent = nullptr);
     ~MultiSignalSpyV2();
@@ -56,7 +56,7 @@ class MultiSignalSpyV2 : public QObject
     void clearAllSignals(void);
 
     bool waitForSignal(const char* signalName, int msec);
-    
+
     QSignalSpy* getSpy(const char* signalName);
 
     // Returns the value type for the first parameter of the signal
@@ -67,7 +67,7 @@ class MultiSignalSpyV2 : public QObject
 private:
     // QObject overrides
     void timerEvent(QTimerEvent * event);
-    
+
     void _printSignalState              (quint64 mask);
     bool _checkSignalByMaskWorker       (quint64 mask, bool multipleSignalsAllowed);
     bool _checkOnlySignalByMaskWorker   (quint64 mask, bool multipleSignalsAllowed);
@@ -77,4 +77,3 @@ class MultiSignalSpyV2 : public QObject
     QList<QSignalSpy*>  _rgSpys;
     bool                _timeout;
 };
-
diff --git a/test/qgcunittest/UnitTest.cc b/test/qgcunittest/UnitTest.cc
index 3bc84ea56bae..79e11d500ec8 100644
--- a/test/qgcunittest/UnitTest.cc
+++ b/test/qgcunittest/UnitTest.cc
@@ -22,7 +22,7 @@
 #include <QtTest/QTest>
 #include <QtTest/QSignalSpy>
 
-QGC_LOGGING_CATEGORY(UnitTestLog, "qgc.test.qgcunittest.unittest")
+QGC_LOGGING_CATEGORY(UnitTestLog, "API.UnitTest")
 
 UnitTest::UnitTest(QObject *parent)
     : QObject(parent)
diff --git a/tools/HeaderUpdater.py b/tools/HeaderUpdater.py
index 1df939d3cc54..856a741e2b93 100644
--- a/tools/HeaderUpdater.py
+++ b/tools/HeaderUpdater.py
@@ -3,10 +3,10 @@
 import re
 
 # Define the file extensions you want to target
-TARGET_EXTENSIONS = ['.cpp', '.cc', '.h', '.qml']  # Add other extensions as needed
+TARGET_EXTENSIONS = [".cpp", ".cc", ".h", ".qml"]  # Add other extensions as needed
 
 # Define the new header with a placeholder for the updated year
-HEADER_TEMPLATE = '''/****************************************************************************
+HEADER_TEMPLATE = """/****************************************************************************
  *
  * (c) 2009-{year} QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
  *
@@ -14,7 +14,7 @@
  * COPYING.md in the root of the source code directory.
  *
  ****************************************************************************/
-'''
+"""
 
 
 def update_header_in_file(file_path, header_template):
@@ -22,23 +22,25 @@ def update_header_in_file(file_path, header_template):
     current_year = datetime.datetime.now().year
     new_header = header_template.format(year=current_year)
 
-    with open(file_path, 'r') as file:
+    with open(file_path, "r") as file:
         content = file.read()
 
     # Regex pattern to match both "2009-XXXX" and just "XXXX"
-    header_pattern = re.compile(r'\(c\)\s*(2009-\d{4}|\d{4}) QGROUNDCONTROL')
+    header_pattern = re.compile(r"\(c\)\s*(2009-\d{4}|\d{4}) QGROUNDCONTROL")
 
     # Check if the header already exists
     match = header_pattern.search(content)
 
     if match:
         # Update the header to include "2009-current_year" if it is in the wrong format
-        updated_content = header_pattern.sub(f'(c) 2009-{current_year} QGROUNDCONTROL', content)
+        updated_content = header_pattern.sub(
+            f"(c) 2009-{current_year} QGROUNDCONTROL", content
+        )
     else:
         # Prepend the new header if it's missing
         updated_content = new_header + "\n" + content
 
-    with open(file_path, 'w') as file:
+    with open(file_path, "w") as file:
         file.write(updated_content)
 
 
diff --git a/tools/setup/install-dependencies-debian.sh b/tools/setup/install-dependencies-debian.sh
index 6b75c0cff739..b7e0fc750a56 100755
--- a/tools/setup/install-dependencies-debian.sh
+++ b/tools/setup/install-dependencies-debian.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
-#
-# QGroundControl build‑time dependencies for Ubuntu/Debian‑based images
-# --------------------------------------------------------------------
-# * Designed for non‑interactive CI/containers
-# * Uses --no-install-recommends to keep the image lean
-# * Cleans APT cache at the end to minimise final size
-
 set -euo pipefail
 export DEBIAN_FRONTEND=noninteractive
 
@@ -48,7 +41,8 @@ apt-get install -y -qq --no-install-recommends \
     zsync
 
 pipx ensurepath
-pipx install cmake ninja
+pipx install cmake
+pipx install ninja
 
 # --------------------------------------------------------------------
 # Qt6 compile/runtime dependencies
@@ -121,7 +115,8 @@ apt-get install -y -qq --no-install-recommends \
 # Miscellaneous
 # --------------------------------------------------------------------
 apt-get install -y -qq --no-install-recommends \
-    libvulkan-dev
+    libvulkan-dev \
+    libpipewire-0.3-dev
 
 # --------------------------------------------------------------------
 # Clean‑up
diff --git a/tools/setup/install-dependencies-osx.sh b/tools/setup/install-dependencies-osx.sh
index 5bf5beb0e43e..36e2b658a943 100755
--- a/tools/setup/install-dependencies-osx.sh
+++ b/tools/setup/install-dependencies-osx.sh
@@ -12,15 +12,15 @@ brew install cmake ninja ccache git pkgconf create-dmg mold
 
 # Install GStreamer
 GST_URL=https://gstreamer.freedesktop.org/data/pkg/osx
-GST_VERSION=1.24.12
+GST_VERSION=1.24.13
 GST_PKG=gstreamer-1.0-$GST_VERSION-universal.pkg
 GST_DEV_PKG=gstreamer-1.0-devel-$GST_VERSION-universal.pkg
-pushd $TMPDIR
-curl -O $GST_URL/$GST_VERSION/$GST_DEV_PKG
-curl -O $GST_URL/$GST_VERSION/$GST_PKG
+pushd "$TMPDIR" || exit
+curl -O "$GST_URL/$GST_VERSION/$GST_DEV_PKG"
+curl -O "$GST_URL/$GST_VERSION/$GST_PKG"
 echo "Sudo may be required to install GStreamer"
 sudo installer -pkg "$GST_PKG" -target /
 sudo installer -pkg "$GST_DEV_PKG" -target /
-rm $TMPDIR/$GST_DEV_PKG
-rm $TMPDIR/$GST_PKG
-popd
+rm "$TMPDIR/$GST_DEV_PKG"
+rm "$TMPDIR/$GST_PKG"
+popd || exit
diff --git a/tools/setup/install-qt-debian.sh b/tools/setup/install-qt-debian.sh
index 06c68880ed55..8831fc356a9d 100755
--- a/tools/setup/install-qt-debian.sh
+++ b/tools/setup/install-qt-debian.sh
@@ -2,14 +2,15 @@
 
 set -e
 
-QT_VERSION="${QT_VERSION:-6.8.3}"
+QT_VERSION="${QT_VERSION:-6.10.1}"
 QT_PATH="${QT_PATH:-/opt/Qt}"
 QT_HOST="${QT_HOST:-linux}"
 QT_TARGET="${QT_TARGET:-desktop}"
 QT_ARCH="${QT_ARCH:-linux_gcc_64}"
 QT_ARCH_DIR="${QT_ARCH_DIR:-gcc_64}"
 QT_ROOT_DIR="${QT_ROOT_DIR:-${QT_PATH}/${QT_VERSION}/${QT_ARCH_DIR}}"
-QT_MODULES="${QT_MODULES:-qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors}"
+QT_MODULES_STR="${QT_MODULES:-qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml}"
+IFS=' ' read -r -a QT_MODULES <<< "$QT_MODULES_STR"
 
 echo "QT_VERSION $QT_VERSION"
 echo "QT_PATH $QT_PATH"
@@ -18,21 +19,30 @@ echo "QT_TARGET $QT_TARGET"
 echo "QT_ARCH $QT_ARCH"
 echo "QT_ARCH_DIR $QT_ARCH_DIR"
 echo "QT_ROOT_DIR $QT_ROOT_DIR"
-echo "QT_MODULES $QT_MODULES"
+echo "QT_MODULES ${QT_MODULES[*]}"
 
 apt-get update -y --quiet
 apt-get install python3 python3-pip pipx -y
-pipx install aqtinstall cmake ninja
+pipx install aqtinstall
+pipx install cmake
+pipx install ninja
 pipx ensurepath
-export PATH="$(python3 -m site --user-base)/bin:$PATH"
-aqt install-qt ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} -O ${QT_PATH} -m ${QT_MODULES}
+USER_BASE_BIN="$(python3 -m site --user-base)/bin"
+export PATH="$USER_BASE_BIN:$PATH"
+aqt install-qt "${QT_HOST}" "${QT_TARGET}" "${QT_VERSION}" "${QT_ARCH}" -O "${QT_PATH}" -m "${QT_MODULES[@]}"
 
-export QT_ROOT_DIR=$(readlink -e ${QT_ROOT_DIR})
-export PATH=$(readlink -e ${QT_ROOT_DIR}/bin/):$PATH
-export PKG_CONFIG_PATH=$(readlink -e ${QT_ROOT_DIR}/lib/pkgconfig):$PKG_CONFIG_PATH
-export LD_LIBRARY_PATH=$(readlink -e ${QT_ROOT_DIR}/lib):$LD_LIBRARY_PATH
-export QT_PLUGIN_PATH=$(readlink -e ${QT_ROOT_DIR}/plugins)
-export QML2_IMPORT_PATH=$(readlink -e ${QT_ROOT_DIR}/qml)
+QT_ROOT_DIR=$(readlink -e "${QT_ROOT_DIR}")
+export QT_ROOT_DIR
+PATH=$(readlink -e "${QT_ROOT_DIR}/bin/"):$PATH
+export PATH
+PKG_CONFIG_PATH=$(readlink -e "${QT_ROOT_DIR}/lib/pkgconfig"):$PKG_CONFIG_PATH
+export PKG_CONFIG_PATH
+LD_LIBRARY_PATH=$(readlink -e "${QT_ROOT_DIR}/lib"):$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
+QT_PLUGIN_PATH=$(readlink -e "${QT_ROOT_DIR}/plugins")
+export QT_PLUGIN_PATH
+QML2_IMPORT_PATH=$(readlink -e "${QT_ROOT_DIR}/qml")
+export QML2_IMPORT_PATH
 
 echo "QT_ROOT_DIR $QT_ROOT_DIR"
 echo "PATH $PATH"
diff --git a/tools/setup/install-qt-macos.sh b/tools/setup/install-qt-macos.sh
index 2526521bc197..de5f579944e8 100755
--- a/tools/setup/install-qt-macos.sh
+++ b/tools/setup/install-qt-macos.sh
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 
 # Set defaults appropriate for macOS.
-QT_VERSION="${QT_VERSION:-6.8.3}"
+QT_VERSION="${QT_VERSION:-6.10.1}"
 QT_PATH="${QT_PATH:-/opt/Qt}"
 QT_HOST="${QT_HOST:-mac}"
 QT_TARGET="${QT_TARGET:-desktop}"
 QT_ARCH="${QT_ARCH:-mac}"
-QT_MODULES="${QT_MODULES:-qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors}"
+QT_MODULES_STR="${QT_MODULES:-qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml}"
+IFS=' ' read -r -a QT_MODULES <<< "$QT_MODULES_STR"
 
 set -e
 
@@ -15,7 +16,7 @@ echo "QT_PATH:    $QT_PATH"
 echo "QT_HOST:    $QT_HOST"
 echo "QT_TARGET:  $QT_TARGET"
 echo "QT_ARCH:    $QT_ARCH"
-echo "QT_MODULES: $QT_MODULES"
+echo "QT_MODULES: ${QT_MODULES[*]}"
 
 # Update Homebrew and install Python 3 (if needed)
 brew update
@@ -25,17 +26,23 @@ brew install python3
 pip3 install --upgrade setuptools wheel py7zr ninja cmake aqtinstall
 
 # Use aqtinstall to download and install Qt.
-aqt install-qt ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} -O ${QT_PATH} -m ${QT_MODULES}
+aqt install-qt "${QT_HOST}" "${QT_TARGET}" "${QT_VERSION}" "${QT_ARCH}" -O "${QT_PATH}" -m "${QT_MODULES[@]}"
 
 # macOS does not support GNU readlink -e.
 # We use realpath instead (or substitute with greadlink -f if needed).
 # Note: On macOS, dynamic libraries are resolved using DYLD_LIBRARY_PATH.
-export PATH="$(realpath ${QT_PATH}/${QT_VERSION}/${QT_ARCH}/bin):$PATH"
-export PKG_CONFIG_PATH="$(realpath ${QT_PATH}/${QT_VERSION}/${QT_ARCH}/lib/pkgconfig):$PKG_CONFIG_PATH"
-export DYLD_LIBRARY_PATH="$(realpath ${QT_PATH}/${QT_VERSION}/${QT_ARCH}/lib):$DYLD_LIBRARY_PATH"
-export QT_ROOT_DIR="$(realpath ${QT_PATH}/${QT_VERSION}/${QT_ARCH})"
-export QT_PLUGIN_PATH="$(realpath ${QT_PATH}/${QT_VERSION}/${QT_ARCH}/plugins)"
-export QML2_IMPORT_PATH="$(realpath ${QT_PATH}/${QT_VERSION}/${QT_ARCH}/qml)"
+QT_BIN_DIR=$(realpath "${QT_PATH}/${QT_VERSION}/${QT_ARCH}/bin")
+export PATH="$QT_BIN_DIR:$PATH"
+QT_PKGCONFIG_DIR=$(realpath "${QT_PATH}/${QT_VERSION}/${QT_ARCH}/lib/pkgconfig")
+export PKG_CONFIG_PATH="$QT_PKGCONFIG_DIR:$PKG_CONFIG_PATH"
+QT_LIB_DIR=$(realpath "${QT_PATH}/${QT_VERSION}/${QT_ARCH}/lib")
+export DYLD_LIBRARY_PATH="$QT_LIB_DIR:$DYLD_LIBRARY_PATH"
+QT_ROOT_DIR=$(realpath "${QT_PATH}/${QT_VERSION}/${QT_ARCH}")
+export QT_ROOT_DIR
+QT_PLUGIN_PATH=$(realpath "${QT_PATH}/${QT_VERSION}/${QT_ARCH}/plugins")
+export QT_PLUGIN_PATH
+QML2_IMPORT_PATH=$(realpath "${QT_PATH}/${QT_VERSION}/${QT_ARCH}/qml")
+export QML2_IMPORT_PATH
 
 echo "Updated environment variables:"
 echo "PATH:              $PATH"
diff --git a/tools/setup/install-qt-windows.ps1 b/tools/setup/install-qt-windows.ps1
index d2a26dac551d..68d84e485e25 100644
--- a/tools/setup/install-qt-windows.ps1
+++ b/tools/setup/install-qt-windows.ps1
@@ -11,13 +11,13 @@
 # ————————————————————————————————
 # 1) Defaults (env overrides supported)
 # ————————————————————————————————
-$QT_VERSION = $env:QT_VERSION      -or '6.8.3'
+$QT_VERSION = $env:QT_VERSION      -or '6.10.1'
 $QT_PATH    = $env:QT_PATH         -or 'C:\Qt'
 $QT_HOST    = $env:QT_HOST         -or 'windows'
 $QT_TARGET  = $env:QT_TARGET       -or 'desktop'
 # Windows arch must be one of: win64_msvc2017_64, win64_msvc2019_64, win64_mingw81, etc. :contentReference[oaicite:0]{index=0}
 $QT_ARCH    = $env:QT_ARCH         -or 'win64_msvc2022_64'
-$QT_MODULES = $env:QT_MODULES      -or 'qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors'
+$QT_MODULES = $env:QT_MODULES      -or 'qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors qtscxml'
 
 Write-Host "Using:"
 Write-Host "  QT_VERSION    = $QT_VERSION"
diff --git a/translations/README.md b/tools/translations/README.md
similarity index 87%
rename from translations/README.md
rename to tools/translations/README.md
index 722ccd13b910..11f2aa2abb9a 100644
--- a/translations/README.md
+++ b/tools/translations/README.md
@@ -9,13 +9,13 @@ Crowdin is configured to automatically sychronize the qgc.ts file once a day. So
 Add the new language from the CrowdIn settings as the first step.
 
 ### Periodically update the base transation files during the release cycle
-You do this by running the `source qgc-lupdate.sh` script 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.
+You do this by running the `source tools/translations/qgc-lupdate.sh` script 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.
 
 ## Translating strings within Json files
-QGC uses json files internally for metadata. These files need to be translated as well. There is a [python json parser](https://github.com/mavlink/qgroundcontrol/blob/master/translations/qgc-lupdate-json.py) which is used to find all the json files in the source tree and pull all the strings out for translation. This parser outputs the localization file for json strings in Qt .ts file format.
+QGC uses json files internally for metadata. These files need to be translated as well. There is a [python json parser](https://github.com/mavlink/qgroundcontrol/blob/master/tools/translations/qgc-lupdate-json.py) which is used to find all the json files in the source tree and pull all the strings out for translation. This parser outputs the localization file for json strings in Qt .ts file format.
 
 In order for the parser to know which strings must be translated additional keys must be available at the root object level.
 
@@ -52,4 +52,3 @@ This is used when you have two strings in the same file which are equal, but the
 ```
 
 In the example above "baz" is the string which is the same for two different keys. The prefix `#loc.disambiguation#` indicates a disambiguation is to follow which is the string between the next set of `#`s.
-
diff --git a/translations/qgc-lupdate-json.py b/tools/translations/qgc-lupdate-json.py
similarity index 58%
rename from translations/qgc-lupdate-json.py
rename to tools/translations/qgc-lupdate-json.py
index 5e5557c69a44..69a49bcc7413 100755
--- a/translations/qgc-lupdate-json.py
+++ b/tools/translations/qgc-lupdate-json.py
@@ -1,19 +1,20 @@
 #!/usr/bin/env python
 import os
 import json
-from xml.dom.minidom import parse
-import xml.dom.minidom
 import codecs
 import sys
 
-qgcFileTypeKey =        "fileType"
-translateKeysKey =      "translateKeys"
-arrayIDKeysKey =        "arrayIDKeys"
-disambiguationPrefix =  "#loc.disambiguation#"
+qgcFileTypeKey = "fileType"
+translateKeysKey = "translateKeys"
+arrayIDKeysKey = "arrayIDKeys"
+disambiguationPrefix = "#loc.disambiguation#"
 
-def parseJsonObjectForTranslateKeys(jsonObjectHierarchy, jsonObject, translateKeys, arrayIDKeys, locStringDict):
+
+def parseJsonObjectForTranslateKeys(
+    jsonObjectHierarchy, jsonObject, translateKeys, arrayIDKeys, locStringDict
+):
     for translateKey in translateKeys:
-        if (translateKey in jsonObject):
+        if translateKey in jsonObject:
             locStr = jsonObject[translateKey]
             currentHierarchy = jsonObjectHierarchy + "." + translateKey
             if locStr in locStringDict:
@@ -21,15 +22,30 @@ def parseJsonObjectForTranslateKeys(jsonObjectHierarchy, jsonObject, translateKe
                 locStringDict[locStr].append(currentHierarchy)
             else:
                 # First time we are seeing this string
-                locStringDict[locStr] = [ currentHierarchy ]
+                locStringDict[locStr] = [currentHierarchy]
     for key in jsonObject:
         currentHierarchy = jsonObjectHierarchy + "." + key
-        if (type(jsonObject[key]) == type({})):
-            parseJsonObjectForTranslateKeys(currentHierarchy, jsonObject[key], translateKeys,arrayIDKeys, locStringDict)
-        elif (type(jsonObject[key]) == type([])):
-            parseJsonArrayForTranslateKeys(currentHierarchy, jsonObject[key], translateKeys, arrayIDKeys, locStringDict)
+        if isinstance(jsonObject[key], dict):
+            parseJsonObjectForTranslateKeys(
+                currentHierarchy,
+                jsonObject[key],
+                translateKeys,
+                arrayIDKeys,
+                locStringDict,
+            )
+        elif isinstance(jsonObject[key], list):
+            parseJsonArrayForTranslateKeys(
+                currentHierarchy,
+                jsonObject[key],
+                translateKeys,
+                arrayIDKeys,
+                locStringDict,
+            )
+
 
-def parseJsonArrayForTranslateKeys(jsonObjectHierarchy, jsonArray, translateKeys, arrayIDKeys, locStringDict):
+def parseJsonArrayForTranslateKeys(
+    jsonObjectHierarchy, jsonArray, translateKeys, arrayIDKeys, locStringDict
+):
     for index in range(0, len(jsonArray)):
         jsonObject = jsonArray[index]
         arrayIndexStr = str(index)
@@ -38,54 +54,65 @@ def parseJsonArrayForTranslateKeys(jsonObjectHierarchy, jsonArray, translateKeys
                 arrayIndexStr = jsonObject[arrayIDKey]
                 break
         currentHierarchy = jsonObjectHierarchy + "[" + arrayIndexStr + "]"
-        parseJsonObjectForTranslateKeys(currentHierarchy, jsonObject, translateKeys, arrayIDKeys, locStringDict)
+        parseJsonObjectForTranslateKeys(
+            currentHierarchy, jsonObject, translateKeys, arrayIDKeys, locStringDict
+        )
+
 
 def addLocKeysBasedOnQGCFileType(jsonPath, jsonDict):
     # Instead of having to add the same keys over and over again in a pile of files we add them here automatically based on file type
     if qgcFileTypeKey in jsonDict:
         qgcFileType = jsonDict[qgcFileTypeKey]
-        translateKeyValue =         ""
-        arrayIDKeysKeyValue =       ""
+        translateKeyValue = ""
+        arrayIDKeysKeyValue = ""
         if qgcFileType == "MavCmdInfo":
-            translateKeyValue =         "label,enumStrings,friendlyName,description,category"
-            arrayIDKeysKeyValue =       "rawName,comment"
+            translateKeyValue = "label,enumStrings,friendlyName,description,category"
+            arrayIDKeysKeyValue = "rawName,comment"
         elif qgcFileType == "FactMetaData":
-            translateKeyValue =         "shortDesc,longDesc,enumStrings"
-            arrayIDKeysKeyValue =       "name"
+            translateKeyValue = "shortDesc,longDesc,enumStrings"
+            arrayIDKeysKeyValue = "name"
         if translateKeysKey not in jsonDict and translateKeyValue != "":
             jsonDict[translateKeysKey] = translateKeyValue
         if arrayIDKeysKey not in jsonDict and arrayIDKeysKeyValue != "":
             jsonDict[arrayIDKeysKey] = arrayIDKeysKeyValue
 
+
 def parseJson(jsonPath, locStringDict):
     jsonFile = open(jsonPath, "rb")
     jsonDict = json.load(jsonFile)
-    if (type(jsonDict) != type({})):
+    if not isinstance(jsonDict, dict):
         return
     addLocKeysBasedOnQGCFileType(jsonPath, jsonDict)
-    if (not translateKeysKey in jsonDict):
+    if translateKeysKey not in jsonDict:
         return
     translateKeys = jsonDict[translateKeysKey].split(",")
     arrayIDKeys = jsonDict.get(arrayIDKeysKey, "").split(",")
-    parseJsonObjectForTranslateKeys("", jsonDict, translateKeys, arrayIDKeys, locStringDict)
+    parseJsonObjectForTranslateKeys(
+        "", jsonDict, translateKeys, arrayIDKeys, locStringDict
+    )
+
 
 def walkDirectoryTreeForJsonFiles(dir, multiFileLocArray):
     for filename in os.listdir(dir):
         path = os.path.join(dir, filename)
-        if (os.path.isfile(path) and filename.endswith(".json")):
-            #print "json",path
+        if os.path.isfile(path) and filename.endswith(".json"):
+            # print "json",path
             singleFileLocStringDict = {}
             parseJson(path, singleFileLocStringDict)
             if len(singleFileLocStringDict.keys()):
                 # Check for duplicate file names
                 for entry in multiFileLocArray:
                     if entry[0] == filename:
-                        print("Error: Duplicate filenames: %s paths: %s %s" % (filename, path, entry[1]))
+                        print(
+                            "Error: Duplicate filenames: %s paths: %s %s"
+                            % (filename, path, entry[1])
+                        )
                         sys.exit(1)
                 multiFileLocArray.append([filename, path, singleFileLocStringDict])
-        if (os.path.isdir(path)):
+        if os.path.isdir(path):
             walkDirectoryTreeForJsonFiles(path, multiFileLocArray)
 
+
 def escapeXmlString(xmlStr):
     # Escape the string so it can be used in XML
     xmlStr = xmlStr.replace("&", "&amp;")
@@ -95,11 +122,12 @@ def escapeXmlString(xmlStr):
     xmlStr = xmlStr.replace('"', "&quot;")
     return xmlStr
 
+
 def writeJsonTSFile(multiFileLocArray):
-    jsonTSFile = codecs.open('qgc-json.ts', 'w', "utf-8")
-    jsonTSFile.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+    jsonTSFile = codecs.open("translations/qgc-json.ts", "w", "utf-8")
+    jsonTSFile.write('<?xml version="1.0" encoding="utf-8"?>\n')
     jsonTSFile.write("<!DOCTYPE TS>\n")
-    jsonTSFile.write("<TS version=\"2.1\">\n")
+    jsonTSFile.write('<TS version="2.1">\n')
     for entry in multiFileLocArray:
         jsonTSFile.write("<context>\n")
         jsonTSFile.write("    <name>%s</name>\n" % entry[0])
@@ -107,13 +135,13 @@ def writeJsonTSFile(multiFileLocArray):
         for locStr in singleFileLocStringDict.keys():
             disambiguation = ""
             if locStr.startswith(disambiguationPrefix):
-                workStr = locStr[len(disambiguationPrefix):]
+                workStr = locStr[len(disambiguationPrefix) :]
                 terminatorIndex = workStr.find("#")
                 if terminatorIndex == -1:
-                    print("Bad disambiguation %1 '%2'" % (entry[0], locStr))
+                    print(f"Bad disambiguation {entry[0]} '{locStr}'")
                     sys.exit(1)
                 disambiguation = workStr[:terminatorIndex]
-                locStr = workStr[terminatorIndex+1:]
+                locStr = workStr[terminatorIndex + 1 :]
             jsonTSFile.write("    <message>\n")
             if len(disambiguation):
                 jsonTSFile.write("        <comment>%s</comment>\n" % disambiguation)
@@ -121,21 +149,27 @@ def writeJsonTSFile(multiFileLocArray):
             for jsonHierachy in singleFileLocStringDict[locStr]:
                 extraCommentStr += "%s, " % jsonHierachy
             locStr = escapeXmlString(locStr)
-            jsonTSFile.write("        <extracomment>%s</extracomment>\n" % extraCommentStr)
-            if (extraCommentStr.endswith(".enumStrings, ")):
-                jsonTSFile.write("        <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>\n")
-            jsonTSFile.write("        <location filename=\"%s\"/>\n" % entry[1])
+            jsonTSFile.write(
+                "        <extracomment>%s</extracomment>\n" % extraCommentStr
+            )
+            if extraCommentStr.endswith(".enumStrings, "):
+                jsonTSFile.write(
+                    "        <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>\n"
+                )
+            jsonTSFile.write('        <location filename="%s"/>\n' % entry[1])
             jsonTSFile.write("        <source>%s</source>\n" % locStr)
-            jsonTSFile.write("        <translation type=\"unfinished\"></translation>\n")
+            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)
     writeJsonTSFile(multiFileLocArray)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()
diff --git a/tools/translations/qgc-lupdate.sh b/tools/translations/qgc-lupdate.sh
new file mode 100755
index 000000000000..ac1c0bcc6012
--- /dev/null
+++ b/tools/translations/qgc-lupdate.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# This script will update both the Qt and Json string translation files.
+# Run from repository root: source tools/translations/qgc-lupdate.sh
+QT_PATH=(~/Qt/6.1[0-9].*/*/bin)
+"${QT_PATH[0]}"/lupdate src -ts translations/qgc.ts -no-obsolete
+python3 tools/translations/qgc-lupdate-json.py
diff --git a/translations/qgc-lupdate.sh b/translations/qgc-lupdate.sh
deleted file mode 100755
index 06f4d8e9863f..000000000000
--- a/translations/qgc-lupdate.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# This script will update both the Qt and Json string translation files.
-QT_PATH=~/Qt/6.8.3/*/bin
-$QT_PATH/lupdate ../src -ts qgc.ts -no-obsolete
-python3 qgc-lupdate-json.py
diff --git a/translations/qgc.ts b/translations/qgc.ts
index cb4788937032..535da248ca71 100644
--- a/translations/qgc.ts
+++ b/translations/qgc.ts
@@ -4045,59 +4045,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
 </context>
 <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
         <source>GStreamer Debug Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
         <source>Logging categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
         <source>Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
         <source>Log files (*.txt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
         <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
         <source>Select log save file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
         <source>Save App Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
         <source>Show Latest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+        <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
         <source>Set Logging</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8338,7 +8338,7 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
         <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-        <source>Button Assigment</source>
+        <source>Button Assignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/translations/qgc_az_AZ.ts b/translations/qgc_az_AZ.ts
deleted file mode 100644
index bbf88e93a27f..000000000000
--- a/translations/qgc_az_AZ.ts
+++ /dev/null
@@ -1,3988 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="az" sourcelanguage="en">
-  <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">Lights 2 level</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</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">Pitch Rate Setpoint</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</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">Accel Error</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</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">Good Const Pos Mode Estimate</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">Good Pred Horiz Pos Abs Estimate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</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">Good Horiz Vel Estimate</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">Good Vert Pos Abs Estimate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</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">Good Vert Pos AGL Estimate</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">Good Horiz Pos Rel Estimate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</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">Good Vert Vel Estimate</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">Good Horiz Pos Abs Estimate</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">Good Pred Horiz Pos Rel Estimate</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">Next WP Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</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">Temperature (3)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</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">Wind Spd (vert)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</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">Date</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[currentTime].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/ClockFact.json"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</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">Clip Count (3)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</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">Survey-In Active</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">Current Survey-In Accuracy</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">Current Survey-In Altitude</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</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">Current Survey-In Longitude</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</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">Current Survey-In Duration</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</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">Current Survey-In Latitude</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">Watts</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</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">n/a,Normal Operation,Low Battery State,Critical Battery State,Emergency Battery State,Battery Failed,Battery Unhealthy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</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">Right</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</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">Blocks Pending</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDescription, </extracomment>
-      <location filename="../src/Vehicle/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</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">Horizontal distance from ground station to vehicle</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">Vertical distance from Launch (home) position to vehicle</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">Angle from ground station to vehicle</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">Center,Tangent</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">Exit loiter from</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">Enable</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">Land using VTOL mode.</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">Takeoff to specified altitude.</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">Yaw</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">Roll</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">VTOL</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">On,Off</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">Setting</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">Pitch</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">Enable,Disable</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">Take off from the ground and ascend to specified altitude.</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">Heading</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">Travel to a position and Loiter indefinitely.</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">Travel to a position and Loiter for an amount of time.</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">Hover straight up to specified altitude. Then travel to specified position.</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">Travel to a position and Loiter for a number of turns.</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">AirMap API Key</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[password].shortDescription, </extracomment>
-      <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
-      <source>AirMap Password</source>
-      <translation type="unfinished">AirMap Password</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">Enable AirMap Telemetry</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[enableAirMap].shortDescription, </extracomment>
-      <location filename="../src/Airmap/AirMap.SettingsGroup.json"/>
-      <source>Enable AirMap</source>
-      <translation type="unfinished">Enable AirMap</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">AirMap Client ID</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">AirMap User Name</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">Show Airspace on Map (Experimental)</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">Use Personal AirMap API Key</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">Launch position altitude</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">Stop taking video</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">Stop taking photos</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">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.</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">Altitude for landing point.</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">Value controller loiter point is distance</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDescription, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</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">Distance between landing and loiter points.</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">Heading from loiter point to land point.</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">The glide slope between the loiter and landing point.</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">override fw 4</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">override fw 4 7</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">override fw 4 5</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">1,2</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">override fw 4 3</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">override fw 4 1</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">category</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">Unit Test 5</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">param1</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">Unit Test 4</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">1,2</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">param7</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">param6</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">param5</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">param4</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">param3</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">param2</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">Unit Test 3</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">description</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">Focal length of camera lens.</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">Height of camera image sensor.</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">Camera orientation ix fixed and cannot be changed.</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">Camera image resolution width.</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">Width of camera image sensor.</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">Camera image resolution height.</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">Camera on vehicle is in landscape orientation.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDescription, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</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">Minimum amount of time between each camera trigger.</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">Altitude for the bottom layer of the structure scan.</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">Amount of additional distance to add outside the survey area for vehicle turnaround.</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">Corridor width. Specify 0 width for a single pass scan.</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">Amount of spacing in between parallel grid lines.</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">Distance between each triggering of the camera. 0 specifies not camera trigger.</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">Set the current flight speed</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">Specify whether the camera should take photos or video</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">Specify the distance between each photo</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">Specify whether the camera should switch to Photo, Video or Survey mode</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">Specify the time between each photo</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">Photo,Video,Survey</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">Gimbal yaw rotation.</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">Gimbal pitch rotation.</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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</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">Amount of overlap between images in the forward facing direction.</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">Distance vehicle is away from surface.</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">Value specified is distance to surface.</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">Amount of overlap between images in the side facing direction.</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">Image desity at surface.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDescription, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</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">Cut off</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</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">Wait for distance</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">Guided enable</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">Timeout</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">Change to/from inverted flight.</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">Cancels the region of interest.</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">Set relay to a condition.</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">Set camera trigger distance.</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">Gripper id</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">Altitude wait</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">Wait for altitude</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">Set servo to specified PWM value.</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">Flight control</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</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">Photo count</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">Set launch location</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">Direction</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">Reboot/Shutdown vehicle</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">Servo</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">Stabilize Yaw</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">Release,Grab</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">Alt/Yaw</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">Step</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">Ignore Alt</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">Vehicle position,Specified position</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">Loiter (altitude)</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">Exposure</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</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">Takeoff local</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</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">Status Frequency</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">Turns</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">Set relay</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">Travel to a position and Loiter around the specified radius indefinitely.</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">Return To Launch</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</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">Hover Mode,Plane Mode</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">Region of interest</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">Payload prepare deploy</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">Normal,Inverted</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</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">VTOL Transition</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">Climb,Neutral,Descend</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">Inverted</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">Travel to a position in 3D space using spline path.</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">Custom Mode</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">Center,Tangent</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">VTOL land</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">Cycle servo</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">Cycles</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">Sub Mode</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">Safety</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">Start image capture</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">Relay #</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">Travel to a position and Loiter around the specified radius for an amount of time.</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">Shutter spd</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">Full planning</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">Set sensor offsets</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">Camera trigger distance</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">Mission will continue at the specified item.</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">Travel to a position and Loiter around the specified radius for a number of turns.</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">Delay unti the specified time is reached.</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">Camera</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">Abort Alt</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</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">Wait for Yaw</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">Type</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>PassThru</source>
-      <translation type="unfinished">PassThru</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">Relative,Absolute</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">Enable</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">Yaw offset</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">Get capabilities</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">Set moving direction</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">Sets the region of interest to point towards the next waypoint with optional offsets.</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">Bind Spektrum receiver</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">Rally land</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">Enable,Disable</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">Hold</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">Trigger control</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">Advanced</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">Travel to a position in 3D space.</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">Throttle</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">Change Altitude</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">Enable/Disable geofence.</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">Set servo</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</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">Value</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">Zoom</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">Trigger</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">Command</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">Enable/Disabled guided mode.</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">Land vehicle at the specified location.</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">Sec (utc)</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">ROI Index</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">Control Mount</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">Inverted flight</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">Sets the region of interest for cameras.</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">Stop taking photos.</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</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">Delay the mission until the specified altitide is reached.</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">Session</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">Radius</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</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">Heading wait</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">Spline waypoint</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</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">Set camera modes</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">Yaw</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">Payload control deploy</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">Set message interval</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">Loiter at specified position until altitude reached.</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">Change speed and/or throttle set points.</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">Start video capture</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">ISO</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</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">Basic</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">Disable,Enable</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">AutoTune Enable</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">Delay the mission until the specified yaw is reached.</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</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">Control onboard camera.</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">Delay mission state machine until gate has been reached.</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">Hour (utc)</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">Vehicle reposition</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">Set camera photo, video modes.</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">Heading goal</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">Operate EPM gripper.</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">Configure the vehicle mount (e.g. gimbal).</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">Take photos,Record video,Survey photo mode</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">Enable geofence</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">Offset</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">Get launch position</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">Stop image capture</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</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">Start taking one or more photos.</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper</source>
-      <translation type="unfinished">Gripper</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">Stop video capture</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">Shutter</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">Perform flight mode transition.</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">Pause/Continue</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">False,True</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">Local planning</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">Time</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</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">Lon/Roll</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">Conditionals</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">Clockwise,Counter-Clockwise</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">Guided limits</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">Min (utc)</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">Marker to indicate start of landing sequence.</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">Mission Index</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">Configure Mount</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">AutoTune Enable.</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">Change speed</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">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</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">Configure onboard camera controller.</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</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">Launch from the ground and travel towards the specified takeoff position.</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">Disable,Enable,Release</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">Control video</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</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">Set moving direction to forward or reverse.</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">Delay the mission until within the specified distance of the next waypoint.</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">ROI to next waypoint</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">Delay the mission for the number of seconds.</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">Max Alt</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">Disable,Enable,Enable+reset</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</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">Go around</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">Stabilize Roll</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</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">Set Parameter</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">Cancel ROI</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</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">No Trigger,Once Immediately</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">Cycle relay on/off for desired cycles/time.</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">Min Alt</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">Stabilize Pitch</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">Focus lock</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">Disable,Disable floor only,Enable</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">Motor test</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">Get message interval</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">Exit loiter from</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">Camera control</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">Roll offset</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">Forward,Reverse</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</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">H Limit</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">Control the vehicle mount (e.g. gimbal).</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</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">VTOL takeoff</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">Set flight mode</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">Land local</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">Distance</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">Interval</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">None,Next waypoint,Mission item,Location,ROI item</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">Control autonomous path planning.</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">Cycle relay</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">Mode</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">Loiter (turns)</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">Loiter</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">Region of interest (ROI)</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">Aperture</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">Land start</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">PWM</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">Stop video capture.</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">Arm/Disarm</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">Fly to specified location at current altitude, transition to multi-rotor and land.</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">Disable,Enable,Enable+reset,Enable+reset route only</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">Set limits for external control</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">Set flight mode.</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">Camera config</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">Speed</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">No,Yes</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">Pitch offset</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</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">Loiter (time)</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">Rate</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">Start video capture.</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">Lat/Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</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">Set mode</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">Send the vehicle back to the launch position.</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">Jump to item</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">Id</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">Airspeed,Ground Speed</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">Changes the launch location either to the current location or a specified location.</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">Angle for parallel lines of grid.</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">Split mission concave polygons into separate regular, convex polygons.</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">Fly every other transect in each pass.</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">Camera continues taking images in turn arounds.</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">Refly the pattern at a 90 degree angle</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">Amount of additional distance to add outside the survey area for vehicle turn around.</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">Stop and Hover at each image point before taking image</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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</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">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.</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">Stop taking photos</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDescription, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</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">Altitude for landing point on ground.</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">Stop taking video</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">Distance between landing and loiter points.</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">Heading from loiter point to land point.</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">Radius for geofence circle.</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">Start scanning from top of structure.</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">Number of scan layers.</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">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.</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">Vehicle will fly to/from the structure at this altitude.</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">Gimbal pitch rotation.</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">Height of structure being scanned.</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">Longitude of rally point position</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">Altitude of rally point position (home relative)</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">Latitude of rally point position</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">Longitude of breach return point position</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">Altitude of breach return point position (Rel)</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">Latitude of breach return point position</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">Center,Tangent</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">Exit loiter from</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">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</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">Show recording control in the UI.</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">How long to wait before assuming RTSP link is gone.</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">Video Display Fit</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">UDP port to bind to for video stream.</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">Disable Video Stream when disarmed.</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">RTSP Video Timeout</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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].enumStrings, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Hide,Show</source>
-      <translation type="unfinished">Hide,Show</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">Video Stream Disnabled When Armed</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">Video Grid Lines</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">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Video recording file format.</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">Video TCP Url</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">Handle Video Aspect Ratio.</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">Maximum amount of disk space used by video recording.</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">Displays a grid overlaid over the video view.</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">Video UDP Port</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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</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">Max Video Storage Usage</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">Video Stream Enabled</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">Fit Width,Fit Height,Stretch</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">Video RTSP Url</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">Tweaks video for lower latency</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">Video Recording Format</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">Start/Stop Video Stream.</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">mkv,mov,mp4</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDescription, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</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">Video save directory</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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</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">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.</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">Video Aspect Ratio</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">Enable/Disable Limits on Storage Usage</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">Show Video Record Control</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">Directory to save videos to.</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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Udp port to receive NMEA streams</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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Automatically connect to an RTK GPS</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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">If this option is enabled GroundControl will automatically connect to a PX4 Flow board which is connected via USB.</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">UDP target host port for autoconnect</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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</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">NMEA GPS device for GCS position</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">Automatically connect to a SiK Radio</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">Automatically open a connection over UDP</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">NMEA GPS Baudrate</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">UDP port for autoconnect</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">UDP target host IP for autoconnect</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">Automatically connect to a P4 Flow</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">Automatically connect to a Pixhawk board</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">Automatically connect to a LibrePilot</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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">User-selected brand image</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">Location in file system of user-selected brand image (outdoor)</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">Location in file system of user-selected brand image (indoor)</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">Minimum altitude for guided actions altitude slider.</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">Show additional heading indicators on Compass</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">Maximum distance allowed for Go To Location.</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">Use Vertical Instrument Panel instead of the default one</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">Keep map centered on vehicle</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">Maximum altitude for guided actions altitude slider.</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">Lock Compass Nose-Up</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">Show/Hide Log Replay status bar</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">Connect to ADSB SBS server</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">Connect to ADSB SBS-1 server using specified address/port</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDescription, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDescription, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Access token to Mapbox maps</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">Directory to which all data files  are saved/loaded from</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDescription, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDescription, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</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">Show large compass on instrument panel</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">Never,Always,When in Follow Me Flight Mode</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">Offline editing vehicle type</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">AutoLoad mission on vehicle connect</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">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)</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">Check Internet connection</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">Enable Microhard Module Support</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">Save telemetry Log after each flight</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">If this option is enabled the preflight checklist will be used.</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">Video streaming debug</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">If this option is enabled a telemetry will be saved after each flight completes.</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">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.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[language].shortDescription, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</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">Comma separated list of first run prompt ids which have already been shown.</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">Application font size</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">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Offline editing firmware type</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">Default firmware type for flashing</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">Your personal access token for Mapbox maps</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">Location in file system of user-selected brand image (indoor)</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">Access token to Esri maps</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">If this option is enabled the preflight checklist must pass before arming.</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">Preflight checklist must pass before arming</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">This value specifies the default altitude for new items added to a mission.</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">Show large compass</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">Offline editing descent speed</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">Your personal access token for Esri maps</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">Use Link Pairing.</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">User-selected brand image</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">Application save directory</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">Announce battery remaining percent</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">Offline editing ascent speed</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">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub</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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Save CSV Telementry Logs</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">Default value for altitude</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">Enable Taisync Module Support</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">Request start of MAVLink telemetry streams (ArduPilot only)</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">Disable all data persistence</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">Announce the remaining battery percent when it falls below the specified percentage.</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">Application color scheme</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">Offline editing cruise speed</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">If this option is set, nothing will be saved to disk.</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">Automatically load a mission file named AutoLoad#.mission when a vehicle with id # connects.</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">Mute audio output</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">Offline editing hover speed</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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Show virtual joystick</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">The point size for the default font used.</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">If this option is enabled all audio output will be muted.</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">Location in file system of user-selected brand image (outdoor)</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">Check Internet connection before accessing Internet resources.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[usePairing].shortDescription, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use Pairing</source>
-      <translation type="unfinished">Use Pairing</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">Save telemetry log even if vehicle was not armed</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">ArduPilot,PX4 Pro,Mavlink Generic</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">The color scheme for the user interface.</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">Stream GCS' coordinates to Autopilot</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">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.</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">Enable Taisync Video Support</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">Use preflight checklist</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">Survey in accuracy (U-blox only)</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">Specify the values for the RTK base position without having to do a survey in.</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">Base Position Latitude</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">Defines the minimum amount of observation time for the position calculation.</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">Base Position Accuracy</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">Base Position Alt (WGS84)</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">Defines the altitude of the fixed RTK base position.</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">The minimum accuracy value that Survey-In must achieve before it can complete.</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">Use specified base position</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">Minimum observation time</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">Defines the longitude of the fixed RTK base position.</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">Base Position Longitude</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">Defines the accuracy of the fixed RTK base position.</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">Defines the latitude of the fixed RTK base position.</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">Currently selected map type for flight maps</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">Currently selected map provider for flight maps</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">Default firmware type for flashing</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">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</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">Display the presets tab at start</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">Allow missions to not require a takeoff item</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">Show gimbal yaw visual only when set explicitly for the waypoint</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">Don't warn user about 'Above Terrain' usage</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">Show/Hide the mission item status display</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">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Minimum zoom level for downloads.</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">Maximum zoom level for downloads.</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">Maximum number of tiles for download.</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">Scale the RC range</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">Maximum parameter value</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">Minimum parameter value</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">Parameter value when RC output is 0</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">Easting of item position</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">Latitude of item position</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">Northing of item position</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDescription, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDescription, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</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">Hemisphere for position</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</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">Longitude of item position</translation>
-    </message>
-  </context>
-</TS>
diff --git a/translations/qgc_fa_IR.ts b/translations/qgc_fa_IR.ts
deleted file mode 100644
index 07b75c749422..000000000000
--- a/translations/qgc_fa_IR.ts
+++ /dev/null
@@ -1,18078 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fa" sourcelanguage="en">
-  <context>
-    <name>ADSBVehicleManager</name>
-    <message>
-      <location filename="../src/ADSB/ADSBVehicleManager.cc" line="70"/>
-      <source>ADSB Server Error: %1</source>
-      <translation type="unfinished">ADSB Server Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <source>Airframe is currently not set.</source>
-      <translation type="unfinished">Airframe is currently not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <source> and frame type &apos;%2&apos;</source>
-      <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="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="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
-      <source> To change this configuration, select the desired frame class below.</source>
-      <translation type="unfinished"> To change this configuration, select the desired frame class below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
-      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="19"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="40"/>
-      <source>Frame Setup is used to select the airframe which matches your vehicle.</source>
-      <translation type="unfinished">Frame Setup is used to select the airframe which matches your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="251"/>
-      <source>Param file github json download failed: %1</source>
-      <translation type="unfinished">Param file github json download failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="261"/>
-      <source>Param file download failed: %1</source>
-      <translation type="unfinished">Param file download failed: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <source>Frame Class</source>
-      <translation type="unfinished">Frame Class</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="226"/>
-      <source>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</source>
-      <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <source>Input channel:</source>
-      <translation type="unfinished">Input channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="20"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="31"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <source>Gimbal type</source>
-      <translation type="unfinished">Gimbal type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <source>Tilt input channel</source>
-      <translation type="unfinished">Tilt input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <source>Pan input channel</source>
-      <translation type="unfinished">Pan input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <source>Roll input channel</source>
-      <translation type="unfinished">Roll input channel</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraSubComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="648"/>
-      <source>Error during Solo video link setup: %1</source>
-      <translation type="unfinished">Error during Solo video link setup: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="770"/>
-      <source>Unable to change altitude, vehicle altitude not known.</source>
-      <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="775"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="838"/>
-      <source>Vehicle does not support guided takeoff</source>
-      <translation type="unfinished">Vehicle does not support guided takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="844"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="854"/>
-      <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="859"/>
-      <source>Unable to takeoff: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="877"/>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="897"/>
-      <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="885"/>
-      <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="890"/>
-      <source>Unable to start mission: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="975"/>
-      <source>Follow failed: Home position not set.</source>
-      <translation type="unfinished">Follow failed: Home position not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="985"/>
-      <source>Follow failed: Ground station cannot provide required position information.</source>
-      <translation type="unfinished">Follow failed: Ground station cannot provide required position information.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source> (Channel 5)</source>
-      <translation type="unfinished"> (Channel 5)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <source>Flight mode channel:</source>
-      <translation type="unfinished">Flight mode channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Not assigned</source>
-      <translation type="unfinished">Not assigned</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 1</source>
-      <translation type="unfinished">Channel 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 2</source>
-      <translation type="unfinished">Channel 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 3</source>
-      <translation type="unfinished">Channel 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 4</source>
-      <translation type="unfinished">Channel 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <source>Flight Mode </source>
-      <translation type="unfinished">Flight Mode </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <source>Simple Mode</source>
-      <translation type="unfinished">Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <source>Switch Options</source>
-      <translation type="unfinished">Switch Options</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <source>Channel option %1 :</source>
-      <translation type="unfinished">Channel option %1 :</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="18"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="29"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <source>Flight Mode 1</source>
-      <translation type="unfinished">Flight Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <source>Flight Mode 2</source>
-      <translation type="unfinished">Flight Mode 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <source>Flight Mode 3</source>
-      <translation type="unfinished">Flight Mode 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <source>Flight Mode 4</source>
-      <translation type="unfinished">Flight Mode 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <source>Flight Mode 5</source>
-      <translation type="unfinished">Flight Mode 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <source>Flight Mode 6</source>
-      <translation type="unfinished">Flight Mode 6</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <source>Enable Follow Me</source>
-      <translation type="unfinished">Enable Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <source>Waiting for Vehicle to update</source>
-      <translation type="unfinished">Waiting for Vehicle to update</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <source>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</source>
-      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <source>Reset To Supported Settings</source>
-      <translation type="unfinished">Reset To Supported Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <source>Vehicle Position</source>
-      <translation type="unfinished">Vehicle Position</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Maintain Current Offsets</source>
-      <translation type="unfinished">Maintain Current Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Specify Offsets</source>
-      <translation type="unfinished">Specify Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <source>Point Vehicle</source>
-      <translation type="unfinished">Point Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Maintain current vehicle orientation</source>
-      <translation type="unfinished">Maintain current vehicle orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Point at ground station location</source>
-      <translation type="unfinished">Point at ground station location</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Same direction as ground station movement</source>
-      <translation type="unfinished">Same direction as ground station movement</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <source>Vehicle Offsets</source>
-      <translation type="unfinished">Vehicle Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <source>Click in the graphic to change angle</source>
-      <translation type="unfinished">Click in the graphic to change angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="28"/>
-      <source>Follow Me Setup is used to configure support for the vehicle following the ground station location.</source>
-      <translation type="unfinished">Follow Me Setup is used to configure support for the vehicle following the ground station location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMHeliComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <source>Servo Setup</source>
-      <translation type="unfinished">Servo Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <source>Servo</source>
-      <translation type="unfinished">Servo</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <source>Min</source>
-      <translation type="unfinished">Min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <source>Max</source>
-      <translation type="unfinished">Max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <source>Trim</source>
-      <translation type="unfinished">Trim</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <source>Reversed</source>
-      <translation type="unfinished">Reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <source>2</source>
-      <translation type="unfinished">2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <source>3</source>
-      <translation type="unfinished">3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <source>4</source>
-      <translation type="unfinished">4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <source>5</source>
-      <translation type="unfinished">5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <source>6</source>
-      <translation type="unfinished">6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <source>7</source>
-      <translation type="unfinished">7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <source>8</source>
-      <translation type="unfinished">8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <source>Swashplate Setup</source>
-      <translation type="unfinished">Swashplate Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <source>Throttle Settings</source>
-      <translation type="unfinished">Throttle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <source>Governor Settings</source>
-      <translation type="unfinished">Governor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <source>Miscellaneous Settings</source>
-      <translation type="unfinished">Miscellaneous Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <source>* Stabilize Collective Curve *</source>
-      <translation type="unfinished">* Stabilize Collective Curve *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <source>* Tail &amp; Gyros *</source>
-      <translation type="unfinished">* Tail &amp; Gyros *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="15"/>
-      <source>Heli</source>
-      <translation type="unfinished">Heli</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="26"/>
-      <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
-      <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <source>Light Output Channels</source>
-      <translation type="unfinished">Light Output Channels</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <source>Lights 1:</source>
-      <translation type="unfinished">Lights 1:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <source>Lights 2:</source>
-      <translation type="unfinished">Lights 2:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <source>Brightness Steps:</source>
-      <translation type="unfinished">Brightness Steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="21"/>
-      <source>Lights</source>
-      <translation type="unfinished">Lights</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="32"/>
-      <source>Lights setup is used to adjust light output channels.</source>
-      <translation type="unfinished">Lights setup is used to adjust light output channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <source>Lights Output 1</source>
-      <translation type="unfinished">Lights Output 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <source>Lights Output 2</source>
-      <translation type="unfinished">Lights Output 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="15"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMNotSupported</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <source>Not supported</source>
-      <translation type="unfinished">Not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <source>Battery 1</source>
-      <translation type="unfinished">Battery 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <source>Battery1 monitor:</source>
-      <translation type="unfinished">Battery1 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <source>Battery 2</source>
-      <translation type="unfinished">Battery 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <source>Battery2 monitor:</source>
-      <translation type="unfinished">Battery2 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <source>WARNING: Remove props prior to calibration!</source>
-      <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Now perform these steps:</source>
-      <translation type="unfinished">Now perform these steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Click Calibrate to start, then:</source>
-      <translation type="unfinished">Click Calibrate to start, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <source>- Disconnect USB and battery so flight controller powers down</source>
-      <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <source>- Connect the battery</source>
-      <translation type="unfinished">- Connect the battery</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <source>- If using a flight controller with a safety button press it until it displays solid red</source>
-      <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <source>- You will hear a musical tone then two beeps</source>
-      <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
-      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
-      <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <source>- Disconnect the battery and power up again normally</source>
-      <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <source>Power Module 90A</source>
-      <translation type="unfinished">Power Module 90A</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <source>Power Module HV</source>
-      <translation type="unfinished">Power Module HV</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <source>3DR Iris</source>
-      <translation type="unfinished">3DR Iris</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <source>Blue Robotics Power Sense Module R2</source>
-      <translation type="unfinished">Blue Robotics Power Sense Module R2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <source>Battery monitor:</source>
-      <translation type="unfinished">Battery monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <source>Battery capacity:</source>
-      <translation type="unfinished">Battery capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <source>Minimum arming voltage:</source>
-      <translation type="unfinished">Minimum arming voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <source>Power sensor:</source>
-      <translation type="unfinished">Power sensor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <source>Current pin:</source>
-      <translation type="unfinished">Current pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <source>Voltage pin:</source>
-      <translation type="unfinished">Voltage pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <source>Voltage multiplier:</source>
-      <translation type="unfinished">Voltage multiplier:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <source>Calculate Voltage Multiplier</source>
-      <translation type="unfinished">Calculate Voltage Multiplier</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <source>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <source>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <source>Amps Offset:</source>
-      <translation type="unfinished">Amps Offset:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <source>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</source>
-      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <source>Calculate And Set</source>
-      <translation type="unfinished">Calculate And Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="18"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="29"/>
-      <source>The Power Component is used to setup battery parameters.</source>
-      <translation type="unfinished">The Power Component is used to setup battery parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="18"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="37"/>
-      <source>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</source>
-      <translation type="unfinished">The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Channel %1</source>
-      <translation type="unfinished">Channel %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <source>Low action:</source>
-      <translation type="unfinished">Low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <source>Critical action:</source>
-      <translation type="unfinished">Critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <source>Low voltage threshold:</source>
-      <translation type="unfinished">Low voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <source>Critical voltage threshold:</source>
-      <translation type="unfinished">Critical voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <source>Low mAh threshold:</source>
-      <translation type="unfinished">Low mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <source>Critical mAh threshold:</source>
-      <translation type="unfinished">Critical mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <source>Final land stage altitude:</source>
-      <translation type="unfinished">Final land stage altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <source>Final land stage descent speed:</source>
-      <translation type="unfinished">Final land stage descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="20"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="33"/>
-      <source>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</source>
-      <translation type="unfinished">Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="44"/>
-      <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="85"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="178"/>
-      <source>Battery low action:</source>
-      <translation type="unfinished">Battery low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="186"/>
-      <source>Battery critical action:</source>
-      <translation type="unfinished">Battery critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="195"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="206"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="155"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="224"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="245"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="252"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="262"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="278"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="293"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="318"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="343"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="355"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="366"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="382"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="402"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="438"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="450"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="472"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="491"/>
-      <source>Land with descent speed:</source>
-      <translation type="unfinished">Land with descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="512"/>
-      <source>Final loiter altitude:</source>
-      <translation type="unfinished">Final loiter altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="534"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="565"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="67"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="88"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="109"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="130"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="142"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="156"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="168"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="68"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="87"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="105"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="122"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="143"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="174"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <source>Failsafe Actions</source>
-      <translation type="unfinished">Failsafe Actions</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <source>GCS Heartbeat:</source>
-      <translation type="unfinished">GCS Heartbeat:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <source>Leak:</source>
-      <translation type="unfinished">Leak:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <source>Detector Pin:</source>
-      <translation type="unfinished">Detector Pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <source>Logic when Dry:</source>
-      <translation type="unfinished">Logic when Dry:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <source>Battery:</source>
-      <translation type="unfinished">Battery:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <source>Voltage:</source>
-      <translation type="unfinished">Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <source>Remaining Capacity:</source>
-      <translation type="unfinished">Remaining Capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <source>EKF:</source>
-      <translation type="unfinished">EKF:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <source>Pilot Input:</source>
-      <translation type="unfinished">Pilot Input:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <source>Timeout:</source>
-      <translation type="unfinished">Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <source>Internal Temperature:</source>
-      <translation type="unfinished">Internal Temperature:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <source>Internal Pressure:</source>
-      <translation type="unfinished">Internal Pressure:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="41"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="46"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="51"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="84"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="77"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="79"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="86"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="92"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="93"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="27"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="38"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="32"/>
-      <source>Voltage failsafe:</source>
-      <translation type="unfinished">Voltage failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="37"/>
-      <source>mAh failsafe:</source>
-      <translation type="unfinished">mAh failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="42"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="43"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="93"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="57"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="60"/>
-      <source>Always Hold</source>
-      <translation type="unfinished">Always Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="73"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="76"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="87"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="92"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="97"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="102"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummarySub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <source>GCS failsafe:</source>
-      <translation type="unfinished">GCS failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <source>Leak failsafe:</source>
-      <translation type="unfinished">Leak failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <source>Battery failsafe:</source>
-      <translation type="unfinished">Battery failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <source>EKF failsafe:</source>
-      <translation type="unfinished">EKF failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <source>Pilot Input failsafe:</source>
-      <translation type="unfinished">Pilot Input failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <source>Int. Temperature failsafe:</source>
-      <translation type="unfinished">Int. Temperature failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <source>Int. Pressure failsafe:</source>
-      <translation type="unfinished">Int. Pressure failsafe:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <source>If mounted in the direction of flight, select None.</source>
-      <translation type="unfinished">If mounted in the direction of flight, select None.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <source>Before calibrating make sure rotation settings are correct. </source>
-      <translation type="unfinished">Before calibrating make sure rotation settings are correct. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <source>If the compass or GPS module is mounted in flight direction, leave the default value (None)</source>
-      <translation type="unfinished">If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <source>The calibration for Compass %1 appears to be poor. </source>
-      <translation type="unfinished">The calibration for Compass %1 appears to be poor. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation type="unfinished">Check the compass position within your vehicle and re-do the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <source>Sensor Settings</source>
-      <translation type="unfinished">Sensor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <source>Accelerometer calibration complete</source>
-      <translation type="unfinished">Accelerometer calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <source>Compass calibration complete</source>
-      <translation type="unfinished">Compass calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(primary</source>
-      <translation type="unfinished">(primary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(secondary</source>
-      <translation type="unfinished">(secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <source>Use Compass</source>
-      <translation type="unfinished">Use Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <source>Shown in the indicator bars is the quality of the calibration for each compass.
-
-</source>
-      <translation type="unfinished">Shown in the indicator bars is the quality of the calibration for each compass.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <source>Compass %1 </source>
-      <translation type="unfinished">Compass %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <source>, </source>
-      <translation type="unfinished">, </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>external</source>
-      <translation type="unfinished">external</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>internal</source>
-      <translation type="unfinished">internal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <source>- Green indicates a well functioning compass.
-</source>
-      <translation type="unfinished">- Green indicates a well functioning compass.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <source>- Yellow indicates a questionable compass or calibration.
-</source>
-      <translation type="unfinished">- Yellow indicates a questionable compass or calibration.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <source>- Red indicates a compass which should not be used.
-
-</source>
-      <translation type="unfinished">- Red indicates a compass which should not be used.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 1</source>
-      <translation type="unfinished">Priority 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 2</source>
-      <translation type="unfinished">Priority 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 3</source>
-      <translation type="unfinished">Priority 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Not Set</source>
-      <translation type="unfinished">Not Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <source>Orientation:</source>
-      <translation type="unfinished">Orientation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <source>Autopilot Rotation:</source>
-      <translation type="unfinished">Autopilot Rotation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <source>Magnetic Declination</source>
-      <translation type="unfinished">Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <source>Manual Magnetic Declination</source>
-      <translation type="unfinished">Manual Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation type="unfinished">This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <source>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </source>
-      <translation type="unfinished">CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <source>It is technically possible to set-up CompassMot using throttle but this is not recommended.</source>
-      <translation type="unfinished">It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <source>Disconnect your props, flip them over and rotate them one position around the frame. </source>
-      <translation type="unfinished">Disconnect your props, flip them over and rotate them one position around the frame. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <source>In this configuration they should push the copter down into the ground when the throttle is raised.</source>
-      <translation type="unfinished">In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <source>Secure the copter (perhaps with tape) so that it does not move.</source>
-      <translation type="unfinished">Secure the copter (perhaps with tape) so that it does not move.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <source>Turn on your transmitter and keep throttle at zero.</source>
-      <translation type="unfinished">Turn on your transmitter and keep throttle at zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <source>Click Ok to start CompassMot calibration.</source>
-      <translation type="unfinished">Click Ok to start CompassMot calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>depth</source>
-      <translation type="unfinished">depth</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>altitude</source>
-      <translation type="unfinished">altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <source>Pressure calibration will set the %1 to zero at the current pressure reading. %2</source>
-      <translation type="unfinished">Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <source>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Accelerometer must be calibrated prior to Compass.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Compass.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Level Horizon.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Baro/Airspeed</source>
-      <translation type="unfinished">Baro/Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Pressure</source>
-      <translation type="unfinished">Pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <source>CompassMot</source>
-      <translation type="unfinished">CompassMot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <source>CompassMot - Compass Motor Interference Calibration</source>
-      <translation type="unfinished">CompassMot - Compass Motor Interference Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="21"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="33"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="186"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="203"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="267"/>
-      <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation type="unfinished">Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="347"/>
-      <source>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</source>
-      <translation type="unfinished">Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="348"/>
-      <source>Quickly bring the throttle back down to zero</source>
-      <translation type="unfinished">Quickly bring the throttle back down to zero</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
-      <source>Press the Next button to complete the calibration</source>
-      <translation type="unfinished">Press the Next button to complete the calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="358"/>
-      <source>Hold the vehicle in its level flight position.</source>
-      <translation type="unfinished">Hold the vehicle in its level flight position.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="367"/>
-      <source>Requesting pressure calibration...</source>
-      <translation type="unfinished">Requesting pressure calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="376"/>
-      <source>Requesting gyro calibration...</source>
-      <translation type="unfinished">Requesting gyro calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="506"/>
-      <source>Successfully completed</source>
-      <translation type="unfinished">Successfully completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="510"/>
-      <source>Failed</source>
-      <translation type="unfinished">Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="302"/>
-      <source>Hold still in the current orientation and press Next when ready</source>
-      <translation type="unfinished">Hold still in the current orientation and press Next when ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="558"/>
-      <source>Compass %1 calibration complete</source>
-      <translation type="unfinished">Compass %1 calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="560"/>
-      <source>Compass %1 calibration below quality threshold</source>
-      <translation type="unfinished">Compass %1 calibration below quality threshold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="579"/>
-      <source>All compasses calibrated successfully</source>
-      <translation type="unfinished">All compasses calibrated successfully</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="580"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="583"/>
-      <source>Compass calibration failed</source>
-      <translation type="unfinished">Compass calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="584"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="588"/>
-      <source>Continue rotating...</source>
-      <translation type="unfinished">Continue rotating...</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <source>Compass </source>
-      <translation type="unfinished">Compass </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <source>Not installed</source>
-      <translation type="unfinished">Not installed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <source>Accelerometer(s)</source>
-      <translation type="unfinished">Accelerometer(s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="21"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="32"/>
-      <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <source>Frame selection</source>
-      <translation type="unfinished">Frame selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <source>Would you like to load the default parameters for the frame ?</source>
-      <translation type="unfinished">Would you like to load the default parameters for the frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <source>Would you like to set the desired frame ?</source>
-      <translation type="unfinished">Would you like to set the desired frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <source>Yes, Load default parameter set for %1</source>
-      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <source>No, set frame only</source>
-      <translation type="unfinished">No, set frame only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <source>Confirm frame %1</source>
-      <translation type="unfinished">Confirm frame %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <source>Git Revision</source>
-      <translation type="unfinished">Git Revision</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <source>Reverse Motor Direction</source>
-      <translation type="unfinished">Reverse Motor Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="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">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.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <source>A 10 second coooldown is required before testing again, please stand by...</source>
-      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
-      <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <source>Automatic Motor Direction Detection</source>
-      <translation type="unfinished">Automatic Motor Direction Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <source>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</source>
-      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="18"/>
-      <source>Tuning</source>
-      <translation type="unfinished">Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="29"/>
-      <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <source>Basic Tuning</source>
-      <translation type="unfinished">Basic Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <source>Roll/Pitch Sensitivity</source>
-      <translation type="unfinished">Roll/Pitch Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
-      <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <source>Climb Sensitivity</source>
-      <translation type="unfinished">Climb Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
-      <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <source>RC Roll/Pitch Feel</source>
-      <translation type="unfinished">RC Roll/Pitch Feel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <source>Slide to the left for soft control, slide to the right for crisp control</source>
-      <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <source>Spin While Armed</source>
-      <translation type="unfinished">Spin While Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <source>Adjust the amount the motors spin to indicate armed</source>
-      <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <source>Minimum Thrust</source>
-      <translation type="unfinished">Minimum Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
-      <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
-      <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <source>AutoTune</source>
-      <translation type="unfinished">AutoTune</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <source>Axes to AutoTune:</source>
-      <translation type="unfinished">Axes to AutoTune:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <source>Channel for AutoTune switch:</source>
-      <translation type="unfinished">Channel for AutoTune switch:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <source>In Flight Tuning</source>
-      <translation type="unfinished">In Flight Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <source>RC Channel 6 Option (Tuning):</source>
-      <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <source>Min:</source>
-      <translation type="unfinished">Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <source>Max:</source>
-      <translation type="unfinished">Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <source>Attitude Controller Parameters</source>
-      <translation type="unfinished">Attitude Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <source>Position Controller Parameters</source>
-      <translation type="unfinished">Position Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <source>Waypoint navigation parameters</source>
-      <translation type="unfinished">Waypoint navigation parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirMapManager</name>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="178"/>
-      <source>AirMap Enabled</source>
-      <translation type="unfinished">AirMap Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="186"/>
-      <source>Failed to create airmap::services::Client instance</source>
-      <translation type="unfinished">Failed to create airmap::services::Client instance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="198"/>
-      <source>No API key for AirMap</source>
-      <translation type="unfinished">No API key for AirMap</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="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">This configuration can only be modified through the Parameter Editor.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
-      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <source>Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
-      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
-      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <source>You&apos;ve connected a %1.</source>
-      <translation type="unfinished">You&apos;ve connected a %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <source>Airframe is not set.</source>
-      <translation type="unfinished">Airframe is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="19"/>
-      <source>Airframe</source>
-      <translation type="unfinished">Airframe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="31"/>
-      <source>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
-      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="85"/>
-      <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation type="unfinished">You cannot change airframe configuration while connected to multiple vehicles.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <source>System ID</source>
-      <translation type="unfinished">System ID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <source>Airframe type</source>
-      <translation type="unfinished">Airframe type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <source>Custom Fw. Ver.</source>
-      <translation type="unfinished">Custom Fw. Ver.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirmapSettings</name>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="67"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="84"/>
-      <source>Enable AirMap Services</source>
-      <translation type="unfinished">Enable AirMap Services</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="89"/>
-      <source>Enable Telemetry</source>
-      <translation type="unfinished">Enable Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="96"/>
-      <source>Show Airspace on Map (Experimental)</source>
-      <translation type="unfinished">Show Airspace on Map (Experimental)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="104"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="113"/>
-      <source>Clear Saved Answers</source>
-      <translation type="unfinished">Clear Saved Answers</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="114"/>
-      <source>All saved ruleset answers will be cleared. Is this really what you want?</source>
-      <translation type="unfinished">All saved ruleset answers will be cleared. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="136"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="205"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="176"/>
-      <source>Login / Registration</source>
-      <translation type="unfinished">Login / Registration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="192"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="292"/>
-      <source>User Name:</source>
-      <translation type="unfinished">User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="208"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="210"/>
-      <source>Anonymous</source>
-      <translation type="unfinished">Anonymous</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="212"/>
-      <source>Authenticated</source>
-      <translation type="unfinished">Authenticated</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="214"/>
-      <source>Authentication Error</source>
-      <translation type="unfinished">Authentication Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="220"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="241"/>
-      <source>Forgot Your AirMap Password?</source>
-      <translation type="unfinished">Forgot Your AirMap Password?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="251"/>
-      <source>Register for an AirMap Account</source>
-      <translation type="unfinished">Register for an AirMap Account</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="272"/>
-      <source>Pilot Profile (WIP)</source>
-      <translation type="unfinished">Pilot Profile (WIP)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="290"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="291"/>
-      <source>John Doe</source>
-      <translation type="unfinished">John Doe</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="293"/>
-      <source>joe36</source>
-      <translation type="unfinished">joe36</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="294"/>
-      <source>Email:</source>
-      <translation type="unfinished">Email:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="295"/>
-      <source>jonh@doe.com</source>
-      <translation type="unfinished">jonh@doe.com</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="296"/>
-      <source>Phone:</source>
-      <translation type="unfinished">Phone:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="297"/>
-      <source>+1 212 555 1212</source>
-      <translation type="unfinished">+1 212 555 1212</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="310"/>
-      <source>License</source>
-      <translation type="unfinished">License</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="329"/>
-      <source>Personal API Key</source>
-      <translation type="unfinished">Personal API Key</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="339"/>
-      <source>API Key:</source>
-      <translation type="unfinished">API Key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="341"/>
-      <source>Client ID:</source>
-      <translation type="unfinished">Client ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="355"/>
-      <source>Flight List Management</source>
-      <translation type="unfinished">Flight List Management</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="367"/>
-      <source>Show Flight List</source>
-      <translation type="unfinished">Show Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="421"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="433"/>
-      <source>Created</source>
-      <translation type="unfinished">Created</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="448"/>
-      <source>Flight Start</source>
-      <translation type="unfinished">Flight Start</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="463"/>
-      <source>Flight End</source>
-      <translation type="unfinished">Flight End</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="478"/>
-      <source>State</source>
-      <translation type="unfinished">State</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Active</source>
-      <translation type="unfinished">Active</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="499"/>
-      <source>Loading Flight List</source>
-      <translation type="unfinished">Loading Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="531"/>
-      <source>Flight List</source>
-      <translation type="unfinished">Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="546"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="555"/>
-      <source>From</source>
-      <translation type="unfinished">From</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="576"/>
-      <source>To</source>
-      <translation type="unfinished">To</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="593"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="609"/>
-      <source>End Selected</source>
-      <translation type="unfinished">End Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="627"/>
-      <source>End Flight</source>
-      <translation type="unfinished">End Flight</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="628"/>
-      <source>Confirm ending active flight?</source>
-      <translation type="unfinished">Confirm ending active flight?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="642"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source> Flights Loaded</source>
-      <translation type="unfinished"> Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source>No Flights Loaded</source>
-      <translation type="unfinished">No Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="657"/>
-      <source>A maximum of 250 flights were loaded</source>
-      <translation type="unfinished">A maximum of 250 flights were loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="665"/>
-      <source>Flight Area </source>
-      <translation type="unfinished">Flight Area </translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceAdvisory</name>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="30"/>
-      <source>Airport</source>
-      <translation type="unfinished">Airport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="31"/>
-      <source>Controlled Airspace</source>
-      <translation type="unfinished">Controlled Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="32"/>
-      <source>Special Use Airspace</source>
-      <translation type="unfinished">Special Use Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="33"/>
-      <source>TFR</source>
-      <translation type="unfinished">TFR</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="34"/>
-      <source>Wild Fire</source>
-      <translation type="unfinished">Wild Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="35"/>
-      <source>Park</source>
-      <translation type="unfinished">Park</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="36"/>
-      <source>Power Plant</source>
-      <translation type="unfinished">Power Plant</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="37"/>
-      <source>Heliport</source>
-      <translation type="unfinished">Heliport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="38"/>
-      <source>Prison</source>
-      <translation type="unfinished">Prison</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="39"/>
-      <source>School</source>
-      <translation type="unfinished">School</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="40"/>
-      <source>Hospital</source>
-      <translation type="unfinished">Hospital</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="41"/>
-      <source>Fire</source>
-      <translation type="unfinished">Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="42"/>
-      <source>Emergency</source>
-      <translation type="unfinished">Emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="43"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="44"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceControl</name>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="109"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="200"/>
-      <source>Airspace</source>
-      <translation type="unfinished">Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="113"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="204"/>
-      <source> Advisories</source>
-      <translation type="unfinished"> Advisories</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="130"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="280"/>
-      <source>Airspace Regulations</source>
-      <translation type="unfinished">Airspace Regulations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="285"/>
-      <source>Advisories based on the selected rules.</source>
-      <translation type="unfinished">Advisories based on the selected rules.</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="326"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>File Flight Plan</source>
-      <translation type="unfinished">File Flight Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="384"/>
-      <source>Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</source>
-      <translation type="unfinished">Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="434"/>
-      <source>Airspace Regulation Options</source>
-      <translation type="unfinished">Airspace Regulation Options</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="456"/>
-      <source>PICK ONE REGULATION</source>
-      <translation type="unfinished">PICK ONE REGULATION</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="477"/>
-      <source>OPTIONAL</source>
-      <translation type="unfinished">OPTIONAL</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="497"/>
-      <source>REQUIRED</source>
-      <translation type="unfinished">REQUIRED</translation>
-    </message>
-  </context>
-  <context>
-    <name>AltModeDialog</name>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
-      <source>Select Altitude Mode</source>
-      <translation type="unfinished">Select Altitude Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="47"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="48"/>
-      <source>Specified altitudes are relative to launch position height.</source>
-      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="53"/>
-      <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
-      <source>Calculated Above Terrain</source>
-      <translation type="unfinished">Calculated Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="58"/>
-      <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="63"/>
-      <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="68"/>
-      <source>The altitude mode can differ for each individual item.</source>
-      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppLogModel</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.cc" line="108"/>
-      <source>Open console log output file failed %1 : %2</source>
-      <translation type="unfinished">Open console log output file failed %1 : %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppMessages</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
-      <source>GStreamer Debug Level</source>
-      <translation type="unfinished">GStreamer Debug Level</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
-      <source>Logging categories</source>
-      <translation type="unfinished">Logging categories</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="170"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="181"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="189"/>
-      <source>Clear All</source>
-      <translation type="unfinished">Clear All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>Log files (*.txt)</source>
-      <translation type="unfinished">Log files (*.txt)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
-      <source>Select log save file</source>
-      <translation type="unfinished">Select log save file</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
-      <source>Save App Log</source>
-      <translation type="unfinished">Save App Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
-      <source>Show Latest</source>
-      <translation type="unfinished">Show Latest</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
-      <source>Set Logging</source>
-      <translation type="unfinished">Set Logging</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppSettings</name>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="30"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="31"/>
-      <source>Telemetry</source>
-      <translation type="unfinished">Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="32"/>
-      <source>Missions</source>
-      <translation type="unfinished">Missions</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="33"/>
-      <source>Logs</source>
-      <translation type="unfinished">Logs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="34"/>
-      <source>Video</source>
-      <translation type="unfinished">Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="35"/>
-      <source>Photo</source>
-      <translation type="unfinished">Photo</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="36"/>
-      <source>CrashLogs</source>
-      <translation type="unfinished">CrashLogs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="182"/>
-      <source> (Partial)</source>
-      <translation type="unfinished"> (Partial)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="191"/>
-      <source> (Test only)</source>
-      <translation type="unfinished"> (Test only)</translation>
-    </message>
-  </context>
-  <context>
-    <name>ArmedIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-  </context>
-  <context>
-    <name>AudioOutput</name>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="155"/>
-      <source> negative </source>
-      <translation type="unfinished"> negative </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="166"/>
-      <source> point </source>
-      <translation type="unfinished"> point </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="177"/>
-      <source> meters</source>
-      <translation type="unfinished"> meters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
-      <source>One or more vehicle components require setup prior to flight.</source>
-      <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Autotune</name>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="37"/>
-      <source>Autotune: In progress</source>
-      <translation type="unfinished">Autotune: In progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="90"/>
-      <source>Autotune: initializing</source>
-      <translation type="unfinished">Autotune: initializing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="93"/>
-      <source>Autotune: roll</source>
-      <translation type="unfinished">Autotune: roll</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="96"/>
-      <source>Autotune: pitch</source>
-      <translation type="unfinished">Autotune: pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="99"/>
-      <source>Autotune: yaw</source>
-      <translation type="unfinished">Autotune: yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="102"/>
-      <source>Wait for disarm</source>
-      <translation type="unfinished">Wait for disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
-      <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="110"/>
-      <source>Autotune: in progress</source>
-      <translation type="unfinished">Autotune: in progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
-      <source>Autotune: Success</source>
-      <translation type="unfinished">Autotune: Success</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="119"/>
-      <source>Autotune successful.</source>
-      <translation type="unfinished">Autotune successful.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="122"/>
-      <source>Autotune: Unknown error</source>
-      <translation type="unfinished">Autotune: Unknown error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="134"/>
-      <source>Autotune: Failed</source>
-      <translation type="unfinished">Autotune: Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="144"/>
-      <source>Autotune: Ack error %1</source>
-      <translation type="unfinished">Autotune: Ack error %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.h" line="59"/>
-      <source>Autotune: Not performed</source>
-      <translation type="unfinished">Autotune: Not performed</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutotuneUI</name>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="27"/>
-      <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="37"/>
-      <source>WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</source>
-      <translation type="unfinished">WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>AxisMonitor</name>
-    <message>
-      <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-  </context>
-  <context>
-    <name>BatteryIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="82"/>
-      <source>100%</source>
-      <translation type="unfinished">100%</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="145"/>
-      <source>Battery Status</source>
-      <translation type="unfinished">Battery Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="168"/>
-      <source>Battery %1</source>
-      <translation type="unfinished">Battery %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="169"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="170"/>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="171"/>
-      <source>Remaining</source>
-      <translation type="unfinished">Remaining</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="172"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="173"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="174"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="175"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-  </context>
-  <context>
-    <name>BlankPlanCreator</name>
-    <message>
-      <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
-      <source>Blank</source>
-      <translation type="unfinished">Blank</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothConfiguration</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="222"/>
-      <source>Bluetooth Link Settings</source>
-      <translation type="unfinished">Bluetooth Link Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="224"/>
-      <source>Bluetooth Not Available</source>
-      <translation type="unfinished">Bluetooth Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothLink</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="185"/>
-      <source>Bluetooth Link Error</source>
-      <translation type="unfinished">Bluetooth Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="31"/>
-      <source>Device</source>
-      <translation type="unfinished">Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="37"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="44"/>
-      <source>Bluetooth Devices</source>
-      <translation type="unfinished">Bluetooth Devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="67"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="73"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-  </context>
-  <context>
-    <name>Bootloader</name>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="224"/>
-      <source>Write failed: %1</source>
-      <translation type="unfinished">Write failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="229"/>
-      <source>Incorrect number of bytes returned for write: actual(%1) expected(%2)</source>
-      <translation type="unfinished">Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="250"/>
-      <source>Timeout waiting for bytes to be available</source>
-      <translation type="unfinished">Timeout waiting for bytes to be available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="260"/>
-      <source>Read failed: error: %1</source>
-      <translation type="unfinished">Read failed: error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="274"/>
-      <source>Get Command Response: </source>
-      <translation type="unfinished">Get Command Response: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="280"/>
-      <source>Invalid sync response: 0x%1 0x%2</source>
-      <translation type="unfinished">Invalid sync response: 0x%1 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="283"/>
-      <source>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</source>
-      <translation type="unfinished">This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="286"/>
-      <source>Unknown response code</source>
-      <translation type="unfinished">Unknown response code</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="292"/>
-      <source>Command failed: 0x%1 (%2)</source>
-      <translation type="unfinished">Command failed: 0x%1 (%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="156"/>
-      <source>Get Board Info: </source>
-      <translation type="unfinished">Get Board Info: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="342"/>
-      <source>Send Command: </source>
-      <translation type="unfinished">Send Command: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="350"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="516"/>
-      <source>Unable to open firmware file %1: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="371"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="541"/>
-      <source>Firmware file read failed: %1</source>
-      <translation type="unfinished">Firmware file read failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="387"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="470"/>
-      <source>Flash failed: %1 at address 0x%2</source>
-      <translation type="unfinished">Flash failed: %1 at address 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="421"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="593"/>
-      <source>Unable to retrieve block from ihx: index %1</source>
-      <translation type="unfinished">Unable to retrieve block from ihx: index %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="441"/>
-      <source>Unable to set flash start address: 0x%2</source>
-      <translation type="unfinished">Unable to set flash start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="559"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="644"/>
-      <source>Read failed: %1 at address: 0x%2</source>
-      <translation type="unfinished">Read failed: %1 at address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="565"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="652"/>
-      <source>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</source>
-      <translation type="unfinished">Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="613"/>
-      <source>Unable to set read start address: 0x%2</source>
-      <translation type="unfinished">Unable to set read start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="689"/>
-      <source>CRC mismatch: board(0x%1) file(0x%2)</source>
-      <translation type="unfinished">CRC mismatch: board(0x%1) file(0x%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="40"/>
-      <source>Open failed on port %1: %2</source>
-      <translation type="unfinished">Open failed on port %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="92"/>
-      <source>Unable to put radio into command mode +++</source>
-      <translation type="unfinished">Unable to put radio into command mode +++</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="97"/>
-      <source>Radio did not respond to command mode</source>
-      <translation type="unfinished">Radio did not respond to command mode</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="105"/>
-      <source>Radio did not respond to ATI2 command</source>
-      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="112"/>
-      <source>Radio did not return board id</source>
-      <translation type="unfinished">Radio did not return board id</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="129"/>
-      <source>Found unsupported bootloader version: %1</source>
-      <translation type="unfinished">Found unsupported bootloader version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="165"/>
-      <source>Unable to reboot radio (ready read)</source>
-      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="181"/>
-      <source>Erase failed: %1</source>
-      <translation type="unfinished">Erase failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="319"/>
-      <source>Get Device: </source>
-      <translation type="unfinished">Get Device: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="747"/>
-      <source>Get Board Id: </source>
-      <translation type="unfinished">Get Board Id: </translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalc</name>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="238"/>
-      <source>CameraCalc section version %1 not supported</source>
-      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="310"/>
-      <source>Custom Camera</source>
-      <translation type="unfinished">Custom Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="315"/>
-      <source>Manual (no camera specs)</source>
-      <translation type="unfinished">Manual (no camera specs)</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcCamera</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="108"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="112"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="120"/>
-      <source>Sensor</source>
-      <translation type="unfinished">Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="135"/>
-      <source>Image</source>
-      <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="150"/>
-      <source>Focal length</source>
-      <translation type="unfinished">Focal length</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcGrid</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="47"/>
-      <source>Front Lap</source>
-      <translation type="unfinished">Front Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="51"/>
-      <source>Side Lap</source>
-      <translation type="unfinished">Side Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="59"/>
-      <source>Overlap</source>
-      <translation type="unfinished">Overlap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="72"/>
-      <source>Select one:</source>
-      <translation type="unfinished">Select one:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="102"/>
-      <source>Grnd Res</source>
-      <translation type="unfinished">Grnd Res</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <source>Vehicle must be restarted for changes to take effect.</source>
-      <translation type="unfinished">Vehicle must be restarted for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <source>Camera Trigger Settings</source>
-      <translation type="unfinished">Camera Trigger Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <source>Time Interval</source>
-      <translation type="unfinished">Time Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <source>Distance Interval</source>
-      <translation type="unfinished">Distance Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <source>Hardware Settings</source>
-      <translation type="unfinished">Hardware Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <source>AUX Pin Assignment</source>
-      <translation type="unfinished">AUX Pin Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <source>Trigger Pin Polarity</source>
-      <translation type="unfinished">Trigger Pin Polarity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <source>Trigger Period</source>
-      <translation type="unfinished">Trigger Period</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="21"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="32"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <source>Time interval</source>
-      <translation type="unfinished">Time interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <source>Distance interval</source>
-      <translation type="unfinished">Distance interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <source>AUX pins</source>
-      <translation type="unfinished">AUX pins</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <source>AUX pin polarity</source>
-      <translation type="unfinished">AUX pin polarity</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraSection</name>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="29"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="54"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="70"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="87"/>
-      <source>Mode</source>
-      <translation type="unfinished">Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="107"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="108"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropButton</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="162"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="165"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="177"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="212"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
-      <source>Follow Vehicle</source>
-      <translation type="unfinished">Follow Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropPanel</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="29"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="32"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="43"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="86"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-  </context>
-  <context>
-    <name>CompInfoParam</name>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="135"/>
-      <source>Component %1</source>
-      <translation type="unfinished">Component %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="262"/>
-      <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplexMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="57"/>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="63"/>
-      <source>This Pattern does not support Presets.</source>
-      <translation type="unfinished">This Pattern does not support Presets.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="69"/>
-      <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplianceRules</name>
-    <message>
-      <location filename="../src/Airmap/ComplianceRules.qml" line="102"/>
-      <source>Rule</source>
-      <translation type="unfinished">Rule</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="124"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="131"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
-      <source>Corridor Scan</source>
-      <translation type="unfinished">Corridor Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="54"/>
-      <source>C</source>
-      <translation type="unfinished">C</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanEditor</name>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="19"/>
-      <source>Corridor</source>
-      <translation type="unfinished">Corridor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="38"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="45"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="18"/>
-      <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="56"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-  </context>
-  <context>
-    <name>DebugWindow</name>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="38"/>
-      <source>Qt Platform:</source>
-      <translation type="unfinished">Qt Platform:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="48"/>
-      <source>Font Point Size 10</source>
-      <translation type="unfinished">Font Point Size 10</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="54"/>
-      <source>Default font width:</source>
-      <translation type="unfinished">Default font width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="64"/>
-      <source>Font Point Size 10.5</source>
-      <translation type="unfinished">Font Point Size 10.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="70"/>
-      <source>Default font height:</source>
-      <translation type="unfinished">Default font height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="80"/>
-      <source>Font Point Size 11</source>
-      <translation type="unfinished">Font Point Size 11</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="86"/>
-      <source>Default font pixel size:</source>
-      <translation type="unfinished">Default font pixel size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="96"/>
-      <source>Font Point Size 11.5</source>
-      <translation type="unfinished">Font Point Size 11.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="102"/>
-      <source>Default font point size:</source>
-      <translation type="unfinished">Default font point size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="112"/>
-      <source>Font Point Size 12</source>
-      <translation type="unfinished">Font Point Size 12</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="118"/>
-      <source>QML Screen Desktop:</source>
-      <translation type="unfinished">QML Screen Desktop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="128"/>
-      <source>Font Point Size 12.5</source>
-      <translation type="unfinished">Font Point Size 12.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="134"/>
-      <source>QML Screen Size:</source>
-      <translation type="unfinished">QML Screen Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="144"/>
-      <source>Font Point Size 13</source>
-      <translation type="unfinished">Font Point Size 13</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="150"/>
-      <source>QML Pixel Density:</source>
-      <translation type="unfinished">QML Pixel Density:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="160"/>
-      <source>Font Point Size 13.5</source>
-      <translation type="unfinished">Font Point Size 13.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="166"/>
-      <source>QML Pixel Ratio:</source>
-      <translation type="unfinished">QML Pixel Ratio:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="176"/>
-      <source>Font Point Size 14</source>
-      <translation type="unfinished">Font Point Size 14</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="182"/>
-      <source>Default Point:</source>
-      <translation type="unfinished">Default Point:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="192"/>
-      <source>Font Point Size 14.5</source>
-      <translation type="unfinished">Font Point Size 14.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="198"/>
-      <source>Computed Font Height:</source>
-      <translation type="unfinished">Computed Font Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="208"/>
-      <source>Font Point Size 15</source>
-      <translation type="unfinished">Font Point Size 15</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="214"/>
-      <source>Computed Screen Height:</source>
-      <translation type="unfinished">Computed Screen Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="224"/>
-      <source>Font Point Size 15.5</source>
-      <translation type="unfinished">Font Point Size 15.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="230"/>
-      <source>Computed Screen Width:</source>
-      <translation type="unfinished">Computed Screen Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="240"/>
-      <source>Font Point Size 16</source>
-      <translation type="unfinished">Font Point Size 16</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="246"/>
-      <source>Desktop Available Width:</source>
-      <translation type="unfinished">Desktop Available Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="256"/>
-      <source>Font Point Size 16.5</source>
-      <translation type="unfinished">Font Point Size 16.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="262"/>
-      <source>Desktop Available Height:</source>
-      <translation type="unfinished">Desktop Available Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="272"/>
-      <source>Font Point Size 17</source>
-      <translation type="unfinished">Font Point Size 17</translation>
-    </message>
-  </context>
-  <context>
-    <name>DefaultChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
-      <source>Generic Initial checks</source>
-      <translation type="unfinished">Generic Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266Component</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="33"/>
-      <source>controller WiFi Bridge</source>
-      <translation type="unfinished">controller WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="66"/>
-      <source>Error fetching WiFi Bridge Status: %1</source>
-      <translation type="unfinished">Error fetching WiFi Bridge Status: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="116"/>
-      <source>ESP WiFi Bridge Settings</source>
-      <translation type="unfinished">ESP WiFi Bridge Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="143"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="159"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="176"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="192"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="208"/>
-      <source>WiFi STA SSID</source>
-      <translation type="unfinished">WiFi STA SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="225"/>
-      <source>WiFi STA Password</source>
-      <translation type="unfinished">WiFi STA Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="242"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="258"/>
-      <source>QGC UDP Port</source>
-      <translation type="unfinished">QGC UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="277"/>
-      <source>ESP WiFi Bridge Status</source>
-      <translation type="unfinished">ESP WiFi Bridge Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
-      <source>Bridge/Vehicle Link</source>
-      <translation type="unfinished">Bridge/Vehicle Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
-      <source>Bridge/QGC Link</source>
-      <translation type="unfinished">Bridge/QGC Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="298"/>
-      <source>QGC/Bridge Link</source>
-      <translation type="unfinished">QGC/Bridge Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="304"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="319"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="333"/>
-      <source>Messages Received</source>
-      <translation type="unfinished">Messages Received</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="360"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="374"/>
-      <source>Messages Lost</source>
-      <translation type="unfinished">Messages Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="388"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="416"/>
-      <source>Messages Sent</source>
-      <translation type="unfinished">Messages Sent</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="433"/>
-      <source>Restore Defaults</source>
-      <translation type="unfinished">Restore Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="440"/>
-      <source>Restart WiFi Bridge</source>
-      <translation type="unfinished">Restart WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="451"/>
-      <source>Reboot WiFi Bridge</source>
-      <translation type="unfinished">Reboot WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="452"/>
-      <source>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</source>
-      <translation type="unfinished">This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="463"/>
-      <source>Reset Counters</source>
-      <translation type="unfinished">Reset Counters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="16"/>
-      <source>WiFi Bridge</source>
-      <translation type="unfinished">WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="28"/>
-      <source>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</source>
-      <translation type="unfinished">The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266ComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="29"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="33"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="37"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="42"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="46"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="60"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>EditPositionDialog</name>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="51"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="59"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="67"/>
-      <source>Set Geographic</source>
-      <translation type="unfinished">Set Geographic</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="79"/>
-      <source>Zone</source>
-      <translation type="unfinished">Zone</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="87"/>
-      <source>Hemisphere</source>
-      <translation type="unfinished">Hemisphere</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="96"/>
-      <source>Easting</source>
-      <translation type="unfinished">Easting</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="104"/>
-      <source>Northing</source>
-      <translation type="unfinished">Northing</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="112"/>
-      <source>Set UTM</source>
-      <translation type="unfinished">Set UTM</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
-      <source>MGRS</source>
-      <translation type="unfinished">MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
-      <source>Set MGRS</source>
-      <translation type="unfinished">Set MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
-      <source>Set From Vehicle Position</source>
-      <translation type="unfinished">Set From Vehicle Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>ExitWithErrorWindow</name>
-    <message>
-      <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FTPManager</name>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="234"/>
-      <source>Invalid Nak format</source>
-      <translation type="unfinished">Invalid Nak format</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="236"/>
-      <source>errno %1</source>
-      <translation type="unfinished">errno %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="131"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="258"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="280"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="293"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="297"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="402"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="411"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="449"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="484"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="530"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="539"/>
-      <source>Download failed</source>
-      <translation type="unfinished">Download failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="368"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="497"/>
-      <source>Download failed: Error saving file</source>
-      <translation type="unfinished">Download failed: Error saving file</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="166"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="322"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="326"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="201"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="152"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="239"/>
-      <source>* Approximate glide slope altitudes.</source>
-      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="248"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="257"/>
-      <source>* Avoid tailwind on landing.</source>
-      <translation type="unfinished">* Avoid tailwind on landing.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="283"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="290"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="332"/>
-      <source>Landing Area</source>
-      <translation type="unfinished">Landing Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="370"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-  </context>
-  <context>
-    <name>Fact</name>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="247"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>true</source>
-      <translation type="unfinished">true</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>false</source>
-      <translation type="unfinished">false</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="745"/>
-      <source>Change of parameter %1 requires a Vehicle reboot to take effect.</source>
-      <translation type="unfinished">Change of parameter %1 requires a Vehicle reboot to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="747"/>
-      <source>Change of &apos;%1&apos; value requires restart of %2 to take effect.</source>
-      <translation type="unfinished">Change of &apos;%1&apos; value requires restart of %2 to take effect.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactMetaData</name>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="39"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="40"/>
-      <source>Misc</source>
-      <translation type="unfinished">Misc</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="461"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="469"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="479"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="487"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="495"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="504"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="549"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="557"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="567"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="575"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="583"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="592"/>
-      <source>Value must be within %1 and %2</source>
-      <translation type="unfinished">Value must be within %1 and %2</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="523"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="611"/>
-      <source>Invalid number</source>
-      <translation type="unfinished">Invalid number</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactTextField</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="36"/>
-      <source>Invalid Value</source>
-      <translation type="unfinished">Invalid Value</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="40"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
-      <source>Default</source>
-      <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
-      <source>Small</source>
-      <translation type="unfinished">Small</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
-      <source>Large</source>
-      <translation type="unfinished">Large</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
-      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Load Settings</source>
-      <translation type="unfinished">Load Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueSlider</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactValueSlider.qml" line="100"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>Firmware Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="73"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="75"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="77"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareImage</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="143"/>
-      <source>Incorrectly formatted line in .ihx file, line too short</source>
-      <translation type="unfinished">Incorrectly formatted line in .ihx file, line too short</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="148"/>
-      <source>Unsupported record type in file: %1</source>
-      <translation type="unfinished">Unsupported record type in file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="218"/>
-      <source>Unable to open firmware file %1, error: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="227"/>
-      <source>Supplied file is not a valid JSON document</source>
-      <translation type="unfinished">Supplied file is not a valid JSON document</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="238"/>
-      <source>Firmware file missing required key: %1</source>
-      <translation type="unfinished">Firmware file missing required key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="248"/>
-      <source>Firmware file has invalid key: %1</source>
-      <translation type="unfinished">Firmware file has invalid key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="254"/>
-      <source>Downloaded firmware board id does not match hardware board id: %1 != %2</source>
-      <translation type="unfinished">Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="276"/>
-      <source>Write failed for parameter meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for parameter meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="283"/>
-      <source>Unable to open parameter meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open parameter meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="305"/>
-      <source>Write failed for airframe meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for airframe meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="312"/>
-      <source>Unable to open airframe meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open airframe meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="338"/>
-      <source>Unable to open decompressed file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open decompressed file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="344"/>
-      <source>Write failed for decompressed image file, error: %1</source>
-      <translation type="unfinished">Write failed for decompressed image file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="368"/>
-      <source>Firmware file has invalid decompressed size for %1</source>
-      <translation type="unfinished">Firmware file has invalid decompressed size for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="380"/>
-      <source>Could not find compressed bytes for %1 in Firmware file</source>
-      <translation type="unfinished">Could not find compressed bytes for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="385"/>
-      <source>Incorrectly formed compressed bytes section for %1 in Firmware file</source>
-      <translation type="unfinished">Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="401"/>
-      <source>Firmware file has 0 length %1</source>
-      <translation type="unfinished">Firmware file has 0 length %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="405"/>
-      <source>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</source>
-      <translation type="unfinished">Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="409"/>
-      <source>Successfully decompressed %1</source>
-      <translation type="unfinished">Successfully decompressed %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="437"/>
-      <source>Unabled to open firmware file %1, %2</source>
-      <translation type="unfinished">Unabled to open firmware file %1, %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="347"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="364"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="381"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="398"/>
-      <source>Canon</source>
-      <translation type="unfinished">Canon</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="348"/>
-      <source>S100 PowerShot</source>
-      <translation type="unfinished">S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="357"/>
-      <source>Canon S100 PowerShot</source>
-      <translation type="unfinished">Canon S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="365"/>
-      <source>EOS-M 22mm</source>
-      <translation type="unfinished">EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="374"/>
-      <source>Canon EOS-M 22mm</source>
-      <translation type="unfinished">Canon EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="382"/>
-      <source>G9 X PowerShot</source>
-      <translation type="unfinished">G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="391"/>
-      <source>Canon G9 X PowerShot</source>
-      <translation type="unfinished">Canon G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="399"/>
-      <source>SX260 HS PowerShot</source>
-      <translation type="unfinished">SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="408"/>
-      <source>Canon SX260 HS PowerShot</source>
-      <translation type="unfinished">Canon SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="414"/>
-      <source>GoPro</source>
-      <translation type="unfinished">GoPro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="415"/>
-      <source>Hero 4</source>
-      <translation type="unfinished">Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="424"/>
-      <source>GoPro Hero 4</source>
-      <translation type="unfinished">GoPro Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="430"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="446"/>
-      <source>Parrot</source>
-      <translation type="unfinished">Parrot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="431"/>
-      <source>Sequioa RGB</source>
-      <translation type="unfinished">Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="440"/>
-      <source>Parrot Sequioa RGB</source>
-      <translation type="unfinished">Parrot Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="447"/>
-      <source>Sequioa Monochrome</source>
-      <translation type="unfinished">Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="456"/>
-      <source>Parrot Sequioa Monochrome</source>
-      <translation type="unfinished">Parrot Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="462"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="463"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="472"/>
-      <source>RedEdge</source>
-      <translation type="unfinished">RedEdge</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="479"/>
-      <source>Ricoh</source>
-      <translation type="unfinished">Ricoh</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="480"/>
-      <source>GR II</source>
-      <translation type="unfinished">GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="489"/>
-      <source>Ricoh GR II</source>
-      <translation type="unfinished">Ricoh GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="495"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="511"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="527"/>
-      <source>Sentera</source>
-      <translation type="unfinished">Sentera</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="496"/>
-      <source>Double 4K Sensor</source>
-      <translation type="unfinished">Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="505"/>
-      <source>Sentera Double 4K Sensor</source>
-      <translation type="unfinished">Sentera Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="512"/>
-      <source>NDVI Single Sensor</source>
-      <translation type="unfinished">NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="521"/>
-      <source>Sentera NDVI Single Sensor</source>
-      <translation type="unfinished">Sentera NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="528"/>
-      <source>6X Sensor</source>
-      <translation type="unfinished">6X Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="545"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="561"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="577"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="593"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="609"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="625"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="641"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="657"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="673"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="689"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="705"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="724"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="742"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="759"/>
-      <source>Sony</source>
-      <translation type="unfinished">Sony</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="546"/>
-      <source>a6000 16mm</source>
-      <translation type="unfinished">a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="555"/>
-      <source>Sony a6000 16mm</source>
-      <translation type="unfinished">Sony a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="562"/>
-      <source>a6000 35mm</source>
-      <translation type="unfinished">a6000 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="578"/>
-      <source>a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="587"/>
-      <source>Sony a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="594"/>
-      <source>a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="603"/>
-      <source>Sony a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="610"/>
-      <source>a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="619"/>
-      <source>Sony a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="626"/>
-      <source>a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="635"/>
-      <source>Sony a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="642"/>
-      <source>a7r III 35mm</source>
-      <translation type="unfinished">a7r III 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="658"/>
-      <source>a7r IV 35mm</source>
-      <translation type="unfinished">a7r IV 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="674"/>
-      <source>DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="683"/>
-      <source>Sony DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">Sony DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="690"/>
-      <source>DSC-RX0</source>
-      <translation type="unfinished">DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="699"/>
-      <source>Sony DSC-RX0</source>
-      <translation type="unfinished">Sony DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="706"/>
-      <source>DSC-RX1R II 35mm</source>
-      <translation type="unfinished">DSC-RX1R II 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="725"/>
-      <source>ILCE-QX1</source>
-      <translation type="unfinished">ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="734"/>
-      <source>Sony ILCE-QX1</source>
-      <translation type="unfinished">Sony ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="743"/>
-      <source>NEX-5R 20mm</source>
-      <translation type="unfinished">NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="752"/>
-      <source>Sony NEX-5R 20mm</source>
-      <translation type="unfinished">Sony NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="760"/>
-      <source>RX100 II 28mm</source>
-      <translation type="unfinished">RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="769"/>
-      <source>Sony RX100 II 28mm</source>
-      <translation type="unfinished">Sony RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="775"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="791"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="807"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="823"/>
-      <source>Yuneec</source>
-      <translation type="unfinished">Yuneec</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="776"/>
-      <source>CGOET</source>
-      <translation type="unfinished">CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="785"/>
-      <source>Yuneec CGOET</source>
-      <translation type="unfinished">Yuneec CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="792"/>
-      <source>E10T</source>
-      <translation type="unfinished">E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="801"/>
-      <source>Yuneec E10T</source>
-      <translation type="unfinished">Yuneec E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="808"/>
-      <source>E50</source>
-      <translation type="unfinished">E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="817"/>
-      <source>Yuneec E50</source>
-      <translation type="unfinished">Yuneec E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="824"/>
-      <source>E90</source>
-      <translation type="unfinished">E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="833"/>
-      <source>Yuneec E90</source>
-      <translation type="unfinished">Yuneec E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="839"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="855"/>
-      <source>Flir</source>
-      <translation type="unfinished">Flir</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="840"/>
-      <source>Duo R</source>
-      <translation type="unfinished">Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="849"/>
-      <source>Flir Duo R</source>
-      <translation type="unfinished">Flir Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="856"/>
-      <source>Duo Pro R</source>
-      <translation type="unfinished">Duo Pro R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="871"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="887"/>
-      <source>Workswell</source>
-      <translation type="unfinished">Workswell</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="872"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="888"/>
-      <source>Wiris Security</source>
-      <translation type="unfinished">Wiris Security</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="1061"/>
-      <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
-      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="28"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="44"/>
-      <source>Firmware Setup</source>
-      <translation type="unfinished">Firmware Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="47"/>
-      <source>%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</source>
-      <translation type="unfinished">%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="48"/>
-      <source>Update the autopilot firmware to the latest version</source>
-      <translation type="unfinished">Update the autopilot firmware to the latest version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="52"/>
-      <source>All %1 connections to vehicles must be </source>
-      <translation type="unfinished">All %1 connections to vehicles must be </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="70"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="82"/>
-      <source>Select Firmware File</source>
-      <translation type="unfinished">Select Firmware File</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
-      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="127"/>
-      <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
-      <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="128"/>
-      <source>Detected [%1]: </source>
-      <translation type="unfinished">Detected [%1]: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="135"/>
-      <source>Found device</source>
-      <translation type="unfinished">Found device</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="177"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="331"/>
-      <source>PX4 Pro </source>
-      <translation type="unfinished">PX4 Pro </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="242"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="276"/>
-      <source>Standard Version (stable)</source>
-      <translation type="unfinished">Standard Version (stable)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="246"/>
-      <source>Beta Testing (beta)</source>
-      <translation type="unfinished">Beta Testing (beta)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="250"/>
-      <source>Developer Build (master)</source>
-      <translation type="unfinished">Developer Build (master)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="254"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="280"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="293"/>
-      <source>Custom firmware file...</source>
-      <translation type="unfinished">Custom firmware file...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="263"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="267"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="344"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="289"/>
-      <source>Standard Version</source>
-      <translation type="unfinished">Standard Version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="313"/>
-      <source>Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</source>
-      <translation type="unfinished">Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="314"/>
-      <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
-      <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="315"/>
-      <source>Press Ok to upgrade your vehicle.</source>
-      <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="318"/>
-      <source>Flight Stack</source>
-      <translation type="unfinished">Flight Stack</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="386"/>
-      <source>Downloading list of available firmwares...</source>
-      <translation type="unfinished">Downloading list of available firmwares...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="394"/>
-      <source>No Firmware Available</source>
-      <translation type="unfinished">No Firmware Available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="444"/>
-      <source>Select the standard version or one from the file system (previously downloaded):</source>
-      <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="445"/>
-      <source>Select which version of the firmware you would like to install:</source>
-      <translation type="unfinished">Select which version of the firmware you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="446"/>
-      <source>Select which version of the above flight stack you would like to install:</source>
-      <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="461"/>
-      <source>WARNING: BETA FIRMWARE. </source>
-      <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="462"/>
-      <source>This firmware version is ONLY intended for beta testers. </source>
-      <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="463"/>
-      <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
-      <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="464"/>
-      <source>Do NOT use for normal operation.</source>
-      <translation type="unfinished">Do NOT use for normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="467"/>
-      <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
-      <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="468"/>
-      <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
-      <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="469"/>
-      <source>It is only intended for DEVELOPERS. </source>
-      <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="470"/>
-      <source>Run bench tests without props first. </source>
-      <translation type="unfinished">Run bench tests without props first. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="471"/>
-      <source>Do NOT fly this without additional safety precautions. </source>
-      <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="472"/>
-      <source>Follow the forums actively when using it.</source>
-      <translation type="unfinished">Follow the forums actively when using it.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="512"/>
-      <source>Flash ChibiOS Bootloader</source>
-      <translation type="unfinished">Flash ChibiOS Bootloader</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgradeController</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="162"/>
-      <source>Connect not allowed during Firmware Upgrade.</source>
-      <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="280"/>
-      <source>Connected to bootloader:</source>
-      <translation type="unfinished">Connected to bootloader:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="281"/>
-      <source>  Version: %1</source>
-      <translation type="unfinished">  Version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="282"/>
-      <source>  Board ID: %1</source>
-      <translation type="unfinished">  Board ID: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="283"/>
-      <source>  Flash size: %1</source>
-      <translation type="unfinished">  Flash size: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="366"/>
-      <source>Custom firmware selected but no filename given.</source>
-      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="371"/>
-      <source>Unable to find specified firmware for board type</source>
-      <translation type="unfinished">Unable to find specified firmware for board type</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="377"/>
-      <source>No firmware file selected</source>
-      <translation type="unfinished">No firmware file selected</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="388"/>
-      <source>Downloading firmware...</source>
-      <translation type="unfinished">Downloading firmware...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="389"/>
-      <source> From: %1</source>
-      <translation type="unfinished"> From: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="410"/>
-      <source>Download complete</source>
-      <translation type="unfinished">Download complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="418"/>
-      <source>Image load failed</source>
-      <translation type="unfinished">Image load failed</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="424"/>
-      <source>Bootloader not found</source>
-      <translation type="unfinished">Bootloader not found</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="429"/>
-      <source>Image size of %1 is too large for board flash size %2</source>
-      <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="461"/>
-      <source>Upgrade complete</source>
-      <translation type="unfinished">Upgrade complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="519"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="595"/>
-      <source>Choose board type</source>
-      <translation type="unfinished">Choose board type</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
-      <source>Fixed Wing Initial Checks</source>
-      <translation type="unfinished">Fixed Wing Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
-      <source>Fixed Wing Landing</source>
-      <translation type="unfinished">Fixed Wing Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="98"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightBrief</name>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="32"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="51"/>
-      <source>Authorizations</source>
-      <translation type="unfinished">Authorizations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="96"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="128"/>
-      <source>Authorization Pending</source>
-      <translation type="unfinished">Authorization Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="98"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="130"/>
-      <source>Authorization Accepted</source>
-      <translation type="unfinished">Authorization Accepted</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="100"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="132"/>
-      <source>Authorization Rejected</source>
-      <translation type="unfinished">Authorization Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="101"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="135"/>
-      <source>Authorization Unknown</source>
-      <translation type="unfinished">Authorization Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="134"/>
-      <source>Authorization Not Required</source>
-      <translation type="unfinished">Authorization Not Required</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="144"/>
-      <source>Rules &amp; Compliance</source>
-      <translation type="unfinished">Rules &amp; Compliance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="149"/>
-      <source>Rules you may be violating</source>
-      <translation type="unfinished">Rules you may be violating</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="159"/>
-      <source>Rules needing more information</source>
-      <translation type="unfinished">Rules needing more information</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="169"/>
-      <source>Rules you should review</source>
-      <translation type="unfinished">Rules you should review</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="179"/>
-      <source>Rules you are following</source>
-      <translation type="unfinished">Rules you are following</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="198"/>
-      <source>Update Plan</source>
-      <translation type="unfinished">Update Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="210"/>
-      <source>Submit Plan</source>
-      <translation type="unfinished">Submit Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="223"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDetails</name>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="32"/>
-      <source>Flight Details</source>
-      <translation type="unfinished">Flight Details</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="51"/>
-      <source>Flight Date &amp; Time</source>
-      <translation type="unfinished">Flight Date &amp; Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="71"/>
-      <location filename="../src/Airmap/FlightDetails.qml" line="141"/>
-      <source>Now</source>
-      <translation type="unfinished">Now</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="82"/>
-      <source>Today</source>
-      <translation type="unfinished">Today</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="96"/>
-      <source>Flight Start Time</source>
-      <translation type="unfinished">Flight Start Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="146"/>
-      <source>Duration</source>
-      <translation type="unfinished">Duration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="186"/>
-      <source>Flight Context</source>
-      <translation type="unfinished">Flight Context</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDisplayViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>WAITING FOR VIDEO</source>
-      <translation type="unfinished">WAITING FOR VIDEO</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>VIDEO DISABLED</source>
-      <translation type="unfinished">VIDEO DISABLED</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightMap</name>
-    <message>
-      <location filename="../src/FlightMap/FlightMap.qml" line="69"/>
-      <source>Specify Position</source>
-      <translation type="unfinished">Specify Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeDropdown</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeDropdown.qml" line="22"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeMenu</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeMenu.qml" line="20"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="24"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="35"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <source>Mode switch</source>
-      <translation type="unfinished">Mode switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <source>Flight Mode %1 </source>
-      <translation type="unfinished">Flight Mode %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <source>Position Ctl switch</source>
-      <translation type="unfinished">Position Ctl switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <source>Loiter switch</source>
-      <translation type="unfinished">Loiter switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <source>Return switch</source>
-      <translation type="unfinished">Return switch</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewAirspaceIndicator</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
-      <source>Approval Pending</source>
-      <translation type="unfinished">Approval Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
-      <source>Flight Approved</source>
-      <translation type="unfinished">Flight Approved</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
-      <source>Flight Rejected</source>
-      <translation type="unfinished">Flight Rejected</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMap</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="346"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="371"/>
-      <source>Go here</source>
-      <comment>Go to location waypoint</comment>
-      <translation type="unfinished">Go here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="474"/>
-      <source>ROI here</source>
-      <comment>Make this a Region Of Interest</comment>
-      <translation type="unfinished">ROI here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="510"/>
-      <source>Orbit</source>
-      <comment>Orbit waypoint</comment>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="522"/>
-      <source>Go to location</source>
-      <translation type="unfinished">Go to location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="531"/>
-      <source>Orbit at location</source>
-      <translation type="unfinished">Orbit at location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="540"/>
-      <source>ROI at location</source>
-      <translation type="unfinished">ROI at location</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMissionCompleteDialog</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="44"/>
-      <source>Flight Plan complete</source>
-      <translation type="unfinished">Flight Plan complete</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="80"/>
-      <source>%1 Images Taken</source>
-      <translation type="unfinished">%1 Images Taken</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="87"/>
-      <source>Remove plan from vehicle</source>
-      <translation type="unfinished">Remove plan from vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="98"/>
-      <source>Leave plan on vehicle</source>
-      <translation type="unfinished">Leave plan on vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="116"/>
-      <source>Resume Mission From Waypoint %1</source>
-      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="127"/>
-      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
-      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="135"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewPreFlightChecklistPopup</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
-      <source>Pre-Flight Checklist</source>
-      <translation type="unfinished">Pre-Flight Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStrip</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStripActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStripActionList.qml" line="22"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="68"/>
-      <source>Double-click to exit full screen</source>
-      <translation type="unfinished">Double-click to exit full screen</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewWidgetLayer</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="89"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="95"/>
-      <source>Multi-Vehicle</source>
-      <translation type="unfinished">Multi-Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Status</source>
-      <translation type="unfinished">GPS Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Data Unavailable</source>
-      <translation type="unfinished">GPS Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
-      <source>GPS Count:</source>
-      <translation type="unfinished">GPS Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
-      <source>GPS Lock:</source>
-      <translation type="unfinished">GPS Lock:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
-      <source>HDOP:</source>
-      <translation type="unfinished">HDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="70"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="72"/>
-      <source>--.--</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">--.--</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
-      <source>VDOP:</source>
-      <translation type="unfinished">VDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="71"/>
-      <source>Course Over Ground:</source>
-      <translation type="unfinished">Course Over Ground:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSRTKIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>Survey-in Active</source>
-      <translation type="unfinished">Survey-in Active</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>RTK Streaming</source>
-      <translation type="unfinished">RTK Streaming</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="61"/>
-      <source>Duration:</source>
-      <translation type="unfinished">Duration:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Accuracy:</source>
-      <translation type="unfinished">Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Current Accuracy:</source>
-      <translation type="unfinished">Current Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="77"/>
-      <source>Satellites:</source>
-      <translation type="unfinished">Satellites:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeneralSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="407"/>
-      <source>Units</source>
-      <translation type="unfinished">Units</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="444"/>
-      <source>Miscellaneous</source>
-      <translation type="unfinished">Miscellaneous</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="468"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="479"/>
-      <source>Color Scheme</source>
-      <translation type="unfinished">Color Scheme</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="490"/>
-      <source>Map Provider</source>
-      <translation type="unfinished">Map Provider</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="510"/>
-      <source>Map Type</source>
-      <translation type="unfinished">Map Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="529"/>
-      <source>Stream GCS Position</source>
-      <translation type="unfinished">Stream GCS Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="611"/>
-      <source>Mute all audio output</source>
-      <translation type="unfinished">Mute all audio output</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="626"/>
-      <source>Clear all settings on next start</source>
-      <translation type="unfinished">Clear all settings on next start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="636"/>
-      <source>Clear Settings</source>
-      <translation type="unfinished">Clear Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="637"/>
-      <source>All saved settings will be reset the next time you start %1. Is this really what you want?</source>
-      <translation type="unfinished">All saved settings will be reset the next time you start %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="661"/>
-      <source>Application Load/Save Path</source>
-      <translation type="unfinished">Application Load/Save Path</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="665"/>
-      <source>&lt;not set&gt;</source>
-      <translation type="unfinished">&lt;not set&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="668"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1072"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1094"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="672"/>
-      <source>Choose the location to save/load files</source>
-      <translation type="unfinished">Choose the location to save/load files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="685"/>
-      <source>Telemetry Logs from Vehicle</source>
-      <translation type="unfinished">Telemetry Logs from Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="703"/>
-      <source>Save log after each flight</source>
-      <translation type="unfinished">Save log after each flight</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="711"/>
-      <source>Save logs even if vehicle was not armed</source>
-      <translation type="unfinished">Save logs even if vehicle was not armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="84"/>
-      <source>Fly View</source>
-      <translation type="unfinished">Fly View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="145"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="177"/>
-      <source>Show simple camera controls (DIGICAM_CONTROL)</source>
-      <translation type="unfinished">Show simple camera controls (DIGICAM_CONTROL)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="188"/>
-      <source>Guided Command Settings</source>
-      <translation type="unfinished">Guided Command Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="194"/>
-      <source>Minimum Altitude</source>
-      <translation type="unfinished">Minimum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="205"/>
-      <source>Maximum Altitude</source>
-      <translation type="unfinished">Maximum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
-      <source>UI Scaling</source>
-      <translation type="unfinished">UI Scaling</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="604"/>
-      <source>Use Vehicle Pairing</source>
-      <translation type="unfinished">Use Vehicle Pairing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="618"/>
-      <source>Check for Internet connection</source>
-      <translation type="unfinished">Check for Internet connection</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="719"/>
-      <source>Save CSV log of telemetry data</source>
-      <translation type="unfinished">Save CSV log of telemetry data</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="103"/>
-      <source>Use Preflight Checklist</source>
-      <translation type="unfinished">Use Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="111"/>
-      <source>Enforce Preflight Checklist</source>
-      <translation type="unfinished">Enforce Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="120"/>
-      <source>Keep Map Centered On Vehicle</source>
-      <translation type="unfinished">Keep Map Centered On Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="128"/>
-      <source>Show Telemetry Log Replay Status Bar</source>
-      <translation type="unfinished">Show Telemetry Log Replay Status Bar</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="139"/>
-      <source>Virtual Joystick</source>
-      <translation type="unfinished">Virtual Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="153"/>
-      <source>Use Vertical Instrument Panel</source>
-      <translation type="unfinished">Use Vertical Instrument Panel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="161"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="169"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="216"/>
-      <source>Go To Location Max Distance</source>
-      <translation type="unfinished">Go To Location Max Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="233"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="240"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="296"/>
-      <source>File Format</source>
-      <translation type="unfinished">File Format</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="318"/>
-      <source>Video decode priority</source>
-      <translation type="unfinished">Video decode priority</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="345"/>
-      <source>Auto-Delete Saved Recordings</source>
-      <translation type="unfinished">Auto-Delete Saved Recordings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="356"/>
-      <source>Plan View</source>
-      <translation type="unfinished">Plan View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="378"/>
-      <source>Default Mission Altitude</source>
-      <translation type="unfinished">Default Mission Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="384"/>
-      <source>VTOL TransitionDistance</source>
-      <translation type="unfinished">VTOL TransitionDistance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="392"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="397"/>
-      <source>Missions Do Not Require Takeoff Item</source>
-      <translation type="unfinished">Missions Do Not Require Takeoff Item</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="731"/>
-      <source>AutoConnect to the following devices</source>
-      <translation type="unfinished">AutoConnect to the following devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>LibrePilot</source>
-      <translation type="unfinished">LibrePilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="847"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Zero-Conf</source>
-      <translation type="unfinished">Zero-Conf</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="781"/>
-      <source>NMEA GPS Device</source>
-      <translation type="unfinished">NMEA GPS Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="812"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="832"/>
-      <source>NMEA stream UDP port</source>
-      <translation type="unfinished">NMEA stream UDP port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="870"/>
-      <source>Perform Survey-In</source>
-      <translation type="unfinished">Perform Survey-In</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="904"/>
-      <source>Use Specified Base Position</source>
-      <translation type="unfinished">Use Specified Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="965"/>
-      <source>Save Current Base Position</source>
-      <translation type="unfinished">Save Current Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="981"/>
-      <source>ADSB Server</source>
-      <translation type="unfinished">ADSB Server</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="999"/>
-      <source>Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</source>
-      <translation type="unfinished">Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="253"/>
-      <source>UDP Port</source>
-      <translation type="unfinished">UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="264"/>
-      <source>RTSP URL</source>
-      <translation type="unfinished">RTSP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="275"/>
-      <source>TCP URL</source>
-      <translation type="unfinished">TCP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="285"/>
-      <source>Aspect Ratio</source>
-      <translation type="unfinished">Aspect Ratio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="331"/>
-      <source>Disable When Disarmed</source>
-      <translation type="unfinished">Disable When Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="338"/>
-      <source>Low Latency Mode</source>
-      <translation type="unfinished">Low Latency Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="307"/>
-      <source>Max Storage Usage</source>
-      <translation type="unfinished">Max Storage Usage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1044"/>
-      <source>Brand Image</source>
-      <translation type="unfinished">Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1063"/>
-      <source>Indoor Image</source>
-      <translation type="unfinished">Indoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1076"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1098"/>
-      <source>Choose custom brand image file</source>
-      <translation type="unfinished">Choose custom brand image file</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1085"/>
-      <source>Outdoor Image</source>
-      <translation type="unfinished">Outdoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1106"/>
-      <source>Reset Default Brand Image</source>
-      <translation type="unfinished">Reset Default Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1119"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceController</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="151"/>
-      <source>GeoFence supports version %1</source>
-      <translation type="unfinished">GeoFence supports version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="158"/>
-      <source>GeoFence polygon not stored as object</source>
-      <translation type="unfinished">GeoFence polygon not stored as object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="172"/>
-      <source>GeoFence circle not stored as object</source>
-      <translation type="unfinished">GeoFence circle not stored as object</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceEditor</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="37"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="65"/>
-      <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
-      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="66"/>
-      <source>This vehicle does not support GeoFence.</source>
-      <translation type="unfinished">This vehicle does not support GeoFence.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="116"/>
-      <source>Insert GeoFence</source>
-      <translation type="unfinished">Insert GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="121"/>
-      <source>Polygon Fence</source>
-      <translation type="unfinished">Polygon Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="133"/>
-      <source>Circular Fence</source>
-      <translation type="unfinished">Circular Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
-      <source>Polygon Fences</source>
-      <translation type="unfinished">Polygon Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="151"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="226"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="162"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="238"/>
-      <source>Inclusion</source>
-      <translation type="unfinished">Inclusion</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="178"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="254"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="202"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="294"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="211"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="303"/>
-      <source>Del</source>
-      <translation type="unfinished">Del</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="222"/>
-      <source>Circular Fences</source>
-      <translation type="unfinished">Circular Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="278"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="314"/>
-      <source>Breach Return Point</source>
-      <translation type="unfinished">Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="318"/>
-      <source>Add Breach Return Point</source>
-      <translation type="unfinished">Add Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="327"/>
-      <source>Remove Breach Return Point</source>
-      <translation type="unfinished">Remove Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="342"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceManager</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="161"/>
-      <source>GeoFence load: Vertex count change mid-polygon - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="165"/>
-      <source>GeoFence load: Polygon type changed before last load complete - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="178"/>
-      <source>GeoFence load: Incomplete polygon loaded</source>
-      <translation type="unfinished">GeoFence load: Incomplete polygon loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="186"/>
-      <source>GeoFence load: Unsupported command %1</source>
-      <translation type="unfinished">GeoFence load: Unsupported command %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="170"/>
-      <source>B</source>
-      <comment>Breach Return Point item indicator</comment>
-      <translation type="unfinished">B</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagController</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="58"/>
-      <source>Images have alreay been tagged. Existing images will be removed.</source>
-      <translation type="unfinished">Images have alreay been tagged. Existing images will be removed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="81"/>
-      <source>The save folder already contains images.</source>
-      <translation type="unfinished">The save folder already contains images.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="95"/>
-      <source>Cannot find the image directory.</source>
-      <translation type="unfinished">Cannot find the image directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="103"/>
-      <source>Couldn&apos;t replace the previously tagged images</source>
-      <translation type="unfinished">Couldn&apos;t replace the previously tagged images</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="110"/>
-      <source>Cannot find the save directory.</source>
-      <translation type="unfinished">Cannot find the save directory.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="26"/>
-      <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="67"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="75"/>
-      <source>Select log file</source>
-      <translation type="unfinished">Select log file</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>ULog file (*.ulg)</source>
-      <translation type="unfinished">ULog file (*.ulg)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>PX4 log file (*.px4log)</source>
-      <translation type="unfinished">PX4 log file (*.px4log)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="95"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="103"/>
-      <source>Select image directory</source>
-      <translation type="unfinished">Select image directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="122"/>
-      <source>(Optionally) Select save directory</source>
-      <translation type="unfinished">(Optionally) Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="130"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Cancel Tagging</source>
-      <translation type="unfinished">Cancel Tagging</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Start Tagging</source>
-      <translation type="unfinished">Start Tagging</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagWorker</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="158"/>
-      <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
-      <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="169"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="257"/>
-      <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="181"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="213"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="228"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="242"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="284"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="291"/>
-      <source>Tagging cancelled</source>
-      <translation type="unfinished">Tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="190"/>
-      <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>%1 - tagging cancelled</source>
-      <translation type="unfinished">%1 - tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>Log parsing failed</source>
-      <translation type="unfinished">Log parsing failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="235"/>
-      <source>Geotagging failed in trigger filtering</source>
-      <translation type="unfinished">Geotagging failed in trigger filtering</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
-      <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="264"/>
-      <source>Geotagging failed. Couldn&apos;t write to image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="274"/>
-      <source>Geotagging failed. Couldn&apos;t write to an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to an image.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionConfirm</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="104"/>
-      <source>Slide to confirm</source>
-      <translation type="unfinished">Slide to confirm</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="81"/>
-      <source>Select Action</source>
-      <translation type="unfinished">Select Action</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionsController</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="36"/>
-      <source>EMERGENCY STOP</source>
-      <translation type="unfinished">EMERGENCY STOP</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="42"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
-      <source>Start Mission</source>
-      <translation type="unfinished">Start Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="44"/>
-      <source>Start Mission (MV)</source>
-      <translation type="unfinished">Start Mission (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="45"/>
-      <source>Continue Mission</source>
-      <translation type="unfinished">Continue Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="46"/>
-      <source>Resume FAILED</source>
-      <translation type="unfinished">Resume FAILED</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="47"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="48"/>
-      <source>Pause (MV)</source>
-      <translation type="unfinished">Pause (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="49"/>
-      <source>Change Altitude</source>
-      <translation type="unfinished">Change Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="50"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="51"/>
-      <source>Land Abort</source>
-      <translation type="unfinished">Land Abort</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
-      <source>Set Waypoint</source>
-      <translation type="unfinished">Set Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
-      <source>Go To Location</source>
-      <translation type="unfinished">Go To Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
-      <source>Return to the launch position of the vehicle.</source>
-      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
-      <source>VTOL Transition</source>
-      <translation type="unfinished">VTOL Transition</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
-      <source>Arm the vehicle.</source>
-      <translation type="unfinished">Arm the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
-      <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
-      <source>Disarm the vehicle</source>
-      <translation type="unfinished">Disarm the vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
-      <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
-      <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
-      <source>Takeoff from ground and hold position.</source>
-      <translation type="unfinished">Takeoff from ground and hold position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-      <source>Takeoff from ground and start the current mission.</source>
-      <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
-      <source>Continue the mission from the current waypoint.</source>
-      <translation type="unfinished">Continue the mission from the current waypoint.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
-      <source>Upload of resume mission failed. Confirm to retry upload</source>
-      <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
-      <source>Land the vehicle at the current position.</source>
-      <translation type="unfinished">Land the vehicle at the current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
-      <source>Change the altitude of the vehicle up or down.</source>
-      <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
-      <source>Move the vehicle to the specified location.</source>
-      <translation type="unfinished">Move the vehicle to the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
-      <source>Adjust current waypoint to %1.</source>
-      <translation type="unfinished">Adjust current waypoint to %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
-      <source>Orbit the vehicle around the specified location.</source>
-      <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
-      <source>Abort the landing sequence.</source>
-      <translation type="unfinished">Abort the landing sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
-      <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
-      <source>Pause all vehicles at their current position.</source>
-      <translation type="unfinished">Pause all vehicles at their current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
-      <source>Transition VTOL to fixed wing flight.</source>
-      <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
-      <source>Transition VTOL to multi-rotor flight.</source>
-      <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="77"/>
-      <source>Make the specified location a Region Of Interest.</source>
-      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="163"/>
-      <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="392"/>
-      <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="536"/>
-      <source>Internal error: unknown actionCode</source>
-      <translation type="unfinished">Internal error: unknown actionCode</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedAltitudeSlider</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="65"/>
-      <source>New Alt(rel)</source>
-      <translation type="unfinished">New Alt(rel)</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="37"/>
-      <source>QGroundControl User Guide</source>
-      <translation type="unfinished">QGroundControl User Guide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="44"/>
-      <source>PX4 Users Discussion Forum</source>
-      <translation type="unfinished">PX4 Users Discussion Forum</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="51"/>
-      <source>ArduPilot Users Discussion Forum</source>
-      <translation type="unfinished">ArduPilot Users Discussion Forum</translation>
-    </message>
-  </context>
-  <context>
-    <name>HorizontalFactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="128"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="153"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="136"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="160"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
-      <source>Color</source>
-      <translation type="unfinished">Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
-      <source>Opacity</source>
-      <translation type="unfinished">Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueArea</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="85"/>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="109"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <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/QmlControls/InstrumentValueArea.qml" line="127"/>
-      <source>Reset To Defaults</source>
-      <translation type="unfinished">Reset To Defaults</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueEditDialog</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
-      <source>Value Display</source>
-      <translation type="unfinished">Value Display</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
-      <source>Valuec requires a connected vehicle for setup.</source>
-      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="89"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="129"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="133"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="146"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="159"/>
-      <source>Show Units</source>
-      <translation type="unfinished">Show Units</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="164"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="246"/>
-      <source>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</source>
-      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="264"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="371"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="470"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="321"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="420"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="505"/>
-      <source>Add Row</source>
-      <translation type="unfinished">Add Row</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="353"/>
-      <source>Specify the icon you want to display based on value ranges.</source>
-      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="452"/>
-      <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="520"/>
-      <source>Select Icon</source>
-      <translation type="unfinished">Select Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueValue.qml" line="47"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>Joystick</name>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="44"/>
-      <source>No Action</source>
-      <translation type="unfinished">No Action</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="45"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="46"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="47"/>
-      <source>Toggle Arm</source>
-      <translation type="unfinished">Toggle Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="48"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="49"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="50"/>
-      <source>Continuous Zoom In</source>
-      <translation type="unfinished">Continuous Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="51"/>
-      <source>Continuous Zoom Out</source>
-      <translation type="unfinished">Continuous Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="52"/>
-      <source>Step Zoom In</source>
-      <translation type="unfinished">Step Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="53"/>
-      <source>Step Zoom Out</source>
-      <translation type="unfinished">Step Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="58"/>
-      <source>Trigger Camera</source>
-      <translation type="unfinished">Trigger Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="59"/>
-      <source>Start Recording Video</source>
-      <translation type="unfinished">Start Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="60"/>
-      <source>Stop Recording Video</source>
-      <translation type="unfinished">Stop Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="61"/>
-      <source>Toggle Recording Video</source>
-      <translation type="unfinished">Toggle Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="62"/>
-      <source>Gimbal Down</source>
-      <translation type="unfinished">Gimbal Down</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="63"/>
-      <source>Gimbal Up</source>
-      <translation type="unfinished">Gimbal Up</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="64"/>
-      <source>Gimbal Left</source>
-      <translation type="unfinished">Gimbal Left</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="65"/>
-      <source>Gimbal Right</source>
-      <translation type="unfinished">Gimbal Right</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="66"/>
-      <source>Gimbal Center</source>
-      <translation type="unfinished">Gimbal Center</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="67"/>
-      <source>Emergency Stop</source>
-      <translation type="unfinished">Emergency Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="54"/>
-      <source>Next Video Stream</source>
-      <translation type="unfinished">Next Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="55"/>
-      <source>Previous Video Stream</source>
-      <translation type="unfinished">Previous Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="56"/>
-      <source>Next Camera</source>
-      <translation type="unfinished">Next Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="57"/>
-      <source>Previous Camera</source>
-      <translation type="unfinished">Previous Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfig</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigAdvanced</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
-      <source>Full down stick is zero throttle</source>
-      <translation type="unfinished">Full down stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
-      <source>Center stick is zero throttle</source>
-      <translation type="unfinished">Center stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
-      <source>Spring loaded throttle smoothing</source>
-      <translation type="unfinished">Spring loaded throttle smoothing</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
-      <source>Allow negative Thrust</source>
-      <translation type="unfinished">Allow negative Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
-      <source>Exponential:</source>
-      <translation type="unfinished">Exponential:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
-      <source>Enable further advanced settings (careful!)</source>
-      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
-      <source>Axis frequency (Hz):</source>
-      <translation type="unfinished">Axis frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="127"/>
-      <source>Button repeat frequency (Hz):</source>
-      <translation type="unfinished">Button repeat frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="145"/>
-      <source>Enable circle correction</source>
-      <translation type="unfinished">Enable circle correction</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="163"/>
-      <source>Deadbands</source>
-      <translation type="unfinished">Deadbands</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="180"/>
-      <source>Deadband can be set during the first </source>
-      <translation type="unfinished">Deadband can be set during the first </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="181"/>
-      <source>step of calibration by gently wiggling each axis. </source>
-      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="182"/>
-      <source>Deadband can also be adjusted by clicking and </source>
-      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="183"/>
-      <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigButtons</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
-      <source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
-      <translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="124"/>
-      <source>#</source>
-      <translation type="unfinished">#</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="128"/>
-      <source>Function: </source>
-      <translation type="unfinished">Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="132"/>
-      <source>Shift Function: </source>
-      <translation type="unfinished">Shift Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="185"/>
-      <source>No firmware support</source>
-      <translation type="unfinished">No firmware support</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigCalibration</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="169"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="175"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigController</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="197"/>
-      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigGeneral</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable joystick input</source>
-      <translation type="unfinished">Enable joystick input</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable not allowed (Calibrate First)</source>
-      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
-      <source>Active joystick:</source>
-      <translation type="unfinished">Active joystick:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
-      <source>Active joystick name not in combo</source>
-      <translation type="unfinished">Active joystick name not in combo</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
-      <source>RC Mode:</source>
-      <translation type="unfinished">RC Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Lateral</source>
-      <translation type="unfinished">Lateral</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-      <source>Joystick Status</source>
-      <translation type="unfinished">Joystick Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-      <source>Connected:</source>
-      <translation type="unfinished">Connected:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-      <source>Enabled:</source>
-      <translation type="unfinished">Enabled:</translation>
-    </message>
-  </context>
-  <context>
-    <name>JsonHelper</name>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="181"/>
-      <source>File open failed: file:error %1 %2</source>
-      <translation type="unfinished">File open failed: file:error %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="334"/>
-      <source>Unable to open file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="343"/>
-      <source>Unable to parse json file: %1 error: %2 offset: %3</source>
-      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="348"/>
-      <source>Root of json file is not object: %1</source>
-      <translation type="unfinished">Root of json file is not object: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="355"/>
-      <source>Json file: &apos;%1&apos;. %2</source>
-      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLHelper</name>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="15"/>
-      <source>KML file load failed. %1</source>
-      <translation type="unfinished">KML file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="24"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="29"/>
-      <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="37"/>
-      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="61"/>
-      <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="77"/>
-      <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="83"/>
-      <location filename="../src/KMLHelper.cc" line="144"/>
-      <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="138"/>
-      <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLOrSHPFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>LandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="635"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="655"/>
-      <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkManager</name>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="235"/>
-      <source>Connect not allowed: %1</source>
-      <translation type="unfinished">Connect not allowed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="607"/>
-      <location filename="../src/comm/LinkManager.cc" line="613"/>
-      <location filename="../src/comm/LinkManager.cc" line="618"/>
-      <location filename="../src/comm/LinkManager.cc" line="623"/>
-      <source>%1 on %2 (AutoConnect)</source>
-      <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="667"/>
-      <source>Shutdown</source>
-      <translation type="unfinished">Shutdown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="683"/>
-      <source>Serial</source>
-      <translation type="unfinished">Serial</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="685"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="686"/>
-      <source>TCP</source>
-      <translation type="unfinished">TCP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="691"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="694"/>
-      <location filename="../src/comm/LinkManager.cc" line="884"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="95"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="104"/>
-      <source>Remove Link Configuration</source>
-      <translation type="unfinished">Remove Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="105"/>
-      <source>Remove %1. Is this really what you want?</source>
-      <translation type="unfinished">Remove %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="116"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="121"/>
-      <source>Add</source>
-      <translation type="unfinished">Add</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="125"/>
-      <source>Connect</source>
-      <translation type="unfinished">Connect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="130"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="135"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Edit Link Configuration Settings</source>
-      <translation type="unfinished">Edit Link Configuration Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Create New Link Configuration</source>
-      <translation type="unfinished">Create New Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="183"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="189"/>
-      <source>Enter name</source>
-      <translation type="unfinished">Enter name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="194"/>
-      <source>Automatically Connect on Start</source>
-      <translation type="unfinished">Automatically Connect on Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="201"/>
-      <source>High Latency</source>
-      <translation type="unfinished">High Latency</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="206"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="240"/>
-      <source>OK</source>
-      <translation type="unfinished">OK</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="260"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogCompressor</name>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="50"/>
-      <source>Log Compressor: Cannot start/compress log file, since input file %1 is not readable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since input file %1 is not readable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="67"/>
-      <source>Log Compressor: Cannot start/compress log file, since output file %1 is not writable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since output file %1 is not writable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="105"/>
-      <source>Log compressor: Dataset contains dimensions: </source>
-      <translation type="unfinished">Log compressor: Dataset contains dimensions: </translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="213"/>
-      <source>Log Compressor</source>
-      <translation type="unfinished">Log Compressor</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadController</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="180"/>
-      <source>Available</source>
-      <translation type="unfinished">Available</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="227"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="705"/>
-      <source>Canceled</source>
-      <translation type="unfinished">Canceled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="274"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="385"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="646"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="366"/>
-      <source>Downloaded</source>
-      <translation type="unfinished">Downloaded</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="436"/>
-      <source>Timed Out</source>
-      <translation type="unfinished">Timed Out</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="556"/>
-      <source>Waiting</source>
-      <translation type="unfinished">Waiting</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="601"/>
-      <source>UnknownDate</source>
-      <translation type="unfinished">UnknownDate</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="24"/>
-      <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation type="unfinished">Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="59"/>
-      <source>Id</source>
-      <translation type="unfinished">Id</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="72"/>
-      <source>Date</source>
-      <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="83"/>
-      <source>Date Unknown</source>
-      <translation type="unfinished">Date Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="94"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="107"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="124"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>Log Refresh</source>
-      <translation type="unfinished">Log Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation type="unfinished">You must be connected to a vehicle in order to download logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="136"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="153"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="170"/>
-      <source>Erase All</source>
-      <translation type="unfinished">Erase All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="174"/>
-      <source>Delete All Log Files</source>
-      <translation type="unfinished">Delete All Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="180"/>
-      <source>All log files will be erased permanently. Is this really what you want?</source>
-      <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="189"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLink</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="83"/>
-      <source>Log Replay Error</source>
-      <translation type="unfinished">Log Replay Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="104"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="269"/>
-      <source>Attempt to load new log while log being played</source>
-      <translation type="unfinished">Attempt to load new log while log being played</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="275"/>
-      <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="285"/>
-      <source>The log file &apos;%1&apos; is corrupt or empty.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="358"/>
-      <source>Connect not allowed during Flight Data replay.</source>
-      <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="425"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="445"/>
-      <source>Unable to seek to new position</source>
-      <translation type="unfinished">Unable to seek to new position</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkConfiguration</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.h" line="40"/>
-      <source>Log Replay Link Settings</source>
-      <translation type="unfinished">Log Replay Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkController</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="593"/>
-      <source>%2m:%3s</source>
-      <translation type="unfinished">%2m:%3s</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="595"/>
-      <source>%1h:%2m:%3s</source>
-      <translation type="unfinished">%1h:%2m:%3s</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplaySettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="26"/>
-      <source>Log File</source>
-      <translation type="unfinished">Log File</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="35"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="41"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayStatusBar</name>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Play</source>
-      <translation type="unfinished">Play</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="104"/>
-      <source>Load Telemetry Log</source>
-      <translation type="unfinished">Load Telemetry Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="110"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="195"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="196"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="197"/>
-      <source>Magnetometer</source>
-      <translation type="unfinished">Magnetometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="198"/>
-      <source>Absolute pressure</source>
-      <translation type="unfinished">Absolute pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="199"/>
-      <source>Differential pressure</source>
-      <translation type="unfinished">Differential pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="200"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="201"/>
-      <source>Optical flow</source>
-      <translation type="unfinished">Optical flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="202"/>
-      <source>Computer vision position</source>
-      <translation type="unfinished">Computer vision position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="203"/>
-      <source>Laser based position</source>
-      <translation type="unfinished">Laser based position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="204"/>
-      <source>External ground truth</source>
-      <translation type="unfinished">External ground truth</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="205"/>
-      <source>Angular rate control</source>
-      <translation type="unfinished">Angular rate control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="206"/>
-      <source>Attitude stabilization</source>
-      <translation type="unfinished">Attitude stabilization</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="207"/>
-      <source>Yaw position</source>
-      <translation type="unfinished">Yaw position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="208"/>
-      <source>Z/altitude control</source>
-      <translation type="unfinished">Z/altitude control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="209"/>
-      <source>X/Y position control</source>
-      <translation type="unfinished">X/Y position control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="210"/>
-      <source>Motor outputs / control</source>
-      <translation type="unfinished">Motor outputs / control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="211"/>
-      <source>RC receiver</source>
-      <translation type="unfinished">RC receiver</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="212"/>
-      <source>Gyro 2</source>
-      <translation type="unfinished">Gyro 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="213"/>
-      <source>Accelerometer 2</source>
-      <translation type="unfinished">Accelerometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="214"/>
-      <source>Magnetometer 2</source>
-      <translation type="unfinished">Magnetometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="215"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="216"/>
-      <source>AHRS</source>
-      <translation type="unfinished">AHRS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="217"/>
-      <source>Terrain</source>
-      <translation type="unfinished">Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="218"/>
-      <source>Motors reversed</source>
-      <translation type="unfinished">Motors reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="219"/>
-      <source>Logging</source>
-      <translation type="unfinished">Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="220"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="221"/>
-      <source>Proximity</source>
-      <translation type="unfinished">Proximity</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="222"/>
-      <source>Satellite Communication</source>
-      <translation type="unfinished">Satellite Communication</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="223"/>
-      <source>Pre-Arm Check</source>
-      <translation type="unfinished">Pre-Arm Check</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="224"/>
-      <source>Avoidance/collision prevention</source>
-      <translation type="unfinished">Avoidance/collision prevention</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink unknown SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="236"/>
-      <source>Unknown sensor</source>
-      <translation type="unfinished">Unknown sensor</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkChart</name>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
-      <source>Scale:</source>
-      <translation type="unfinished">Scale:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
-      <source>Range:</source>
-      <translation type="unfinished">Range:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorController</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
-      <source>5 Sec</source>
-      <translation type="unfinished">5 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
-      <source>10 Sec</source>
-      <translation type="unfinished">10 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
-      <source>30 Sec</source>
-      <translation type="unfinished">30 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
-      <source>60 Sec</source>
-      <translation type="unfinished">60 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="744"/>
-      <source>10,000</source>
-      <translation type="unfinished">10,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="745"/>
-      <source>1,000</source>
-      <translation type="unfinished">1,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="746"/>
-      <source>100</source>
-      <translation type="unfinished">100</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="747"/>
-      <source>10</source>
-      <translation type="unfinished">10</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="748"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="749"/>
-      <source>0.1</source>
-      <translation type="unfinished">0.1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="750"/>
-      <source>0.01</source>
-      <translation type="unfinished">0.01</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="751"/>
-      <source>0.001</source>
-      <translation type="unfinished">0.001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="752"/>
-      <source>0.0001</source>
-      <translation type="unfinished">0.0001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="846"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="859"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="874"/>
-      <source>System %1</source>
-      <translation type="unfinished">System %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="45"/>
-      <source>Inspect real time MAVLink messages.</source>
-      <translation type="unfinished">Inspect real time MAVLink messages.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="142"/>
-      <source>Message:</source>
-      <translation type="unfinished">Message:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="150"/>
-      <source>Component:</source>
-      <translation type="unfinished">Component:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="156"/>
-      <source>Count:</source>
-      <translation type="unfinished">Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="171"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="174"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="177"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="180"/>
-      <source>Plot 1</source>
-      <translation type="unfinished">Plot 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="183"/>
-      <source>Plot 2</source>
-      <translation type="unfinished">Plot 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkProtocol</name>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>MAVLink Protocol</source>
-      <translation type="unfinished">MAVLink Protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
-      <translation type="unfinished">MAVLink Logging failed. Could not write to file %1, logging disabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
-      <translation type="unfinished">Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="383"/>
-      <source>MAVLink protocol</source>
-      <translation type="unfinished">MAVLink protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
-      <translation type="unfinished">Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainRootWindow</name>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="270"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="287"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="306"/>
-      <source>%1 close</source>
-      <translation type="unfinished">%1 close</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="307"/>
-      <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
-      <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="271"/>
-      <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="156"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="385"/>
-      <source>Analyze Tools</source>
-      <translation type="unfinished">Analyze Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="160"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="370"/>
-      <source>Vehicle Setup</source>
-      <translation type="unfinished">Vehicle Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="164"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="401"/>
-      <source>Application Settings</source>
-      <translation type="unfinished">Application Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="288"/>
-      <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="351"/>
-      <source>Select Tool</source>
-      <translation type="unfinished">Select Tool</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="419"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="452"/>
-      <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="520"/>
-      <source>Back</source>
-      <translation type="unfinished">Back</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainStatusIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="35"/>
-      <source>Communication Lost</source>
-      <translation type="unfinished">Communication Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="36"/>
-      <source>Ready To Fly</source>
-      <translation type="unfinished">Ready To Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="37"/>
-      <source>Not Ready</source>
-      <translation type="unfinished">Not Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="38"/>
-      <source>Disconnected</source>
-      <translation type="unfinished">Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="39"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="40"/>
-      <source>Flying</source>
-      <translation type="unfinished">Flying</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="41"/>
-      <source>Landing</source>
-      <translation type="unfinished">Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>FW(vtol)</source>
-      <translation type="unfinished">FW(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>MR(vtol)</source>
-      <translation type="unfinished">MR(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="196"/>
-      <source>Sensor Status</source>
-      <translation type="unfinished">Sensor Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Multi-Rotor</source>
-      <translation type="unfinished">Transition to Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Fixed Wing</source>
-      <translation type="unfinished">Transition to Fixed Wing</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainToolBar</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="201"/>
-      <source>Downloading</source>
-      <translation type="unfinished">Downloading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="209"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="82"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-  </context>
-  <context>
-    <name>MapScale</name>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="46"/>
-      <source> km</source>
-      <translation type="unfinished"> km</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="48"/>
-      <source> m</source>
-      <translation type="unfinished"> m</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="59"/>
-      <source> mile</source>
-      <translation type="unfinished"> mile</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="61"/>
-      <source> miles</source>
-      <translation type="unfinished"> miles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="64"/>
-      <source> ft</source>
-      <translation type="unfinished"> ft</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="193"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="206"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="219"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkConsolePage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
-      <source>Provides a connection to the vehicle&apos;s system shell.</source>
-      <translation type="unfinished">Provides a connection to the vehicle&apos;s system shell.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="140"/>
-      <source>Copy</source>
-      <translation type="unfinished">Copy</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="146"/>
-      <source>Paste</source>
-      <translation type="unfinished">Paste</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="290"/>
-      <source>Send</source>
-      <translation type="unfinished">Send</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
-      <source>MAVLink Logging</source>
-      <translation type="unfinished">MAVLink Logging</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">Please enter an email address before uploading MAVLink log files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
-      <source>Ground Station</source>
-      <translation type="unfinished">Ground Station</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
-      <source>MAVLink System ID:</source>
-      <translation type="unfinished">MAVLink System ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
-      <source>Emit heartbeat</source>
-      <translation type="unfinished">Emit heartbeat</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
-      <source>Only accept MAVs with same protocol version</source>
-      <translation type="unfinished">Only accept MAVs with same protocol version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="159"/>
-      <source>Enable MAVLink forwarding</source>
-      <translation type="unfinished">Enable MAVLink forwarding</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="170"/>
-      <source>Host name:</source>
-      <translation type="unfinished">Host name:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="183"/>
-      <source>&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</source>
-      <translation type="unfinished">&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="199"/>
-      <source>Telemetry Stream Rates (ArduPilot Only)</source>
-      <translation type="unfinished">Telemetry Stream Rates (ArduPilot Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="219"/>
-      <source>All Streams Controlled By Vehicle Settings</source>
-      <translation type="unfinished">All Streams Controlled By Vehicle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="228"/>
-      <source>Raw Sensors</source>
-      <translation type="unfinished">Raw Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="235"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="242"/>
-      <source>RC Channel</source>
-      <translation type="unfinished">RC Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="249"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="256"/>
-      <source>Extra 1</source>
-      <translation type="unfinished">Extra 1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="263"/>
-      <source>Extra 2</source>
-      <translation type="unfinished">Extra 2</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="270"/>
-      <source>Extra 3</source>
-      <translation type="unfinished">Extra 3</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="288"/>
-      <source>MAVLink Link Status (Current Vehicle)</source>
-      <translation type="unfinished">MAVLink Link Status (Current Vehicle)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="309"/>
-      <source>Total messages sent (computed):</source>
-      <translation type="unfinished">Total messages sent (computed):</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="314"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="329"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="344"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="359"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="324"/>
-      <source>Total messages received:</source>
-      <translation type="unfinished">Total messages received:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="339"/>
-      <source>Total message loss:</source>
-      <translation type="unfinished">Total message loss:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="354"/>
-      <source>Loss rate:</source>
-      <translation type="unfinished">Loss rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="375"/>
-      <source>MAVLink 2.0 Logging (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Logging (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="398"/>
-      <source>Manual Start/Stop:</source>
-      <translation type="unfinished">Manual Start/Stop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="402"/>
-      <source>Start Logging</source>
-      <translation type="unfinished">Start Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="409"/>
-      <source>Stop Logging</source>
-      <translation type="unfinished">Stop Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="419"/>
-      <source>Enable automatic logging</source>
-      <translation type="unfinished">Enable automatic logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="438"/>
-      <source>MAVLink 2.0 Log Uploads (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Log Uploads (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="460"/>
-      <source>Email address for Log Upload:</source>
-      <translation type="unfinished">Email address for Log Upload:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="481"/>
-      <source>Default Description:</source>
-      <translation type="unfinished">Default Description:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="501"/>
-      <source>Default Upload URL</source>
-      <translation type="unfinished">Default Upload URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="522"/>
-      <source>Video URL:</source>
-      <translation type="unfinished">Video URL:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="540"/>
-      <source>Wind Speed:</source>
-      <translation type="unfinished">Wind Speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="578"/>
-      <source>Flight Rating:</source>
-      <translation type="unfinished">Flight Rating:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="616"/>
-      <source>Additional Feedback:</source>
-      <translation type="unfinished">Additional Feedback:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="635"/>
-      <source>Make this log publicly available</source>
-      <translation type="unfinished">Make this log publicly available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="646"/>
-      <source>Enable automatic log uploads</source>
-      <translation type="unfinished">Enable automatic log uploads</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="658"/>
-      <source>Delete log file after uploading</source>
-      <translation type="unfinished">Delete log file after uploading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="677"/>
-      <source>Saved Log Files</source>
-      <translation type="unfinished">Saved Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="740"/>
-      <source>Uploaded</source>
-      <translation type="unfinished">Uploaded</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="763"/>
-      <source>Check All</source>
-      <translation type="unfinished">Check All</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="773"/>
-      <source>Check None</source>
-      <translation type="unfinished">Check None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="783"/>
-      <source>Delete Selected</source>
-      <translation type="unfinished">Delete Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="791"/>
-      <source>Delete Selected Log Files</source>
-      <translation type="unfinished">Delete Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="792"/>
-      <source>Confirm deleting selected log files?</source>
-      <translation type="unfinished">Confirm deleting selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="799"/>
-      <source>Upload Selected</source>
-      <translation type="unfinished">Upload Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="814"/>
-      <source>Upload Selected Log Files</source>
-      <translation type="unfinished">Upload Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="815"/>
-      <source>Confirm uploading selected log files?</source>
-      <translation type="unfinished">Confirm uploading selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="822"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="831"/>
-      <source>Cancel Upload</source>
-      <translation type="unfinished">Cancel Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="832"/>
-      <source>Confirm canceling the upload process?</source>
-      <translation type="unfinished">Confirm canceling the upload process?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MessageIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MessageIndicator.qml" line="112"/>
-      <source>No Messages</source>
-      <translation type="unfinished">No Messages</translation>
-    </message>
-  </context>
-  <context>
-    <name>MicrohardSettings</name>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="63"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="80"/>
-      <source>Enable Microhard</source>
-      <translation type="unfinished">Enable Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="98"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="120"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="126"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="128"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="144"/>
-      <source>Login Error</source>
-      <translation type="unfinished">Login Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="130"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="137"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="152"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="158"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="176"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="198"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="209"/>
-      <source>Remote IP Address:</source>
-      <translation type="unfinished">Remote IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="219"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
-      <source>Configuration User Name:</source>
-      <translation type="unfinished">Configuration User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
-      <source>Configuration Password:</source>
-      <translation type="unfinished">Configuration Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
-      <source>Encryption key:</source>
-      <translation type="unfinished">Encryption key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="282"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandDialog</name>
-    <message>
-      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="32"/>
-      <source>Category:</source>
-      <translation type="unfinished">Category:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandTree</name>
-    <message>
-      <location filename="../src/MissionManager/MissionCommandTree.cc" line="23"/>
-      <source>All commands</source>
-      <translation type="unfinished">All commands</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionController</name>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="788"/>
-      <source>Mission item %1 is not an object</source>
-      <translation type="unfinished">Mission item %1 is not an object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="874"/>
-      <source>Unsupported complex item type: %1</source>
-      <translation type="unfinished">Unsupported complex item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="877"/>
-      <source>Unknown item type: %1</source>
-      <translation type="unfinished">Unknown item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="900"/>
-      <source>Could not find doJumpId: %1</source>
-      <translation type="unfinished">Could not find doJumpId: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="973"/>
-      <source>The mission file is corrupted.</source>
-      <translation type="unfinished">The mission file is corrupted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="978"/>
-      <source>The mission file is not compatible with this version of %1.</source>
-      <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="1026"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1041"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1065"/>
-      <source>Mission: %1</source>
-      <translation type="unfinished">Mission: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="285"/>
-      <source>Type found: %1 must be: %2</source>
-      <translation type="unfinished">Type found: %1 must be: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="291"/>
-      <source>%1 key must contains 7 values</source>
-      <translation type="unfinished">%1 key must contains 7 values</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="297"/>
-      <source>Param %1 incorrect type %2, must be double or null</source>
-      <translation type="unfinished">Param %1 incorrect type %2, must be double or null</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="101"/>
-      <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="206"/>
-      <source>Move to vehicle position</source>
-      <translation type="unfinished">Move to vehicle position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="215"/>
-      <source>Move to previous item position</source>
-      <translation type="unfinished">Move to previous item position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="221"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="223"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="231"/>
-      <source>Show all values</source>
-      <translation type="unfinished">Show all values</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>Mission Edit</source>
-      <translation type="unfinished">Mission Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
-      <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="251"/>
-      <source>Item #%1</source>
-      <translation type="unfinished">Item #%1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="155"/>
-      <source>Select Mission Command</source>
-      <translation type="unfinished">Select Mission Command</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemStatus</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemStatus.qml" line="46"/>
-      <source>Terrain Altitude</source>
-      <translation type="unfinished">Terrain Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionManager</name>
-    <message>
-      <location filename="../src/MissionManager/MissionManager.cc" line="92"/>
-      <source>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</source>
-      <translation type="unfinished">Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="42"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="43"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="119"/>
-      <source>Flight speed</source>
-      <translation type="unfinished">Flight speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="146"/>
-      <source>Above camera commands will take affect immediately upon mission start.</source>
-      <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="239"/>
-      <source>Launch Position</source>
-      <translation type="unfinished">Launch Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="275"/>
-      <source>Set To Map Center</source>
-      <translation type="unfinished">Set To Map Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="157"/>
-      <source>Vehicle Info</source>
-      <translation type="unfinished">Vehicle Info</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="68"/>
-      <source>All Altitudes</source>
-      <translation type="unfinished">All Altitudes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="103"/>
-      <source>Initial Waypoint Alt</source>
-      <translation type="unfinished">Initial Waypoint Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="208"/>
-      <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="213"/>
-      <source>Cruise speed</source>
-      <translation type="unfinished">Cruise speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="224"/>
-      <source>Hover speed</source>
-      <translation type="unfinished">Hover speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="258"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="270"/>
-      <source>Actual position set by vehicle at flight time.</source>
-      <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockConfiguration</name>
-    <message>
-      <location filename="../src/comm/MockLink.h" line="78"/>
-      <source>Mock Link Settings</source>
-      <translation type="unfinished">Mock Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLink</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="46"/>
-      <source>PX4 Vehicle</source>
-      <translation type="unfinished">PX4 Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="51"/>
-      <source>APM ArduCopter Vehicle</source>
-      <translation type="unfinished">APM ArduCopter Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="57"/>
-      <source>APM ArduPlane Vehicle</source>
-      <translation type="unfinished">APM ArduPlane Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="63"/>
-      <source>APM ArduSub Vehicle</source>
-      <translation type="unfinished">APM ArduSub Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="69"/>
-      <source>APM ArduRover Vehicle</source>
-      <translation type="unfinished">APM ArduRover Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="75"/>
-      <source>Generic Vehicle</source>
-      <translation type="unfinished">Generic Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="43"/>
-      <source>Send status text + voice</source>
-      <translation type="unfinished">Send status text + voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="80"/>
-      <source>Stop One MockLink</source>
-      <translation type="unfinished">Stop One MockLink</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkOptionsDlg</name>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="23"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="33"/>
-      <source>Stop Heartbeats</source>
-      <translation type="unfinished">Stop Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="42"/>
-      <source>Start Heartbeats</source>
-      <translation type="unfinished">Start Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="51"/>
-      <source>Connection Removed</source>
-      <translation type="unfinished">Connection Removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="73"/>
-      <source>Send Status Text and Voice</source>
-      <translation type="unfinished">Send Status Text and Voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="80"/>
-      <source>Increment Vehicle Id</source>
-      <translation type="unfinished">Increment Vehicle Id</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="84"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>Generic MAVLink</source>
-      <translation type="unfinished">Generic MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="94"/>
-      <source>Vehicle Type</source>
-      <translation type="unfinished">Vehicle Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduCopter</source>
-      <translation type="unfinished">ArduCopter</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduPlane</source>
-      <translation type="unfinished">ArduPlane</translation>
-    </message>
-  </context>
-  <context>
-    <name>ModeSwitchDisplay</name>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="95"/>
-      <source>Monitor:</source>
-      <translation type="unfinished">Monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="135"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
-      <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiRotorChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
-      <source>Multirotor Initial Checks</source>
-      <translation type="unfinished">Multirotor Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
-      <source>Props mounted and secured?</source>
-      <translation type="unfinished">Props mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleList</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="54"/>
-      <source>The following commands will be applied to all vehicles</source>
-      <translation type="unfinished">The following commands will be applied to all vehicles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleManager</name>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="121"/>
-      <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="139"/>
-      <source>Connected to Vehicle %1</source>
-      <translation type="unfinished">Connected to Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleSelector</name>
-    <message>
-      <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="49"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineMap</name>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="241"/>
-      <source>Error Message</source>
-      <translation type="unfinished">Error Message</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="271"/>
-      <source>Max Cache Disk Size (MB):</source>
-      <translation type="unfinished">Max Cache Disk Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="287"/>
-      <source>Max Cache Memory Size (MB):</source>
-      <translation type="unfinished">Max Cache Memory Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="303"/>
-      <source>Memory cache changes require a restart to take effect.</source>
-      <translation type="unfinished">Memory cache changes require a restart to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="307"/>
-      <source>Mapbox Access Token</source>
-      <translation type="unfinished">Mapbox Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="318"/>
-      <source>To enable Mapbox maps, enter your access token.</source>
-      <translation type="unfinished">To enable Mapbox maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="324"/>
-      <source>Mapbox User Name</source>
-      <translation type="unfinished">Mapbox User Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="335"/>
-      <source>To enable custom Mapbox styles, enter your account name.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your account name.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="341"/>
-      <source>Mapbox Style ID</source>
-      <translation type="unfinished">Mapbox Style ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="352"/>
-      <source>To enable custom Mapbox styles, enter your style ID.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your style ID.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="358"/>
-      <source>Esri Access Token</source>
-      <translation type="unfinished">Esri Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="369"/>
-      <source>To enable Esri maps, enter your access token.</source>
-      <translation type="unfinished">To enable Esri maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="375"/>
-      <source>VWorld Access Token</source>
-      <translation type="unfinished">VWorld Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="386"/>
-      <source>To enable VWorld maps, enter your access token.</source>
-      <translation type="unfinished">To enable VWorld maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="392"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="403"/>
-      <source>URL with {x} {y} {z} or {zoom} substitutions</source>
-      <translation type="unfinished">URL with {x} {y} {z} or {zoom} substitutions</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="418"/>
-      <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</source>
-      <translation type="unfinished">This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="420"/>
-      <source>Delete %1 and all its tiles.
-
-Is this really what you want?</source>
-      <translation type="unfinished">Delete %1 and all its tiles.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="525"/>
-      <source>System Wide Tile Cache</source>
-      <translation type="unfinished">System Wide Tile Cache</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="538"/>
-      <source>Zoom Levels:</source>
-      <translation type="unfinished">Zoom Levels:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="545"/>
-      <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="552"/>
-      <source>Unique:</source>
-      <translation type="unfinished">Unique:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="560"/>
-      <source>Downloaded:</source>
-      <translation type="unfinished">Downloaded:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="567"/>
-      <source>Error Count:</source>
-      <translation type="unfinished">Error Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="575"/>
-      <source>Size:</source>
-      <translation type="unfinished">Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="582"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="957"/>
-      <source>Tile Count:</source>
-      <translation type="unfinished">Tile Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="589"/>
-      <source>Resume Download</source>
-      <translation type="unfinished">Resume Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="598"/>
-      <source>Cancel Download</source>
-      <translation type="unfinished">Cancel Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="607"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="609"/>
-      <source>Confirm Delete</source>
-      <translation type="unfinished">Confirm Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="612"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1209"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1289"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1002"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1159"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1313"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="686"/>
-      <source>Min Zoom: %1</source>
-      <translation type="unfinished">Min Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="726"/>
-      <source>Max Zoom: %1</source>
-      <translation type="unfinished">Max Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="772"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1034"/>
-      <source>Add New Set</source>
-      <translation type="unfinished">Add New Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="800"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="813"/>
-      <source>Map type:</source>
-      <translation type="unfinished">Map type:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="836"/>
-      <source>Fetch elevation data</source>
-      <translation type="unfinished">Fetch elevation data</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="862"/>
-      <source>Min/Max Zoom Levels</source>
-      <translation type="unfinished">Min/Max Zoom Levels</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="966"/>
-      <source>Est Size:</source>
-      <translation type="unfinished">Est Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="978"/>
-      <source>Too many tiles</source>
-      <translation type="unfinished">Too many tiles</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="989"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1072"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1303"/>
-      <source>Import</source>
-      <translation type="unfinished">Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1081"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1149"/>
-      <source>Export</source>
-      <translation type="unfinished">Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1087"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1089"/>
-      <source>Offline Maps Options</source>
-      <translation type="unfinished">Offline Maps Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1110"/>
-      <source>Select Tile Sets to Export</source>
-      <translation type="unfinished">Select Tile Sets to Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1139"/>
-      <source>Select All</source>
-      <translation type="unfinished">Select All</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1144"/>
-      <source>Select None</source>
-      <translation type="unfinished">Select None</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1153"/>
-      <source>Export Tile Set</source>
-      <translation type="unfinished">Export Tile Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Progress</source>
-      <translation type="unfinished">Tile Set Export Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Completed</source>
-      <translation type="unfinished">Tile Set Export Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1244"/>
-      <source>Map Tile Set Import</source>
-      <translation type="unfinished">Map Tile Set Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1246"/>
-      <source>Map Tile Set Import Progress</source>
-      <translation type="unfinished">Map Tile Set Import Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1248"/>
-      <source>Map Tile Set Import Completed</source>
-      <translation type="unfinished">Map Tile Set Import Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1276"/>
-      <source>Append to existing set</source>
-      <translation type="unfinished">Append to existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1282"/>
-      <source>Replace existing set</source>
-      <translation type="unfinished">Replace existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1307"/>
-      <source>Import Tile Set</source>
-      <translation type="unfinished">Import Tile Set</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineVehicleFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
-      <source>Vehicle Information</source>
-      <translation type="unfinished">Vehicle Information</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
-      <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>PIDTuning</name>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune enabled</source>
-      <translation type="unfinished">Autotune enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune disabled</source>
-      <translation type="unfinished">Autotune disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="227"/>
-      <source>Select Tuning:</source>
-      <translation type="unfinished">Select Tuning:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="253"/>
-      <source>Clipboard Values:</source>
-      <translation type="unfinished">Clipboard Values:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="279"/>
-      <source>Save To Clipboard</source>
-      <translation type="unfinished">Save To Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="284"/>
-      <source>Restore From Clipboard</source>
-      <translation type="unfinished">Restore From Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="343"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="371"/>
-      <source>Automatic Flight Mode Switching</source>
-      <translation type="unfinished">Automatic Flight Mode Switching</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="381"/>
-      <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
-      <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
-      <source>Switches to &apos;%1&apos; when you click Stop.</source>
-      <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <source>FLIGHT MODES</source>
-      <translation type="unfinished">FLIGHT MODES</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <source>You can assign multiple flight modes to a single channel. </source>
-      <translation type="unfinished">You can assign multiple flight modes to a single channel. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <source>Turn your radio control on to test switch settings. </source>
-      <translation type="unfinished">Turn your radio control on to test switch settings. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <source>The following channels: </source>
-      <translation type="unfinished">The following channels: </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <source> are not available for Flight Modes since they are already in use for other functions.</source>
-      <translation type="unfinished"> are not available for Flight Modes since they are already in use for other functions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <source>Manual/Main</source>
-      <translation type="unfinished">Manual/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <source>Stabilized/Main</source>
-      <translation type="unfinished">Stabilized/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <source>The pilot has full control of the aircraft, no assistance is provided. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, no assistance is provided. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <source>The Main mode switch must always be assigned to a channel in order to fly</source>
-      <translation type="unfinished">The Main mode switch must always be assigned to a channel in order to fly</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <source>The pilot has full control of the aircraft, only attitude is stabilized. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, only attitude is stabilized. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <source>Assist</source>
-      <translation type="unfinished">Assist</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <source>If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <source>In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</source>
-      <translation type="unfinished">In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <source>If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <source>In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</source>
-      <translation type="unfinished">In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <source>Roll/pitch angles and rudder deflection are controlled. </source>
-      <translation type="unfinished">Roll/pitch angles and rudder deflection are controlled. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <source>The angular rates are controlled, but not the attitude. </source>
-      <translation type="unfinished">The angular rates are controlled, but not the attitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <source>Roll stick controls banking, pitch stick altitude </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick altitude </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <source>Throttle stick controls speed. </source>
-      <translation type="unfinished">Throttle stick controls speed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <source>With no stick inputs the plane holds heading, but drifts off in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane holds heading, but drifts off in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <source>Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </source>
-      <translation type="unfinished">Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <source>Position Control</source>
-      <translation type="unfinished">Position Control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <source>Roll stick controls banking, pitch stick controls altitude. </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick controls altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <source>Throttle stick controls speed.</source>
-      <translation type="unfinished">Throttle stick controls speed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <source>With no stick inputs the plane flies a straight line, even in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane flies a straight line, even in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <source>Roll and Pitch sticks control sideways and forward speed </source>
-      <translation type="unfinished">Roll and Pitch sticks control sideways and forward speed </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <source>Throttle stick controls climb / sink rade. </source>
-      <translation type="unfinished">Throttle stick controls climb / sink rade. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <source>The aircraft obeys the programmed mission sent by QGroundControl. </source>
-      <translation type="unfinished">The aircraft obeys the programmed mission sent by QGroundControl. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <source>The aircraft flies in a circle around the current position at the current altitude. </source>
-      <translation type="unfinished">The aircraft flies in a circle around the current position at the current altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <source>The multirotor hovers at the current position and altitude. </source>
-      <translation type="unfinished">The multirotor hovers at the current position and altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <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 launch position, loiters and then lands. </source>
-      <translation type="unfinished">The vehicle returns to the launch position, loiters and then lands. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <source>All flight control aspects are controlled by an offboard system.</source>
-      <translation type="unfinished">All flight control aspects are controlled by an offboard system.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <source>Flight Mode Config is disabled since you have a Joystick enabled.</source>
-      <translation type="unfinished">Flight Mode Config is disabled since you have a Joystick enabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <source>Use Single Channel Mode Selection</source>
-      <translation type="unfinished">Use Single Channel Mode Selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <source>Generate Thresholds</source>
-      <translation type="unfinished">Generate Thresholds</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModesController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="151"/>
-      <source>%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="167"/>
-      <source>%1 is set to same channel as %2.
-</source>
-      <translation type="unfinished">%1 is set to same channel as %2.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="177"/>
-      <source>%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="144"/>
-      <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="37"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="38"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
-      <source>Rattitude</source>
-      <translation type="unfinished">Rattitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
-      <source>Return to Groundstation</source>
-      <translation type="unfinished">Return to Groundstation</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="187"/>
-      <source>Unknown %1:%2</source>
-      <translation type="unfinished">Unknown %1:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="396"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="416"/>
-      <source>Unable to go to location, vehicle position not known.</source>
-      <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="489"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="498"/>
-      <source>Unable to change altitude, home position unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="502"/>
-      <source>Unable to change altitude, home position altitude unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="533"/>
-      <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="537"/>
-      <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="609"/>
-      <source>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</source>
-      <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwareUpgradeThreadWorker</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="153"/>
-      <source>Programming new version...</source>
-      <translation type="unfinished">Programming new version...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="163"/>
-      <source>Verifying program...</source>
-      <translation type="unfinished">Verifying program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="167"/>
-      <source>Verify complete</source>
-      <translation type="unfinished">Verify complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="174"/>
-      <source>Rebooting board</source>
-      <translation type="unfinished">Rebooting board</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="198"/>
-      <source>Erasing previous program...</source>
-      <translation type="unfinished">Erasing previous program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="202"/>
-      <source>Erase complete</source>
-      <translation type="unfinished">Erase complete</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehavior</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
-      <source>Flight Behavior</source>
-      <translation type="unfinished">Flight Behavior</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
-      <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehaviorCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <source>Responsiveness</source>
-      <translation type="unfinished">Responsiveness</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <source>Horizontal velocity (m/s)</source>
-      <translation type="unfinished">Horizontal velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <source>Vertial velocity (m/s)</source>
-      <translation type="unfinished">Vertial velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <source>Mission Turning Radius</source>
-      <translation type="unfinished">Mission Turning Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlowSensor</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FlowSensor.qml" line="23"/>
-      <source>PX4Flow Camera</source>
-      <translation type="unfinished">PX4Flow Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4ParameterMetaData</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="342"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="16"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="27"/>
-      <source>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</source>
-      <translation type="unfinished">Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <source>Flaps</source>
-      <translation type="unfinished">Flaps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <source>Aux1</source>
-      <translation type="unfinished">Aux1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <source>Aux2</source>
-      <translation type="unfinished">Aux2</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4SimpleFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <source>Mode Channel</source>
-      <translation type="unfinished">Mode Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <source>Flight Mode %1</source>
-      <translation type="unfinished">Flight Mode %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <source>Switch Settings</source>
-      <translation type="unfinished">Switch Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
-      <source>PID Tuning</source>
-      <translation type="unfinished">PID Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
-      <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <source>Rate Controller</source>
-      <translation type="unfinished">Rate Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <source>Attitude Controller</source>
-      <translation type="unfinished">Attitude Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <source>Velocity Controller</source>
-      <translation type="unfinished">Velocity Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <source>Position Controller</source>
-      <translation type="unfinished">Position Controller</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAttitude</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <source>Proportional Gain (MC_YAW_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterPosition</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <source>Proportional gain (MPC_Z_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterRate</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterVelocity</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <source>Increase to reduce steady-state error</source>
-      <translation type="unfinished">Increase to reduce steady-state error</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <source>TECS</source>
-      <translation type="unfinished">TECS</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneTECS</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <source>Altitude &amp; Airspeed</source>
-      <translation type="unfinished">Altitude &amp; Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <source>TODO</source>
-      <translation type="unfinished">TODO</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentVTOL</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <source>Multirotor</source>
-      <translation type="unfinished">Multirotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingManager</name>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
-      <source>Pairing Successfull</source>
-      <translation type="unfinished">Pairing Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
-      <source>Connection Successfull</source>
-      <translation type="unfinished">Connection Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
-      <source>Connection Rejected</source>
-      <translation type="unfinished">Connection Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
-      <source>Pairing Rejected</source>
-      <translation type="unfinished">Pairing Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
-      <source>No Response From Vehicle</source>
-      <translation type="unfinished">No Response From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
-      <source>Connecting to %1</source>
-      <translation type="unfinished">Connecting to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
-      <source>Invalid Pairing File</source>
-      <translation type="unfinished">Invalid Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="257"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="265"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="278"/>
-      <source>Error Parsing Pairing File</source>
-      <translation type="unfinished">Error Parsing Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
-      <source>NFC</source>
-      <translation type="unfinished">NFC</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="495"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="517"/>
-      <source>Pairing...</source>
-      <translation type="unfinished">Pairing...</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingNFC</name>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="30"/>
-      <source>Waiting for NFC connection</source>
-      <translation type="unfinished">Waiting for NFC connection</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
-      <source>Device detected</source>
-      <translation type="unfinished">Device detected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
-      <source>Device removed</source>
-      <translation type="unfinished">Device removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterDiffDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="42"/>
-      <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="43"/>
-      <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="71"/>
-      <source>Comp ID</source>
-      <translation type="unfinished">Comp ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="78"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="84"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="93"/>
-      <source>N/A</source>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditor</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="63"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="85"/>
-      <source>Show modified only</source>
-      <translation type="unfinished">Show modified only</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
-      <source>Tools</source>
-      <translation type="unfinished">Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="105"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="109"/>
-      <source>Reset all to firmware&apos;s defaults</source>
-      <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="110"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="115"/>
-      <source>Reset All</source>
-      <translation type="unfinished">Reset All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="113"/>
-      <source>Reset to vehicle&apos;s configuration defaults</source>
-      <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="119"/>
-      <source>Load from file...</source>
-      <translation type="unfinished">Load from file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="121"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="127"/>
-      <source>Save to file...</source>
-      <translation type="unfinished">Save to file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="129"/>
-      <source>Save Parameters</source>
-      <translation type="unfinished">Save Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="136"/>
-      <source>Clear all RC to Param</source>
-      <translation type="unfinished">Clear all RC to Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="318"/>
-      <source>Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="142"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="143"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="275"/>
-      <source>Parameter Editor</source>
-      <translation type="unfinished">Parameter Editor</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>Parameter Files (*.%1)</source>
-      <translation type="unfinished">Parameter Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="333"/>
-      <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="350"/>
-      <source>Select Ok to reboot vehicle.</source>
-      <translation type="unfinished">Select Ok to reboot vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorController</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="217"/>
-      <source>Unable to create file: %1</source>
-      <translation type="unfinished">Unable to create file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="258"/>
-      <source>Unable to open file: %1</source>
-      <translation type="unfinished">Unable to open file: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="135"/>
-      <source>Reset to default</source>
-      <translation type="unfinished">Reset to default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="209"/>
-      <source>Min: </source>
-      <translation type="unfinished">Min: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="214"/>
-      <source>Max: </source>
-      <translation type="unfinished">Max: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="219"/>
-      <source>Default: </source>
-      <translation type="unfinished">Default: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="225"/>
-      <source>Parameter name: </source>
-      <translation type="unfinished">Parameter name: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
-      <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
-      <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="243"/>
-      <source>Make sure you know what you are doing and double-check your values before Save!</source>
-      <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
-      <source>Force save (dangerous!)</source>
-      <translation type="unfinished">Force save (dangerous!)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="267"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="282"/>
-      <source>Manual Entry</source>
-      <translation type="unfinished">Manual Entry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
-      <source>Set RC to Param</source>
-      <translation type="unfinished">Set RC to Param</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterManager</name>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="678"/>
-      <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="700"/>
-      <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="926"/>
-      <source>Parameter cache CRC match failed</source>
-      <translation type="unfinished">Parameter cache CRC match failed</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="977"/>
-      <source>Parameters not loaded since they are not currently on the vehicle: %1
-</source>
-      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
-</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="981"/>
-      <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1149"/>
-      <source>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</source>
-      <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1175"/>
-      <source>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</source>
-      <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PhotoVideoControl</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
-      <source>Video Grab</source>
-      <translation type="unfinished">Video Grab</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="243"/>
-      <source>Camera Trigger</source>
-      <translation type="unfinished">Camera Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="299"/>
-      <source>Free Space: </source>
-      <translation type="unfinished">Free Space: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="305"/>
-      <source>Battery: </source>
-      <translation type="unfinished">Battery: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="316"/>
-      <source>Settings</source>
-      <translation type="unfinished">Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="331"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
-      <source>Video Stream</source>
-      <translation type="unfinished">Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
-      <source>Thermal View Mode</source>
-      <translation type="unfinished">Thermal View Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
-      <source>Blend Opacity</source>
-      <translation type="unfinished">Blend Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="364"/>
-      <source>Photo Mode</source>
-      <translation type="unfinished">Photo Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
-      <source>Photo Interval (seconds)</source>
-      <translation type="unfinished">Photo Interval (seconds)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
-      <source>Video Screen Fit</source>
-      <translation type="unfinished">Video Screen Fit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
-      <source>Reset Camera Defaults</source>
-      <translation type="unfinished">Reset Camera Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Blend</source>
-      <translation type="unfinished">Blend</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Full</source>
-      <translation type="unfinished">Full</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Picture In Picture</source>
-      <translation type="unfinished">Picture In Picture</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Time Lapse</source>
-      <translation type="unfinished">Time Lapse</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="533"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
-      <source>Reset Camera to Factory Settings</source>
-      <translation type="unfinished">Reset Camera to Factory Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
-      <source>Confirm resetting all settings?</source>
-      <translation type="unfinished">Confirm resetting all settings?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="551"/>
-      <source>Format</source>
-      <translation type="unfinished">Format</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="556"/>
-      <source>Format Camera Storage</source>
-      <translation type="unfinished">Format Camera Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="557"/>
-      <source>Confirm erasing all files?</source>
-      <translation type="unfinished">Confirm erasing all files?</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanManager</name>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="178"/>
-      <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
-      <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="183"/>
-      <source>Mission request list failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="187"/>
-      <source>Retrying %1 REQUEST_LIST retry Count</source>
-      <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="194"/>
-      <source>Mission read failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="198"/>
-      <source>Retrying %1 MISSION_REQUEST retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="206"/>
-      <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
-      <source>Mission write mission count failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="220"/>
-      <source>Vehicle did not request all items from ground station: %1</source>
-      <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="228"/>
-      <source>Mission remove all, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="232"/>
-      <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="239"/>
-      <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="350"/>
-      <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="500"/>
-      <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="615"/>
-      <source>Vehicle remove all failed. Error: %1</source>
-      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="690"/>
-      <source>Item #%1 Command: %2</source>
-      <translation type="unfinished">Item #%1 Command: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="694"/>
-      <source>Frame: %1</source>
-      <translation type="unfinished">Frame: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="700"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="703"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="706"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="709"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="712"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="715"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="718"/>
-      <source>Value: %1</source>
-      <translation type="unfinished">Value: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="737"/>
-      <source>Mission accepted.</source>
-      <translation type="unfinished">Mission accepted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="740"/>
-      <source>Unspecified error.</source>
-      <translation type="unfinished">Unspecified error.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="743"/>
-      <source>Coordinate frame is not supported.</source>
-      <translation type="unfinished">Coordinate frame is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="746"/>
-      <source>Command is not supported.</source>
-      <translation type="unfinished">Command is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="749"/>
-      <source>Mission item exceeds storage space.</source>
-      <translation type="unfinished">Mission item exceeds storage space.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="752"/>
-      <source>One of the parameters has an invalid value.</source>
-      <translation type="unfinished">One of the parameters has an invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="755"/>
-      <source>Param 1 invalid value.</source>
-      <translation type="unfinished">Param 1 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="758"/>
-      <source>Param 2 invalid value.</source>
-      <translation type="unfinished">Param 2 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="761"/>
-      <source>Param 3 invalid value.</source>
-      <translation type="unfinished">Param 3 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="764"/>
-      <source>Param 4 invalid value.</source>
-      <translation type="unfinished">Param 4 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="767"/>
-      <source>Param 5 invalid value.</source>
-      <translation type="unfinished">Param 5 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="770"/>
-      <source>Param 6 invalid value.</source>
-      <translation type="unfinished">Param 6 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="773"/>
-      <source>Param 7 invalid value.</source>
-      <translation type="unfinished">Param 7 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="776"/>
-      <source>Received mission item out of sequence.</source>
-      <translation type="unfinished">Received mission item out of sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="779"/>
-      <source>Not accepting any mission commands.</source>
-      <translation type="unfinished">Not accepting any mission commands.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-      <source>Unknown error: %1.</source>
-      <translation type="unfinished">Unknown error: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="626"/>
-      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanMasterController</name>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="223"/>
-      <source>Download not supported on high latency links.</source>
-      <translation type="unfinished">Download not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="337"/>
-      <source>Upload not supported on high latency links.</source>
-      <translation type="unfinished">Upload not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="357"/>
-      <source>Error loading Plan file (%1). %2</source>
-      <translation type="unfinished">Error loading Plan file (%1). %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="481"/>
-      <source>Plan save error %1 : %2</source>
-      <translation type="unfinished">Plan save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="513"/>
-      <source>KML save error %1 : %2</source>
-      <translation type="unfinished">KML save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="584"/>
-      <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
-      <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="585"/>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>Plan Files (*.%1)</source>
-      <translation type="unfinished">Plan Files (*.%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanToolBarIndicators</name>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="138"/>
-      <source>Selected Waypoint</source>
-      <translation type="unfinished">Selected Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="143"/>
-      <source>Alt diff:</source>
-      <translation type="unfinished">Alt diff:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="152"/>
-      <source>Azimuth:</source>
-      <translation type="unfinished">Azimuth:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="161"/>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="197"/>
-      <source>Distance:</source>
-      <translation type="unfinished">Distance:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="168"/>
-      <source>Gradient:</source>
-      <translation type="unfinished">Gradient:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="177"/>
-      <source>Heading:</source>
-      <translation type="unfinished">Heading:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="192"/>
-      <source>Total Mission</source>
-      <translation type="unfinished">Total Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="206"/>
-      <source>Max telem dist:</source>
-      <translation type="unfinished">Max telem dist:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="213"/>
-      <source>Time:</source>
-      <translation type="unfinished">Time:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="229"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="234"/>
-      <source>Batteries required:</source>
-      <translation type="unfinished">Batteries required:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload Required</source>
-      <translation type="unfinished">Upload Required</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="308"/>
-      <source>Syncing Mission</source>
-      <translation type="unfinished">Syncing Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="316"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanView</name>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="62"/>
-      <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation type="unfinished">Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="129"/>
-      <source>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</source>
-      <translation type="unfinished">You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="209"/>
-      <source>You need at least one item to create a KML.</source>
-      <translation type="unfinished">You need at least one item to create a KML.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Plan is waiting on terrain data from server for correct altitude values.</source>
-      <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="263"/>
-      <source>Plan Upload</source>
-      <translation type="unfinished">Plan Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="269"/>
-      <source>Select Plan File</source>
-      <translation type="unfinished">Select Plan File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="280"/>
-      <source>Save Plan</source>
-      <translation type="unfinished">Save Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="295"/>
-      <source>Save KML</source>
-      <translation type="unfinished">Save KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="401"/>
-      <source>Move the selected mission item to the be after following mission item:</source>
-      <translation type="unfinished">Move the selected mission item to the be after following mission item:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="642"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="685"/>
-      <source>Pattern</source>
-      <translation type="unfinished">Pattern</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="708"/>
-      <source>Center</source>
-      <translation type="unfinished">Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="619"/>
-      <location filename="../src/PlanView/PlanView.qml" line="785"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="121"/>
-      <source>Apply new altitude</source>
-      <translation type="unfinished">Apply new altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Disconnected</source>
-      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Changed</source>
-      <translation type="unfinished">Plan View - Vehicle Changed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="148"/>
-      <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="149"/>
-      <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="156"/>
-      <source>Discard Unsaved Changes</source>
-      <translation type="unfinished">Discard Unsaved Changes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="157"/>
-      <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="158"/>
-      <source>Load New Plan From Vehicle</source>
-      <translation type="unfinished">Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="169"/>
-      <source>Keep Current Plan</source>
-      <translation type="unfinished">Keep Current Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="170"/>
-      <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="187"/>
-      <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Send To Vehicle</source>
-      <translation type="unfinished">Send To Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="637"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="651"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>Cancel ROI</source>
-      <translation type="unfinished">Cancel ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="817"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="820"/>
-      <source>Fence</source>
-      <translation type="unfinished">Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="824"/>
-      <source>Rally</source>
-      <translation type="unfinished">Rally</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="942"/>
-      <source>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="954"/>
-      <source>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1228"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="978"/>
-      <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1004"/>
-      <source>Create complex pattern:</source>
-      <translation type="unfinished">Create complex pattern:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Mission overwrite</source>
-      <translation type="unfinished">Mission overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>GeoFence overwrite</source>
-      <translation type="unfinished">GeoFence overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Rally Points overwrite</source>
-      <translation type="unfinished">Rally Points overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1037"/>
-      <source>You have unsaved changes.</source>
-      <translation type="unfinished">You have unsaved changes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1136"/>
-      <source>Open...</source>
-      <translation type="unfinished">Open...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1150"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Unable to %1</source>
-      <translation type="unfinished">Unable to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <source>Plan has incomplete items. Complete all items and %1 again.</source>
-      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="967"/>
-      <source>Are you sure you want to remove current plan and create a new plan? </source>
-      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1036"/>
-      <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1044"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1096"/>
-      <source>Create Plan</source>
-      <translation type="unfinished">Create Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1115"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1164"/>
-      <source>Save As...</source>
-      <translation type="unfinished">Save As...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1176"/>
-      <source>Save Mission Waypoints As KML...</source>
-      <translation type="unfinished">Save Mission Waypoints As KML...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1181"/>
-      <source>KML</source>
-      <translation type="unfinished">KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1202"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1193"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1213"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-  </context>
-  <context>
-    <name>PolygonEditor</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>Click to add point %1</source>
-      <translation type="unfinished">Click to add point %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>- Right Click to end polygon</source>
-      <translation type="unfinished">- Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="185"/>
-      <source>Click to add point</source>
-      <translation type="unfinished">Click to add point</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="192"/>
-      <source>Click to add point - Right Click to end polygon</source>
-      <translation type="unfinished">Click to add point - Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="198"/>
-      <source>Adjust polygon by dragging corners</source>
-      <translation type="unfinished">Adjust polygon by dragging corners</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <source>Performing calibration. This will take a few seconds..</source>
-      <translation type="unfinished">Performing calibration. This will take a few seconds..</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>ESC Calibration failed</source>
-      <translation type="unfinished">ESC Calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <source>ESC Calibration failed. </source>
-      <translation type="unfinished">ESC Calibration failed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <source>Calibration complete. You can disconnect your battery now if you like.</source>
-      <translation type="unfinished">Calibration complete. You can disconnect your battery now if you like.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source> Connect the battery now and calibration will begin.</source>
-      <translation type="unfinished"> Connect the battery now and calibration will begin.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</source>
-      <translation type="unfinished">You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <source>Battery </source>
-      <translation type="unfinished">Battery </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <source>Voltage divider:</source>
-      <translation type="unfinished">Voltage divider:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <source>Number of Cells (in Series)</source>
-      <translation type="unfinished">Number of Cells (in Series)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <source>Full Voltage (per cell)</source>
-      <translation type="unfinished">Full Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <source>Battery Max:</source>
-      <translation type="unfinished">Battery Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <source>Empty Voltage (per cell)</source>
-      <translation type="unfinished">Empty Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <source>Battery Min:</source>
-      <translation type="unfinished">Battery Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <source>Voltage divider</source>
-      <translation type="unfinished">Voltage divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <source>Calculate Voltage Divider</source>
-      <translation type="unfinished">Calculate Voltage Divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <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. </source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <source>Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <source>Amps per volt</source>
-      <translation type="unfinished">Amps per volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <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. </source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <source>ESC PWM Minimum and Maximum Calibration</source>
-      <translation type="unfinished">ESC PWM Minimum and Maximum Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <source>You must use USB connection for this operation.</source>
-      <translation type="unfinished">You must use USB connection for this operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <source>Show UAVCAN Settings</source>
-      <translation type="unfinished">Show UAVCAN Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <source>UAVCAN Bus Configuration</source>
-      <translation type="unfinished">UAVCAN Bus Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <source>Change required restart</source>
-      <translation type="unfinished">Change required restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <source>UAVCAN Motor Index and Direction Assignment</source>
-      <translation type="unfinished">UAVCAN Motor Index and Direction Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <source>ESC parameters will only be accessible in the editor after assignment.</source>
-      <translation type="unfinished">ESC parameters will only be accessible in the editor after assignment.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <source>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</source>
-      <translation type="unfinished">Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <source>Start Assignment</source>
-      <translation type="unfinished">Start Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <source>Stop Assignment</source>
-      <translation type="unfinished">Stop Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <source>Show Advanced Settings</source>
-      <translation type="unfinished">Show Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <source>Voltage Drop on Full Load (per cell)</source>
-      <translation type="unfinished">Voltage Drop on Full Load (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <source>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </source>
-      <translation type="unfinished">Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <source>throttle, divided by the number of battery cells. Leave at the default if unsure. </source>
-      <translation type="unfinished">throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <source>If this value is set too high, the battery might be deep discharged and damaged.</source>
-      <translation type="unfinished">If this value is set too high, the battery might be deep discharged and damaged.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <source>Compensated Minimum Voltage:</source>
-      <translation type="unfinished">Compensated Minimum Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <source> V</source>
-      <translation type="unfinished"> V</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="19"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="30"/>
-      <source>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</source>
-      <translation type="unfinished">Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <source>Battery Full</source>
-      <translation type="unfinished">Battery Full</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <source>Battery Empty</source>
-      <translation type="unfinished">Battery Empty</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <source>Number of Cells</source>
-      <translation type="unfinished">Number of Cells</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightBatteryCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="18"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="19"/>
-      <source>Battery connector firmly plugged?</source>
-      <translation type="unfinished">Battery connector firmly plugged?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="22"/>
-      <source>Warning - Battery charge below %1%.</source>
-      <translation type="unfinished">Warning - Battery charge below %1%.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="23"/>
-      <source>Battery charge below %1%. Please recharge.</source>
-      <translation type="unfinished">Battery charge below %1%. Please recharge.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckButton</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="54"/>
-      <source>Passed</source>
-      <translation type="unfinished">Passed</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckGroup</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
-      <source> (passed)</source>
-      <translation type="unfinished"> (passed)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckList</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>Pre-Flight Checklist %1</source>
-      <translation type="unfinished">Pre-Flight Checklist %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>(passed)</source>
-      <translation type="unfinished">(passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="93"/>
-      <source>Reset the checklist (e.g. after a vehicle reboot)</source>
-      <translation type="unfinished">Reset the checklist (e.g. after a vehicle reboot)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>(Passed)</source>
-      <translation type="unfinished">(Passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>In Progress</source>
-      <translation type="unfinished">In Progress</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckListShowAction</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
-      <source>Checklist</source>
-      <translation type="unfinished">Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightGPSCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="17"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="20"/>
-      <source>Waiting for 3D lock.</source>
-      <translation type="unfinished">Waiting for 3D lock.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Warning - Sat count below %1.</source>
-      <translation type="unfinished">Warning - Sat count below %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Waiting for sat count above %1.</source>
-      <translation type="unfinished">Waiting for sat count above %1.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightRCCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="17"/>
-      <source>Radio Control</source>
-      <translation type="unfinished">Radio Control</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="18"/>
-      <source>Receiving signal. Perform range test &amp; confirm.</source>
-      <translation type="unfinished">Receiving signal. Perform range test &amp; confirm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="19"/>
-      <source>No signal or invalid autopilot-RC config. Check RC and console.</source>
-      <translation type="unfinished">No signal or invalid autopilot-RC config. Check RC and console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSensorsHealthCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="17"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="35"/>
-      <source>Failure. Magnetometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Magnetometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="36"/>
-      <source>Failure. Accelerometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Accelerometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="37"/>
-      <source>Failure. Gyroscope issues. Check console.</source>
-      <translation type="unfinished">Failure. Gyroscope issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="38"/>
-      <source>Failure. Barometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Barometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="39"/>
-      <source>Failure. Airspeed sensor issues. Check console.</source>
-      <translation type="unfinished">Failure. Airspeed sensor issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="40"/>
-      <source>Failure. AHRS issues. Check console.</source>
-      <translation type="unfinished">Failure. AHRS issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="41"/>
-      <source>Failure. GPS issues. Check console.</source>
-      <translation type="unfinished">Failure. GPS issues. Check console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSoundCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="16"/>
-      <source>Sound output</source>
-      <translation type="unfinished">Sound output</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="17"/>
-      <source>QGC audio output enabled. System audio output enabled, too?</source>
-      <translation type="unfinished">QGC audio output enabled. System audio output enabled, too?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="18"/>
-      <source>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</source>
-      <translation type="unfinished">QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
-    </message>
-  </context>
-  <context>
-    <name>ProximityRadarValues</name>
-    <message>
-      <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCApplication</name>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="198"/>
-      <source>You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="214"/>
-      <source>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="580"/>
-      <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
-      <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="588"/>
-      <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
-      <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="656"/>
-      <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
-      <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="714"/>
-      <source>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</source>
-      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>New Version Available</source>
-      <translation type="unfinished">New Version Available</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="673"/>
-      <source>Unable to save telemetry log. Application save directory is not set.</source>
-      <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="680"/>
-      <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
-      <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCControlDebug</name>
-    <message>
-      <location filename="../src/QmlControls/QGCControlDebug.qml" line="22"/>
-      <source>%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</source>
-      <comment>Do not translate</comment>
-      <translation type="unfinished">%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCCorePlugin</name>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="134"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="138"/>
-      <source>Comm Links</source>
-      <translation type="unfinished">Comm Links</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="142"/>
-      <source>Offline Maps</source>
-      <translation type="unfinished">Offline Maps</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="147"/>
-      <source>Taisync</source>
-      <translation type="unfinished">Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="153"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="159"/>
-      <source>AirMap</source>
-      <translation type="unfinished">AirMap</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="164"/>
-      <source>MAVLink</source>
-      <translation type="unfinished">MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="168"/>
-      <source>Console</source>
-      <translation type="unfinished">Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="171"/>
-      <source>Help</source>
-      <translation type="unfinished">Help</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="176"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="179"/>
-      <source>Debug</source>
-      <translation type="unfinished">Debug</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="182"/>
-      <source>Palette Test</source>
-      <translation type="unfinished">Palette Test</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="201"/>
-      <source>Vibration</source>
-      <translation type="unfinished">Vibration</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
-      <source>Log Download</source>
-      <translation type="unfinished">Log Download</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
-      <source>GeoTag Images</source>
-      <translation type="unfinished">GeoTag Images</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="197"/>
-      <source>MAVLink Console</source>
-      <translation type="unfinished">MAVLink Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="199"/>
-      <source>MAVLink Inspector</source>
-      <translation type="unfinished">MAVLink Inspector</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="286"/>
-      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
-      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFenceCircle</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
-      <source>GeoFence Circle only supports version %1</source>
-      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFencePolygon</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
-      <source>GeoFence Polygon only supports version %1</source>
-      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="123"/>
-      <source>Path: %1</source>
-      <translation type="unfinished">Path: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="154"/>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="267"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="165"/>
-      <source>No files</source>
-      <translation type="unfinished">No files</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="206"/>
-      <source>New file name:</source>
-      <translation type="unfinished">New file name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="219"/>
-      <source>File names must end with .%1 file extension. If missing it will be added.</source>
-      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="227"/>
-      <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="235"/>
-      <source>Save to existing file:</source>
-      <translation type="unfinished">Save to existing file:</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDownload</name>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="102"/>
-      <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="112"/>
-      <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="135"/>
-      <source>Download cancelled</source>
-      <translation type="unfinished">Download cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="138"/>
-      <source>Error: File Not Found</source>
-      <translation type="unfinished">Error: File Not Found</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="141"/>
-      <source>Error during download. Error: %1</source>
-      <translation type="unfinished">Error during download. Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCLogEntry</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-      <source>Pending</source>
-      <translation type="unfinished">Pending</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMAVLinkSystem</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="587"/>
-      <source>Comp All</source>
-      <translation type="unfinished">Comp All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="592"/>
-      <source>Comp %1</source>
-      <translation type="unfinished">Comp %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolygonVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
-      <source>Polygon Tools</source>
-      <translation type="unfinished">Polygon Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="51"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
-      <source>Set radius...</source>
-      <translation type="unfinished">Set radius...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
-      <source>Edit Center Position</source>
-      <translation type="unfinished">Edit Center Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
-      <source>Edit Vertex Position</source>
-      <translation type="unfinished">Edit Vertex Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
-      <source>Circular</source>
-      <translation type="unfinished">Circular</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolylineVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
-      <source>Polyline Tools</source>
-      <translation type="unfinished">Polyline Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="41"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
-      <source>Select KML File</source>
-      <translation type="unfinished">Select KML File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="335"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="359"/>
-      <source>Load KML...</source>
-      <translation type="unfinished">Load KML...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCOptionsComboBox</name>
-    <message>
-      <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPluginHost</name>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
-      <source>Loaded Plugins</source>
-      <translation type="unfinished">Loaded Plugins</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
-      <source>Plugin Log</source>
-      <translation type="unfinished">Plugin Log</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPopupDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCTextField</name>
-    <message>
-      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-      <source>?</source>
-      <translation type="unfinished">?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCViewDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="34"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="37"/>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="46"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="40"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="43"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="49"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="52"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="55"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="58"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="61"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="64"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="67"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="73"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="76"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="79"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="82"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="85"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGroundControlQmlGlobal</name>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="254"/>
-      <source>32 bit</source>
-      <translation type="unfinished">32 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="256"/>
-      <source>64 bit</source>
-      <translation type="unfinished">64 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="270"/>
-      <source>(AMSL)</source>
-      <translation type="unfinished">(AMSL)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="272"/>
-      <source>(CalcT)</source>
-      <translation type="unfinished">(CalcT)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="292"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="294"/>
-      <source>Calc Above Terrain</source>
-      <translation type="unfinished">Calc Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="298"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="274"/>
-      <source>(TerrF)</source>
-      <translation type="unfinished">(TerrF)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="290"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="296"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-  </context>
-  <context>
-    <name>QMap3D</name>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="20"/>
-      <source>Map</source>
-      <translation type="unfinished">Map</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="30"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>QObject</name>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
-      <source>OpenPilot</source>
-      <translation type="unfinished">OpenPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="68"/>
-      <source>Guided mode not supported by Vehicle.</source>
-      <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="32"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="46"/>
-      <source>The following required keys are missing: %1</source>
-      <translation type="unfinished">The following required keys are missing: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="60"/>
-      <source>value for coordinate is not array</source>
-      <translation type="unfinished">value for coordinate is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="67"/>
-      <source>Coordinate array must contain %1 values</source>
-      <translation type="unfinished">Coordinate array must contain %1 values</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="73"/>
-      <source>Coordinate array may only contain double values, found: %1</source>
-      <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="151"/>
-      <source>Incorrect value type - key:type:expected %1:%2:%3</source>
-      <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="209"/>
-      <source>Incorrect file type key expected:%1 actual:%2</source>
-      <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="216"/>
-      <source>File version %1 is no longer supported</source>
-      <translation type="unfinished">File version %1 is no longer supported</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="220"/>
-      <source>File version %1 is newer than current supported version %2</source>
-      <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="379"/>
-      <source>value for coordinate array is not array</source>
-      <translation type="unfinished">value for coordinate array is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="488"/>
-      <source>Unknown type: %1</source>
-      <translation type="unfinished">Unknown type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="252"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="253"/>
-      <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
-      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QmlTest</name>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
-      <source>Window Color</source>
-      <translation type="unfinished">Window Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
-      <source>Import/Export</source>
-      <translation type="unfinished">Import/Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
-      <source>Light</source>
-      <translation type="unfinished">Light</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
-      <source>Dark</source>
-      <translation type="unfinished">Dark</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
-      <source>QGC name</source>
-      <translation type="unfinished">QGC name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</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>
-      <translation type="unfinished">Button</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
-      <source>Hover Button</source>
-      <translation type="unfinished">Hover Button</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>
-      <translation type="unfinished">Item 1</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>
-      <translation type="unfinished">Item 2</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>
-      <translation type="unfinished">Item 3</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
-      <source>Check Box</source>
-      <translation type="unfinished">Check Box</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
-      <source>SUB MENU</source>
-      <translation type="unfinished">SUB MENU</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Status</source>
-      <translation type="unfinished">RC RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Data Unavailable</source>
-      <translation type="unfinished">RC RSSI Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>N/A</source>
-      <comment>No data available</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
-      <source>RSSI:</source>
-      <translation type="unfinished">RSSI:</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCToParamDialog</name>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
-      <source>RC To Param</source>
-      <translation type="unfinished">RC To Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="44"/>
-      <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
-      <source>Waiting on parameter update from Vehicle.</source>
-      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
-      <source>Parameter</source>
-      <translation type="unfinished">Parameter</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
-      <source>Tuning ID</source>
-      <translation type="unfinished">Tuning ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
-      <source>Scale</source>
-      <translation type="unfinished">Scale</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
-      <source>Center Value</source>
-      <translation type="unfinished">Center Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
-      <source>Min Value</source>
-      <translation type="unfinished">Min Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
-      <source>Max Value</source>
-      <translation type="unfinished">Max Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
-      <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ROIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="53"/>
-      <source>ROI Disabled</source>
-      <translation type="unfinished">ROI Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="62"/>
-      <source>Disable ROI</source>
-      <translation type="unfinished">Disable ROI</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-      <source>Reboot required</source>
-      <translation type="unfinished">Reboot required</translation>
-    </message>
-    <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>
-      <translation type="unfinished">Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-      <source>Throttle channel reversed</source>
-      <translation type="unfinished">Throttle channel reversed</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>
-      <translation type="unfinished">Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</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>
-      <translation type="unfinished">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.</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>
-      <translation type="unfinished">Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
-
-%1</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>
-      <translation type="unfinished">Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>Please turn on transmitter.</source>
-      <translation type="unfinished">Please turn on transmitter.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>%1 channels or more are needed to fly.</source>
-      <translation type="unfinished">%1 channels or more are needed to fly.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="110"/>
-      <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
-      <translation type="unfinished">Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
-      <source>DSM2 Mode</source>
-      <translation type="unfinished">DSM2 Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
-      <source>DSMX (7 channels or less)</source>
-      <translation type="unfinished">DSMX (7 channels or less)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
-      <source>DSMX (8 channels or more)</source>
-      <translation type="unfinished">DSMX (8 channels or more)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
-      <source>Attitude Controls</source>
-      <translation type="unfinished">Attitude Controls</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="246"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="275"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="304"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="332"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="338"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="348"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="371"/>
-      <source>Additional Radio setup:</source>
-      <translation type="unfinished">Additional Radio setup:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="408"/>
-      <source>Spektrum Bind</source>
-      <translation type="unfinished">Spektrum Bind</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="413"/>
-      <source>Copy Trims</source>
-      <translation type="unfinished">Copy Trims</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="437"/>
-      <source>Mode 1</source>
-      <translation type="unfinished">Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="443"/>
-      <source>Mode 2</source>
-      <translation type="unfinished">Mode 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="118"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
-      <source>Move the Throttle stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="125"/>
-      <source>Move the Throttle stick all the way down and leave it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="126"/>
-      <source>Move the Yaw stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
-      <source>Move the Yaw stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
-      <source>Move the Roll stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
-      <source>Move the Roll stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
-      <source>Move the Pitch stick all the way down and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
-      <source>Move the Pitch stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
-      <source>Allow the Pitch stick to move back to center...</source>
-      <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
-      <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-      <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
-      <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-      <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="201"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="804"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="826"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="850"/>
-      <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">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.</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointController</name>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
-      <source>Rally: %1</source>
-      <translation type="unfinished">Rally: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
-      <source>Rally Points supports version %1</source>
-      <translation type="unfinished">Rally Points supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointEditorHeader</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
-      <source>Rally Points</source>
-      <translation type="unfinished">Rally Points</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">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-  </context>
-  <context>
-    <name>RoverChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
-      <source>Rover Initial Checks</source>
-      <translation type="unfinished">Rover Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
-      <source>Battery mounted and secured?</source>
-      <translation type="unfinished">Battery mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
-      <source>Mission area</source>
-      <translation type="unfinished">Mission area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
-      <source>Mission area and path free of obstacles/people?</source>
-      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SHPFileHelper</name>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="18"/>
-      <source>SHP file load failed. %1</source>
-      <translation type="unfinished">SHP file load failed. %1</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">UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="54"/>
-      <source>Only WGS84 or UTM projections are supported.</source>
-      <translation type="unfinished">Only WGS84 or UTM projections are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="57"/>
-      <source>PRJ file open failed: %1</source>
-      <translation type="unfinished">PRJ file open failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="60"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="63"/>
-      <source>File is not a .shp file: %1</source>
-      <translation type="unfinished">File is not a .shp file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="79"/>
-      <source>SHPOpen failed.</source>
-      <translation type="unfinished">SHPOpen failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="101"/>
-      <source>More than one entity found.</source>
-      <translation type="unfinished">More than one entity found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="105"/>
-      <source>No supported types found.</source>
-      <translation type="unfinished">No supported types found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="133"/>
-      <source>File does not contain a polygon.</source>
-      <translation type="unfinished">File does not contain a polygon.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="139"/>
-      <source>Only single part polygons are supported.</source>
-      <translation type="unfinished">Only single part polygons are supported.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <source>Low Battery Failsafe Trigger</source>
-      <translation type="unfinished">Low Battery Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <source>Battery Warn Level:</source>
-      <translation type="unfinished">Battery Warn Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <source>Battery Failsafe Level:</source>
-      <translation type="unfinished">Battery Failsafe Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <source>Battery Emergency Level:</source>
-      <translation type="unfinished">Battery Emergency Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <source>Object Detection</source>
-      <translation type="unfinished">Object Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <source>Collision Prevention:</source>
-      <translation type="unfinished">Collision Prevention:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <source>Obstacle Avoidance:</source>
-      <translation type="unfinished">Obstacle Avoidance:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <source>Minimum Distance: (</source>
-      <translation type="unfinished">Minimum Distance: (</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <source>Show obstacle distance overlay</source>
-      <translation type="unfinished">Show obstacle distance overlay</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <source>RC Loss Failsafe Trigger</source>
-      <translation type="unfinished">RC Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <source>RC Loss Timeout:</source>
-      <translation type="unfinished">RC Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <source>Data Link Loss Failsafe Trigger</source>
-      <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <source>Data Link Loss Timeout:</source>
-      <translation type="unfinished">Data Link Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <source>Geofence Failsafe Trigger</source>
-      <translation type="unfinished">Geofence Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <source>Action on breach:</source>
-      <translation type="unfinished">Action on breach:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <source>Max Radius:</source>
-      <translation type="unfinished">Max Radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <source>Max Altitude:</source>
-      <translation type="unfinished">Max Altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <source>Return To Launch Settings</source>
-      <translation type="unfinished">Return To Launch Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <source>Return to launch, then:</source>
-      <translation type="unfinished">Return to launch, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <source>Telemetry logging to vehicle storage:</source>
-      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <source>Climb to altitude of:</source>
-      <translation type="unfinished">Climb to altitude of:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <source>Loiter Altitude</source>
-      <translation type="unfinished">Loiter Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <source>Land Mode Settings</source>
-      <translation type="unfinished">Land Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <source>Landing Descent Rate:</source>
-      <translation type="unfinished">Landing Descent Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <source>Disarm After:</source>
-      <translation type="unfinished">Disarm After:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <source>Vehicle Telemetry Logging</source>
-      <translation type="unfinished">Vehicle Telemetry Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <source>Hardware in the Loop Simulation</source>
-      <translation type="unfinished">Hardware in the Loop Simulation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <source>HITL Enabled:</source>
-      <translation type="unfinished">HITL Enabled:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="19"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <source>Low Battery Failsafe</source>
-      <translation type="unfinished">Low Battery Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <source>RC Loss Failsafe</source>
-      <translation type="unfinished">RC Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <source>RC Loss Timeout</source>
-      <translation type="unfinished">RC Loss Timeout</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <source>Data Link Loss Failsafe</source>
-      <translation type="unfinished">Data Link Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <source>RTL Climb To</source>
-      <translation type="unfinished">RTL Climb To</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <source>RTL, Then</source>
-      <translation type="unfinished">RTL, Then</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <source>Loiter Alt</source>
-      <translation type="unfinished">Loiter Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <source>Land Delay</source>
-      <translation type="unfinished">Land Delay</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="27"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="39"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="173"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="190"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="276"/>
-      <source>Unsupported calibration firmware version, using log</source>
-      <translation type="unfinished">Unsupported calibration firmware version, using log</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="308"/>
-      <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
-      <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation type="unfinished">Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="395"/>
-      <source>Hold still in the current orientation</source>
-      <translation type="unfinished">Hold still in the current orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="433"/>
-      <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation type="unfinished">Place you vehicle into one of the orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="442"/>
-      <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="502"/>
-      <source>Reset successful</source>
-      <translation type="unfinished">Reset successful</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="509"/>
-      <source>Reset failed</source>
-      <translation type="unfinished">Reset failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <source>Compass 0</source>
-      <translation type="unfinished">Compass 0</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <source>Compass 1</source>
-      <translation type="unfinished">Compass 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <source>Compass 2</source>
-      <translation type="unfinished">Compass 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummaryFixedWing</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <source>Compass:</source>
-      <translation type="unfinished">Compass:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <source>Gyro:</source>
-      <translation type="unfinished">Gyro:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <source>Accelerometer:</source>
-      <translation type="unfinished">Accelerometer:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <source>Airspeed:</source>
-      <translation type="unfinished">Airspeed:</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsSetup</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <source>If the orientation is in the direction of flight, select ROTATION_NONE.</source>
-      <translation type="unfinished">If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <source>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <source>Compass Calibration Complete</source>
-      <translation type="unfinished">Compass Calibration Complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Sensor Calibration</source>
-      <translation type="unfinished">Sensor Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</source>
-      <translation type="unfinished">Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <source>Set autopilot orientation before calibrating.</source>
-      <translation type="unfinished">Set autopilot orientation before calibrating.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <source>Autopilot Orientation</source>
-      <translation type="unfinished">Autopilot Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <source>Click Ok to start calibration.</source>
-      <translation type="unfinished">Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <source>Reboot the vehicle prior to flight.</source>
-      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <source>Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <source>Mag %1 Orientation</source>
-      <translation type="unfinished">Mag %1 Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <source>Gyroscope</source>
-      <translation type="unfinished">Gyroscope</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <source>Airspeed</source>
-      <translation type="unfinished">Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <source>Calibrate Airspeed</source>
-      <translation type="unfinished">Calibrate Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <source>Orientations</source>
-      <translation type="unfinished">Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <source>Set Orientations</source>
-      <translation type="unfinished">Set Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <source>Factory reset</source>
-      <translation type="unfinished">Factory reset</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialConfiguration</name>
-    <message>
-      <location filename="../src/comm/SerialLink.h" line="83"/>
-      <source>Serial Link Settings</source>
-      <translation type="unfinished">Serial Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialLink</name>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="75"/>
-      <source>Could not send data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not send data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="121"/>
-      <source>Error connecting: Could not create port. %1</source>
-      <translation type="unfinished">Error connecting: Could not create port. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="244"/>
-      <source>Could not read data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not read data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="282"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="92"/>
-      <source>Baud rate name not in combo box</source>
-      <translation type="unfinished">Baud rate name not in combo box</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="114"/>
-      <source>Enable Flow Control</source>
-      <translation type="unfinished">Enable Flow Control</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="31"/>
-      <source>Serial Port</source>
-      <translation type="unfinished">Serial Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="65"/>
-      <source>None Available</source>
-      <translation type="unfinished">None Available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="73"/>
-      <source>Baud Rate</source>
-      <translation type="unfinished">Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="102"/>
-      <source>Advanced Settings</source>
-      <translation type="unfinished">Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="119"/>
-      <source>Parity</source>
-      <translation type="unfinished">Parity</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Even</source>
-      <translation type="unfinished">Even</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Odd</source>
-      <translation type="unfinished">Odd</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="157"/>
-      <source>Data Bits</source>
-      <translation type="unfinished">Data Bits</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="165"/>
-      <source>Stop Bits</source>
-      <translation type="unfinished">Stop Bits</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupPage</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>flying</source>
-      <translation type="unfinished">flying</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="44"/>
-      <source>%1 Setup</source>
-      <translation type="unfinished">%1 Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="66"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="77"/>
-      <source> (Disabled while the vehicle is %1)</source>
-      <translation type="unfinished"> (Disabled while the vehicle is %1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupView</name>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="35"/>
-      <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation type="unfinished">This operation cannot be performed while the vehicle is armed.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="38"/>
-      <source>missing message panel text</source>
-      <translation type="unfinished">missing message panel text</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="80"/>
-      <source>%1 setup must be completed prior to %2 setup.</source>
-      <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="132"/>
-      <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="150"/>
-      <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="171"/>
-      <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="172"/>
-      <source>As a result, the full set of vehicle setup options are not available.</source>
-      <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="231"/>
-      <source>Summary</source>
-      <translation type="unfinished">Summary</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="243"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="254"/>
-      <source>PX4Flow</source>
-      <translation type="unfinished">PX4Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="266"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="293"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>ShapeFileHelper</name>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="17"/>
-      <source>Shape file load failed. %1</source>
-      <translation type="unfinished">Shape file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="40"/>
-      <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
-      <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="93"/>
-      <source>Polyline not support from SHP files.</source>
-      <translation type="unfinished">Polyline not support from SHP files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="102"/>
-      <source>KML Files (*.%1)</source>
-      <translation type="unfinished">KML Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="107"/>
-      <source>KML/SHP Files (*.%1 *.%2)</source>
-      <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="76"/>
-      <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="157"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="38"/>
-      <source>Internal Error</source>
-      <translation type="unfinished">Internal Error</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="65"/>
-      <source>Provides advanced access to all commands/parameters. Be very careful!</source>
-      <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="77"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>desired</source>
-      <translation type="unfinished">desired</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>climbout</source>
-      <translation type="unfinished">climbout</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
-      <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
-      <source>Ensure clear of obstacles and into the wind.</source>
-      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="105"/>
-      <source>Click in map to set planned Takeoff location.</source>
-      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="106"/>
-      <source>Click in map to set planned Launch location.</source>
-      <translation type="unfinished">Click in map to set planned Launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="129"/>
-      <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="183"/>
-      <source>Actual AMSL alt sent: %1 %2</source>
-      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="243"/>
-      <source>Flight Speed</source>
-      <translation type="unfinished">Flight Speed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="406"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="410"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="412"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="414"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="416"/>
-      <source>VTOL Land</source>
-      <translation type="unfinished">VTOL Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="419"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-  </context>
-  <context>
-    <name>StructureScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="235"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="241"/>
-      <source>%1 version %2 not supported</source>
-      <translation type="unfinished">%1 version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="26"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</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">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
-      <source>Grid</source>
-      <translation type="unfinished">Grid</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
-      <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
-      <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="121"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
-      <source>Scan Distance</source>
-      <translation type="unfinished">Scan Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="131"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="222"/>
-      <source>Layer Height</source>
-      <translation type="unfinished">Layer Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="132"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="237"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="139"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Bottom</source>
-      <translation type="unfinished">Start Scan From Bottom</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Top</source>
-      <translation type="unfinished">Start Scan From Top</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="164"/>
-      <source>Structure Height</source>
-      <translation type="unfinished">Structure Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="171"/>
-      <source>Scan Bottom Alt</source>
-      <translation type="unfinished">Scan Bottom Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="178"/>
-      <source>Entrance/Exit Alt</source>
-      <translation type="unfinished">Entrance/Exit Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="186"/>
-      <source>Gimbal Pitch</source>
-      <translation type="unfinished">Gimbal Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="202"/>
-      <source>Rotate entry point</source>
-      <translation type="unfinished">Rotate entry point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="211"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="219"/>
-      <source>Layers</source>
-      <translation type="unfinished">Layers</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="225"/>
-      <source>Top Layer Alt</source>
-      <translation type="unfinished">Top Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="228"/>
-      <source>Bottom Layer Alt</source>
-      <translation type="unfinished">Bottom Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="231"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="234"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="235"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-  </context>
-  <context>
-    <name>SubChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
-      <source>Submarine Initial checks</source>
-      <translation type="unfinished">Submarine Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
-      <source>All seals in place?</source>
-      <translation type="unfinished">All seals in place?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="169"/>
-      <source>Survey items do not support version %1</source>
-      <translation type="unfinished">Survey items do not support version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="226"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="282"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="330"/>
-      <source>%1 but %2 object is missing</source>
-      <translation type="unfinished">%1 but %2 object is missing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="58"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="59"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="60"/>
-      <source>S</source>
-      <translation type="unfinished">S</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="18"/>
-      <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="19"/>
-      <source>Transects</source>
-      <translation type="unfinished">Transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="39"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="61"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="77"/>
-      <source>Hover and capture image</source>
-      <translation type="unfinished">Hover and capture image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="83"/>
-      <source>Refly at 90 deg offset</source>
-      <translation type="unfinished">Refly at 90 deg offset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="89"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="95"/>
-      <source>Fly alternate transects</source>
-      <translation type="unfinished">Fly alternate transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="107"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>SysStatusSensorInfo</name>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="103"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="111"/>
-      <source>Normal</source>
-      <translation type="unfinished">Normal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="119"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>SyslinkComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="43"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="61"/>
-      <source>Channel</source>
-      <translation type="unfinished">Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="86"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="112"/>
-      <source>Data Rate</source>
-      <translation type="unfinished">Data Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="16"/>
-      <source>Syslink</source>
-      <translation type="unfinished">Syslink</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="28"/>
-      <source>The Syslink Component is used to setup the radio connection on Crazyflies.</source>
-      <translation type="unfinished">The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPConfiguration</name>
-    <message>
-      <location filename="../src/comm/TCPLink.h" line="58"/>
-      <source>TCP Link Settings</source>
-      <translation type="unfinished">TCP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPLink</name>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <source>Error on link %1. Connection failed</source>
-      <translation type="unfinished">Error on link %1. Connection failed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Error on link %1. Error on socket: %2.</source>
-      <translation type="unfinished">Error on link %1. Error on socket: %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncManager</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="127"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="128"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="150"/>
-      <source>Stream</source>
-      <translation type="unfinished">Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="151"/>
-      <source>HDMI Port</source>
-      <translation type="unfinished">HDMI Port</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="172"/>
-      <source>Low</source>
-      <translation type="unfinished">Low</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="173"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="174"/>
-      <source>High</source>
-      <translation type="unfinished">High</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncSettings</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="56"/>
-      <source>Reboot ground unit for changes to take effect.</source>
-      <translation type="unfinished">Reboot ground unit for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="71"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="88"/>
-      <source>Enable Taisync</source>
-      <translation type="unfinished">Enable Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="94"/>
-      <source>Enable Taisync Video</source>
-      <translation type="unfinished">Enable Taisync Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="112"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="134"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="143"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="150"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="156"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="174"/>
-      <source>Device Info</source>
-      <translation type="unfinished">Device Info</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="196"/>
-      <source>Serial Number:</source>
-      <translation type="unfinished">Serial Number:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="200"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="204"/>
-      <source>Firmware Version:</source>
-      <translation type="unfinished">Firmware Version:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="222"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="244"/>
-      <source>Radio Mode:</source>
-      <translation type="unfinished">Radio Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="254"/>
-      <source>Radio Frequency:</source>
-      <translation type="unfinished">Radio Frequency:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="275"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="297"/>
-      <source>Video Output:</source>
-      <translation type="unfinished">Video Output:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="307"/>
-      <source>Encoder:</source>
-      <translation type="unfinished">Encoder:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="316"/>
-      <source>Bit Rate:</source>
-      <translation type="unfinished">Bit Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="337"/>
-      <source>Streaming Settings</source>
-      <translation type="unfinished">Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="359"/>
-      <source>RTSP URI:</source>
-      <translation type="unfinished">RTSP URI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="370"/>
-      <source>Account:</source>
-      <translation type="unfinished">Account:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="379"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="406"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="512"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="415"/>
-      <source>Set Streaming Settings</source>
-      <translation type="unfinished">Set Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="416"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="438"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="460"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="471"/>
-      <source>Ground Unit IP Address:</source>
-      <translation type="unfinished">Ground Unit IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="481"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="521"/>
-      <source>Set Network Settings</source>
-      <translation type="unfinished">Set Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="522"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</translation>
-    </message>
-  </context>
-  <context>
-    <name>TakeoffItemMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>TcpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="29"/>
-      <source>Server Address</source>
-      <translation type="unfinished">Server Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="36"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-  </context>
-  <context>
-    <name>TelemetryRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
-      <source>Telemetry RSSI Status</source>
-      <translation type="unfinished">Telemetry RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
-      <source>Local RSSI:</source>
-      <translation type="unfinished">Local RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
-      <source>Remote RSSI:</source>
-      <translation type="unfinished">Remote RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
-      <source>RX Errors:</source>
-      <translation type="unfinished">RX Errors:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
-      <source>Errors Fixed:</source>
-      <translation type="unfinished">Errors Fixed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
-      <source>TX Buffer:</source>
-      <translation type="unfinished">TX Buffer:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
-      <source>Local Noise:</source>
-      <translation type="unfinished">Local Noise:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
-      <source>Remote Noise:</source>
-      <translation type="unfinished">Remote Noise:</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainProgress</name>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
-      <source>Terrain Load Progress</source>
-      <translation type="unfinished">Terrain Load Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainStatus</name>
-    <message>
-      <location filename="../src/PlanView/TerrainStatus.qml" line="45"/>
-      <source>Height AMSL (%1)</source>
-      <translation type="unfinished">Height AMSL (%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="233"/>
-      <source>TransectStyleComplexItem version %2 not supported</source>
-      <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="101"/>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="102"/>
-      <source>Transect</source>
-      <translation type="unfinished">Transect</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="36"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="92"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="102"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="103"/>
-      <source>Trigger Dist</source>
-      <translation type="unfinished">Trigger Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="104"/>
-      <source>Spacing</source>
-      <translation type="unfinished">Spacing</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="123"/>
-      <source>Rotate Entry Point</source>
-      <translation type="unfinished">Rotate Entry Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="131"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="234"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="163"/>
-      <source>Presets</source>
-      <translation type="unfinished">Presets</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="178"/>
-      <source>Apply Preset</source>
-      <translation type="unfinished">Apply Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="185"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="193"/>
-      <source>Delete Preset</source>
-      <translation type="unfinished">Delete Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="196"/>
-      <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="212"/>
-      <source>Save Settings As New Preset</source>
-      <translation type="unfinished">Save Settings As New Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="249"/>
-      <source>Save Preset</source>
-      <translation type="unfinished">Save Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="265"/>
-      <source>Save the current settings as a named preset.</source>
-      <translation type="unfinished">Save the current settings as a named preset.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="270"/>
-      <source>Preset Name</source>
-      <translation type="unfinished">Preset Name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="276"/>
-      <source>Enter preset name</source>
-      <translation type="unfinished">Enter preset name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="283"/>
-      <source>Preset name cannot be blank.</source>
-      <translation type="unfinished">Preset name cannot be blank.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="286"/>
-      <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemStats</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
-      <source>Survey Area</source>
-      <translation type="unfinished">Survey Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemTerrainFollow</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
-      <source>Tolerance</source>
-      <translation type="unfinished">Tolerance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
-      <source>Max Climb Rate</source>
-      <translation type="unfinished">Max Climb Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
-      <source>Max Descent Rate</source>
-      <translation type="unfinished">Max Descent Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>UAS</name>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="318"/>
-      <source>UNINIT</source>
-      <translation type="unfinished">UNINIT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="319"/>
-      <source>Unitialized, booting up.</source>
-      <translation type="unfinished">Unitialized, booting up.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="322"/>
-      <source>BOOT</source>
-      <translation type="unfinished">BOOT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="323"/>
-      <source>Booting system, please wait.</source>
-      <translation type="unfinished">Booting system, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="326"/>
-      <source>CALIBRATING</source>
-      <translation type="unfinished">CALIBRATING</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="327"/>
-      <source>Calibrating sensors, please wait.</source>
-      <translation type="unfinished">Calibrating sensors, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="330"/>
-      <source>ACTIVE</source>
-      <translation type="unfinished">ACTIVE</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="331"/>
-      <source>Active, normal operation.</source>
-      <translation type="unfinished">Active, normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="334"/>
-      <source>STANDBY</source>
-      <translation type="unfinished">STANDBY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="335"/>
-      <source>Standby mode, ready for launch.</source>
-      <translation type="unfinished">Standby mode, ready for launch.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="338"/>
-      <source>CRITICAL</source>
-      <translation type="unfinished">CRITICAL</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="339"/>
-      <source>FAILURE: Continuing operation.</source>
-      <translation type="unfinished">FAILURE: Continuing operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="342"/>
-      <source>EMERGENCY</source>
-      <translation type="unfinished">EMERGENCY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="343"/>
-      <source>EMERGENCY: Land Immediately!</source>
-      <translation type="unfinished">EMERGENCY: Land Immediately!</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="351"/>
-      <source>SHUTDOWN</source>
-      <translation type="unfinished">SHUTDOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="352"/>
-      <source>Powering off system.</source>
-      <translation type="unfinished">Powering off system.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="356"/>
-      <source>UNKNOWN</source>
-      <translation type="unfinished">UNKNOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="357"/>
-      <source>Unknown system state</source>
-      <translation type="unfinished">Unknown system state</translation>
-    </message>
-  </context>
-  <context>
-    <name>UASMessageHandler</name>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
-      <source> EMERGENCY:</source>
-      <translation type="unfinished"> EMERGENCY:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
-      <source> ALERT:</source>
-      <translation type="unfinished"> ALERT:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
-      <source> Critical:</source>
-      <translation type="unfinished"> Critical:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
-      <source> Error:</source>
-      <translation type="unfinished"> Error:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
-      <source> Warning:</source>
-      <translation type="unfinished"> Warning:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
-      <source> Notice:</source>
-      <translation type="unfinished"> Notice:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
-      <source> Info:</source>
-      <translation type="unfinished"> Info:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
-      <source> Debug:</source>
-      <translation type="unfinished"> Debug:</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPConfiguration</name>
-    <message>
-      <location filename="../src/comm/UDPLink.h" line="79"/>
-      <source>UDP Link Settings</source>
-      <translation type="unfinished">UDP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPLink</name>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>UDP Link Error</source>
-      <translation type="unfinished">UDP Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <source>Error binding UDP port: %1</source>
-      <translation type="unfinished">Error binding UDP port: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>Error registering Zeroconf</source>
-      <translation type="unfinished">Error registering Zeroconf</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>
-      <translation type="unfinished">Could not detect ULog file header magic</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
-      <source>Could not detect camera_capture packets in ULog</source>
-      <translation type="unfinished">Could not detect camera_capture packets in ULog</translation>
-    </message>
-  </context>
-  <context>
-    <name>UdpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="31"/>
-      <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="37"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="48"/>
-      <source>Server Addresses (optional)</source>
-      <translation type="unfinished">Server Addresses (optional)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="62"/>
-      <source>Remove</source>
-      <translation type="unfinished">Remove</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="74"/>
-      <source>Example: 127.0.0.1:14550</source>
-      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="77"/>
-      <source>Add Server</source>
-      <translation type="unfinished">Add Server</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
-      <source>Measurement Units</source>
-      <translation type="unfinished">Measurement Units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="64"/>
-      <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
-      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
-      <source>System of units</source>
-      <translation type="unfinished">System of units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Metric System</source>
-      <translation type="unfinished">Metric System</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Imperial System</source>
-      <translation type="unfinished">Imperial System</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsSettings</name>
-    <message>
-      <location filename="../src/Settings/UnitsSettings.cc" line="196"/>
-      <source>Weight units</source>
-      <translation type="unfinished">Weight units</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
-      <source>VTOL Initial Checks</source>
-      <translation type="unfinished">VTOL Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="23"/>
-      <source>VTOL Landing</source>
-      <translation type="unfinished">VTOL Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="82"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="150"/>
-      <source>Landing Dist</source>
-      <translation type="unfinished">Landing Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="180"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="218"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="227"/>
-      <source>* Avoid tailwind on approach to land.</source>
-      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="236"/>
-      <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="262"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="269"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="301"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="305"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="259"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLModeIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: FW</source>
-      <translation type="unfinished">VTOL: FW</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: MR</source>
-      <translation type="unfinished">VTOL: MR</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle</name>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="558"/>
-      <source>MAVLink Generic</source>
-      <translation type="unfinished">MAVLink Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="565"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="567"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="569"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="571"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="573"/>
-      <source>Rover</source>
-      <translation type="unfinished">Rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="575"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="577"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="866"/>
-      <source> ... </source>
-      <comment>Indicates missing chunk from chunked STATUS_TEXT</comment>
-      <translation type="unfinished"> ... </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2168"/>
-      <source>Mission transfer failed. Error: %1</source>
-      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2174"/>
-      <source>GeoFence transfer failed. Error: %1</source>
-      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2180"/>
-      <source>Rally Point transfer failed. Error: %1</source>
-      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1423"/>
-      <source>battery %1 level low</source>
-      <translation type="unfinished">battery %1 level low</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1429"/>
-      <source>battery %1 level is critical</source>
-      <translation type="unfinished">battery %1 level is critical</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1435"/>
-      <source>battery %1 level emergency</source>
-      <translation type="unfinished">battery %1 level emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1441"/>
-      <source>battery %1 failed</source>
-      <translation type="unfinished">battery %1 failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1447"/>
-      <source>battery %1 unhealthy</source>
-      <translation type="unfinished">battery %1 unhealthy</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1459"/>
-      <source>warning</source>
-      <translation type="unfinished">warning</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2391"/>
-      <source>Generic micro air vehicle</source>
-      <translation type="unfinished">Generic micro air vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2392"/>
-      <source>Fixed wing aircraft</source>
-      <translation type="unfinished">Fixed wing aircraft</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2393"/>
-      <source>Quadrotor</source>
-      <translation type="unfinished">Quadrotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2394"/>
-      <source>Coaxial helicopter</source>
-      <translation type="unfinished">Coaxial helicopter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2395"/>
-      <source>Normal helicopter with tail rotor.</source>
-      <translation type="unfinished">Normal helicopter with tail rotor.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2396"/>
-      <source>Ground installation</source>
-      <translation type="unfinished">Ground installation</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2397"/>
-      <source>Operator control unit / ground control station</source>
-      <translation type="unfinished">Operator control unit / ground control station</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2398"/>
-      <source>Airship, controlled</source>
-      <translation type="unfinished">Airship, controlled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2399"/>
-      <source>Free balloon, uncontrolled</source>
-      <translation type="unfinished">Free balloon, uncontrolled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2400"/>
-      <source>Rocket</source>
-      <translation type="unfinished">Rocket</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2401"/>
-      <source>Ground rover</source>
-      <translation type="unfinished">Ground rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2402"/>
-      <source>Surface vessel, boat, ship</source>
-      <translation type="unfinished">Surface vessel, boat, ship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2403"/>
-      <source>Submarine</source>
-      <translation type="unfinished">Submarine</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2404"/>
-      <source>Hexarotor</source>
-      <translation type="unfinished">Hexarotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2405"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2406"/>
-      <source>Octorotor</source>
-      <translation type="unfinished">Octorotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2407"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2408"/>
-      <source>Flapping wing</source>
-      <translation type="unfinished">Flapping wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2409"/>
-      <source>Onboard companion controller</source>
-      <translation type="unfinished">Onboard companion controller</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2410"/>
-      <source>Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</source>
-      <translation type="unfinished">Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2411"/>
-      <source>Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</source>
-      <translation type="unfinished">Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2412"/>
-      <source>Tiltrotor VTOL</source>
-      <translation type="unfinished">Tiltrotor VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2413"/>
-      <source>VTOL reserved 2</source>
-      <translation type="unfinished">VTOL reserved 2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2414"/>
-      <source>VTOL reserved 3</source>
-      <translation type="unfinished">VTOL reserved 3</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2415"/>
-      <source>VTOL reserved 4</source>
-      <translation type="unfinished">VTOL reserved 4</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2416"/>
-      <source>VTOL reserved 5</source>
-      <translation type="unfinished">VTOL reserved 5</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2417"/>
-      <source>Onboard gimbal</source>
-      <translation type="unfinished">Onboard gimbal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2418"/>
-      <source>Onboard ADSB peripheral</source>
-      <translation type="unfinished">Onboard ADSB peripheral</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2427"/>
-      <source>Vehicle %1 </source>
-      <translation type="unfinished">Vehicle %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3224"/>
-      <source>Vehicle reboot failed.</source>
-      <translation type="unfinished">Vehicle reboot failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2435"/>
-      <source>%1 %2 flight mode</source>
-      <translation type="unfinished">%1 %2 flight mode</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>disarmed</source>
-      <translation type="unfinished">disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Unable to send command: %1.</source>
-      <translation type="unfinished">Unable to send command: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Waiting on previous response to same command.</source>
-      <translation type="unfinished">Waiting on previous response to same command.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2886"/>
-      <source>Vehicle did not respond to command: %1</source>
-      <translation type="unfinished">Vehicle did not respond to command: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2997"/>
-      <source>Bootloader flash succeeded</source>
-      <translation type="unfinished">Bootloader flash succeeded</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3012"/>
-      <source>%1 command temporarily rejected</source>
-      <translation type="unfinished">%1 command temporarily rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3015"/>
-      <source>%1 command denied</source>
-      <translation type="unfinished">%1 command denied</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3018"/>
-      <source>%1 command not supported</source>
-      <translation type="unfinished">%1 command not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3021"/>
-      <source>%1 command failed</source>
-      <translation type="unfinished">%1 command failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="149"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="151"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="153"/>
-      <source>Rover-Boat</source>
-      <translation type="unfinished">Rover-Boat</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="155"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="157"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="159"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="161"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="163"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleLinkManager</name>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <source>%1Communication regained on %2 link</source>
-      <translation type="unfinished">%1Communication regained on %2 link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>primary</source>
-      <translation type="unfinished">primary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>secondary</source>
-      <translation type="unfinished">secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="64"/>
-      <source>%1Communication regained</source>
-      <translation type="unfinished">%1Communication regained</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="69"/>
-      <source>%1Switching communication to new primary link</source>
-      <translation type="unfinished">%1Switching communication to new primary link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>%1Communication lost on %2 link.</source>
-      <translation type="unfinished">%1Communication lost on %2 link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="126"/>
-      <source>%1Switching communication to secondary link.</source>
-      <translation type="unfinished">%1Switching communication to secondary link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="146"/>
-      <source>%1Communication lost</source>
-      <translation type="unfinished">%1Communication lost</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="392"/>
-      <source>Comm Lost</source>
-      <translation type="unfinished">Comm Lost</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleMapItem</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/VehicleMapItem.qml" line="89"/>
-      <source>Vehicle %1</source>
-      <translation type="unfinished">Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleRotationCal</name>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="26"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Incomplete</source>
-      <translation type="unfinished">Incomplete</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleSummary</name>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="87"/>
-      <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation type="unfinished">Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="88"/>
-      <source>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</source>
-      <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleWarnings</name>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
-      <source>No GPS Lock for Vehicle</source>
-      <translation type="unfinished">No GPS Lock for Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
-      <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
-      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VibrationPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
-      <source>Analyze vibration associated with your vehicle.</source>
-      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="74"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="96"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="118"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="139"/>
-      <source>Clip count</source>
-      <translation type="unfinished">Clip count</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="143"/>
-      <source>Accel 1: </source>
-      <translation type="unfinished">Accel 1: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="147"/>
-      <source>Accel 2: </source>
-      <translation type="unfinished">Accel 2: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="151"/>
-      <source>Accel 3: </source>
-      <translation type="unfinished">Accel 3: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="165"/>
-      <source>Not Available</source>
-      <translation type="unfinished">Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoManager</name>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="288"/>
-      <source>Video receiver is not ready.</source>
-      <translation type="unfinished">Video receiver is not ready.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="295"/>
-      <source>Invalid video format defined.</source>
-      <translation type="unfinished">Invalid video format defined.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="306"/>
-      <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoSettings</name>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="22"/>
-      <source>No Video Available</source>
-      <translation type="unfinished">No Video Available</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="23"/>
-      <source>Video Stream Disabled</source>
-      <translation type="unfinished">Video Stream Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="24"/>
-      <source>RTSP Video Stream</source>
-      <translation type="unfinished">RTSP Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="25"/>
-      <source>UDP h.264 Video Stream</source>
-      <translation type="unfinished">UDP h.264 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="26"/>
-      <source>UDP h.265 Video Stream</source>
-      <translation type="unfinished">UDP h.265 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="27"/>
-      <source>TCP-MPEG2 Video Stream</source>
-      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="28"/>
-      <source>MPEG-TS (h.264) Video Stream</source>
-      <translation type="unfinished">MPEG-TS (h.264) Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="29"/>
-      <source>3DR Solo (requires restart)</source>
-      <translation type="unfinished">3DR Solo (requires restart)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="30"/>
-      <source>Parrot Discovery</source>
-      <translation type="unfinished">Parrot Discovery</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="31"/>
-      <source>Yuneec Mantis G</source>
-      <translation type="unfinished">Yuneec Mantis G</translation>
-    </message>
-  </context>
-</TS>
diff --git a/translations/qgc_json_az_AZ.ts b/translations/qgc_json_az_AZ.ts
index e49e2853813a..f5e2e0c735a5 100644
--- a/translations/qgc_json_az_AZ.ts
+++ b/translations/qgc_json_az_AZ.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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>Yerdən qalxış və verilmiş yüksəkliyə qalxmaq.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].description, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Takeoff to specified altitude.</source>
+      <translation>Verilmiş yüksəkliyə qalxış.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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>VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].description, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Land using VTOL mode.</source>
+      <translation>VTOL rejimi ilə eniş et.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation>Tənzimləmə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation>Aç/Qapat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation>Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation>Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>Aktiv</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation>Aktiv/Deaktiv</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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>Dəyişiklik yoxdur,Şəkil çəkmək,Şəkil çəkmək (vaxt),Şəkil çəkmək (məsafə),Şəkil çəkməyi dayandırın,Videoya yazmağa başlayın,Video yazmağı dayandırın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation>İçəri,Bayır</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation>Foto,Video,Dolanma</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation>Heç vaxt, Həmişə, Uçuş rejimi məni izlədikdə</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation>Ev mövqeyi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation>Missiya üçün planlaşdırılan ev mövqeyi.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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>Əsas</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation>ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation>Enlik</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation>Çox Rotor, Vertolyot, Təyyarə, Rover, Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation>Uzunluq</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation>İstiqamət nöqtəsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Travel to a position in 3D space.</source>
+      <translation>3D məkanında bir yerə səyahət edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation>Gözlət</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation>Qəbul</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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>Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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>Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation>Loiter (dönüş)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Turns</source>
+      <translation>Döngələr</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation>Loiterdan çıxın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation>Mərkəz,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation>Loiter (vaxt)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation>Qalxış yerinə qayıt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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>Aparatı işə salma mövqeyinə göndərin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation>Eniş</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land vehicle at the specified location.</source>
+      <translation>Aparatı göstərilən yerə endirin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation>Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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>Aparat ilə idarə olunur,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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation>Qalxış</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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>Yerdən başlayın və göstərilən uçuş mövqeyinə doğru səyahət edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation>Lokal eniş</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation>Qalxış lokal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation>Nav izlə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation>Hündürlük dəyişdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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>Cari kursa davam edin və göstərilən hündürlüyə qalxın / enin. Hündürlüyə çatdıqda növbəti əmrə davam edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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>Uçuş kontrolu</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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>Rejim</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation>Dırmanma,Neytral,Enmə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation>Loiter (hündürlük)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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>Hündürlüyə çatana qədər müəyyən bir vəziyyətdə loiter edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation>Məni izləyin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation>Aparatların yerləşdirilməsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation>Yolun planlaşdırılması</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation>Avtonom yol planlamasına nəzarət edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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>Ətraflı</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation>Yerli planlaşdırma</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation>Deaktiv,Aktiv,Aktiv+Sıfırlamaq</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation>Full planlama</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation>Deaktiv et,Aktiv et,Aktiv et və sıfırla,Yalnız marşrutu deaktiv et, </translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation>Məqsədə səfər edilir</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation>Əyri WP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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>Spline yolundan istifadə edərək 3D məkanında bir yerə səyahət edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation>Hündürlük gözləmək</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation>VTOL qalxış</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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>Düzgün müəyyən hündürlüyə hover edin, sabit qanadlara keçin və göstərilən qalxış yerinə uçun.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation>VTOL eniş</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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>Cari yüksəklikdə göstərilən yerə uçun, çox rotorluya keçin və eniş edin .</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation>Rəhbər etməyi aktiv etmək</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation>Rəhbərlik edən rejimi aktivləşdir/deaktiv edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>Aktivləşdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation>qədər gecikmə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation>Saat (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation>Dəq (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation>Saniyə (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation>Gecikmə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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>Missiyanı bir neçə saniyə gecikdirin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation>Hündürlüyü gözləyin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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>Göstərilən hündürlüyə çatana qədər missiyanı gecikdirin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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>Şərtlər</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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>Dərəcə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation>Məsafəni gözləyin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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>Növbəti WP-ın göstərilən məsafəsinə qədər missiyanı təxirə salın.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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>Məsafə</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation>Yaw üçün gözləyin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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>İstiqamət</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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>Ofset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation>Nisbi,Mütləq</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation>Rejimi təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation>Uçuş rejimini təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation>Uçuş rejimini təyin edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation>Xüsusi rejim</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation>Alt rejimi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation>Elementə keçin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission will continue at the specified item.</source>
+      <translation>Missiya göstərilən maddədə davam edəcəkdir.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation>Element #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation>Təkrarlamaq</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation>Sürəti dəyişdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation>mkv,mov,mp4</translation>
+      <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>Sürəti və / və ya tənzimləmə nöqtəsini dəyişdirin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation>Növ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation>Sürət</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation>Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation>Başlanğıc yerini təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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>Başlanğıc yerini ya cari yerə, ya da müəyyən edilmiş yerə dəyişdirir.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation>Aparatın mövqeyi, Müəyyən edilmiş mövqe</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation>Parametr təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation>Releyi təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay to a condition.</source>
+      <translation>Relai vəziyyətə gətirin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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>Rele #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation>Dəyər</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation>Döngü rölesi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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>Dövrə relesini söndür/yandır.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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>Dövrlər</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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>Vaxt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation>Servo təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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>Servonu müəyyən PWM dəyərinə təyin edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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>Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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>PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation>Döngü servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation>Uçuş sonlandırılması</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation>Eniş start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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>Eniş ardıcıllığının başlanğıcını göstərən marker.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation>Rally torpaq</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation>ətrafına dolanmaq</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation>Təkrar mövqe</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation>Fasilə / Davam et</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation>Getmə istiqamətini təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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>Hərəkət istiqamətini irəli və ya tərsinə təyin edin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation>İrəli, tərs</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest (ROI)</source>
+      <translation>Maraq dairəsi (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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>Kameralar üçün maraq dairəsini təyin edir.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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>Kamera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI to next waypoint</source>
+      <translation>Növbəti yol nöqtəsinə ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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>İstəyəbağlı offsetlər ilə növbəti yol nöqtəsinə işarə etmək üçün maraq dairəsini təyin edir.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch offset</source>
+      <translation>Pitch ofset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Roll offset</source>
+      <translation>Roll ofset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw offset</source>
+      <translation>Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation>ROI ləğv edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancels the region of interest.</source>
+      <translation>Maraqlanılan bölgəni ləğv edir.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation>Videoya nəzarət edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation>Maraq dairəsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation>Heç biri, Növbəti istiqamət, Missiya elementi, Mövqe, ROI maddəsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation>Missiya indeksi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation>ROI Indeksi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation>Kamera konfiqurasiya</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation>Bortda olan kamera kontrollerini tənzimləyin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation>Shutter sürət</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation>Diyafram</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation>ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation>Məruz qalmaq</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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>Əmr</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation>Kəsinti</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation>Kamera nəzarəti</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation>Bortda olan kameranı kontrol et.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation>Sessiya</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation>Böyütmək</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation>Addım</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation>Fokus kilidi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation>Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation>Zirvəni tənzimləyin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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>Vasitə quraşdırılmasını tənzimləyin (məsələn, gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation>Geri çək, neytral, Mavlink hədəfləmə, RC hədəfləmə, GPS nöqtəsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation>Rollı sabitləşdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation>Xeyr,Bəli</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation>Pitchi sabitləşdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation>Yaw sabitləşdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation>Nəzarət Zirvəsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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>Vasitə quraşdırılmasına nəzarət edin (məsələn, gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation>Enlik/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation>Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation>Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera trigger distance</source>
+      <translation>Kamera tətikləmə məsafəsi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera trigger distance.</source>
+      <translation>Kamera tətikləmək məsafəsini seçin.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation>Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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>tətik</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation>Tətikçi yoxdur,dərhal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation>Geofensiyanı aktivləşdirin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation>Geofensiyanı aktivləşdir/deaktiv edin.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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>Təhlükəsizlik</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation>Deaktiv, Yalnız mərtəbə deaktiv et, Aktiv</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation>Tətik paraşütü</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation>Deaktiv,Aktiv,Sərbəst buraxın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation>Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation>Tərs uçuş</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change to/from inverted flight.</source>
+      <translation>Tərs uçuşa\dan dəyişmək.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation>Tərs</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation>Normal,Tərs</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation>Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation>Hərəkət</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation>Buraxın, Tutun</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation>AutoTune aktiv et</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation>AutoTune et.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation>Aktivləşdir, deaktiv edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation>Rəhbər olan hədlər</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set limits for external control</source>
+      <translation>Xarici nəzarət üçün məhdudiyyətlər təyin edin</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation>Müddət</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation>Min Yüks</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation>Max Yüks</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation>H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation>Kalibrasiya</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation>Sensor offsetlərini təyin et</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation>UAVCAN konfiqurasiya</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation>Depolamaq parametrləri</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation>Aparatı yenidən başladın/söndürün</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation>Goto ləğv et</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation>Missiya başlanğıcı</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation>Başla/Söndür</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation>Başlatma mövqeyini alın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation>Spektrum qəbuledicisini bağlayın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation>Mesaj aralığı alın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation>Mesaj intervalını təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation>Bacarıqları əldə edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation>Kamera rejimlərini təyin edin</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera photo, video modes.</source>
+      <translation>Kamera şəkli, video rejimlərini təyin edin.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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>Yox,Yox,2D Kilid,3D Kilid,3D DGPS Kilidi,3D RTK GPS Kilidi (dəyişkən),3D RTK GPS Kilidi (sabit),Statik (sabit)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation>Şəkil çəkin, Video yazın, Dolanma foto rejimi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation>Şəkil çəkməyə başlayın</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start taking one or more photos.</source>
+      <translation>Bir və ya daha çox şəkil çəkməyə başlayın.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation>Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation>Şəkil sayı</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation>Şəkil çəkməyi dayandırın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation>Şəkil çəkməyi dayandırın.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation>Tətik nəzarəti</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation>Video çəkməyə başlayın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation>Video çəkməyə başlayın.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation>Vəziyyət Tezliyi</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation>Video çəkməyi dayandırın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation>Video çəkməyi dayandırın.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation>Panorama yaradın</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation>VTOL keçidi</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation>Uçuş rejiminə keçid edin.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation>VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation>Vəziyyət qapısı</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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>Qapı çatana qədər missiya vəziyyət maşınını gecikdir.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation>Alt&apos;a məhəl qoyma</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation>Yalnış, Doğru</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation>Payload yerləşdirməyə hazırlayın</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation>Yük kontrolu yerləşdirilməsi</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation>Deaktiv,Aktiv</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation>Deaktiv,Aktiv,Mövcud deyil</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation>Şimal,Cənub</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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>Yox,Yox,2D Kilid,3D Kilid,3D DGPS Kilidi,3D RTK GPS Kilidi (dəyişkən),3D RTK GPS Kilidi (sabit),Statik (sabit)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation>Deaktiv,Aktiv</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation>Şimal,Cənub</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation>Deaktiv,Aktiv,Mövcud deyil</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation>Ev mövqeyi</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation>Missiya üçün planlaşdırılan ev mövqeyi.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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>Əsas</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation>Enlik</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation>Uzunluq</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation>İstiqamət nöqtəsi</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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>3D məkanında bir yerə səyahət edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation>Gözlət</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation>Qəbul</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation>Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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>Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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>Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (turns)</source>
-      <translation>Loiter (dönüş)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Turns</source>
-      <translation>Döngələr</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation>Loiterdan çıxın</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation>Mərkəz,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (time)</source>
-      <translation>Loiter (vaxt)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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>Aparat ilə idarə olunur,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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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>Qalxış yerinə qayıt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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>Aparatı işə salma mövqeyinə göndərin.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation>Eniş</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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>Aparatı göstərilən yerə endirin.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Abort Alt</source>
-      <translation>Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation>Qalxış</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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>Yerdən başlayın və göstərilən uçuş mövqeyinə doğru səyahət edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land local</source>
-      <translation>Lokal eniş</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff local</source>
-      <translation>Qalxış lokal</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation>Nav izlə</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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>Hündürlük dəyişdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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>Cari kursa davam edin və göstərilən hündürlüyə qalxın / enin. Hündürlüyə çatdıqda növbəti əmrə davam edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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>Uçuş kontrolu</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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>Rejim</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation>Dırmanma,Neytral,Enmə</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (altitude)</source>
-      <translation>Loiter (hündürlük)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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>Hündürlüyə çatana qədər müəyyən bir vəziyyətdə loiter edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation>Məni izləyin</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle reposition</source>
-      <translation>Aparatların yerləşdirilməsi</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation>Yolun planlaşdırılması</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control autonomous path planning.</source>
-      <translation>Avtonom yol planlamasına nəzarət edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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>Ətraflı</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Local planning</source>
-      <translation>Yerli planlaşdırma</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation>Deaktiv,Aktiv,Aktiv+Sıfırlamaq</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Full planning</source>
-      <translation>Full planlama</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation>Deaktiv et,Aktiv et,Aktiv et və sıfırla,Yalnız marşrutu deaktiv et, </translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading goal</source>
-      <translation>Məqsədə səfər edilir</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Spline waypoint</source>
-      <translation>Əyri WP</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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>Spline yolundan istifadə edərək 3D məkanında bir yerə səyahət edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Altitude wait</source>
-      <translation>Hündürlük gözləmək</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL takeoff</source>
-      <translation>VTOL qalxış</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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>Düzgün müəyyən hündürlüyə hover edin, sabit qanadlara keçin və göstərilən qalxış yerinə uçun.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL land</source>
-      <translation>VTOL eniş</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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>Cari yüksəklikdə göstərilən yerə uçun, çox rotorluya keçin və eniş edin .</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided enable</source>
-      <translation>Rəhbər etməyi aktiv etmək</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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>Rəhbərlik edən rejimi aktivləşdir/deaktiv edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>Aktivləşdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation>qədər gecikmə</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hour (utc)</source>
-      <translation>Saat (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation>Dəq (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sec (utc)</source>
-      <translation>Saniyə (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation>Gecikmə</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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>Missiyanı bir neçə saniyə gecikdirin.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for altitude</source>
-      <translation>Hündürlüyü gözləyin</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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>Göstərilən hündürlüyə çatana qədər missiyanı gecikdirin.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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>Şərtlər</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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>Dərəcə</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for distance</source>
-      <translation>Məsafəni gözləyin</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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>Növbəti WP-ın göstərilən məsafəsinə qədər missiyanı təxirə salın.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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>Məsafə</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for Yaw</source>
-      <translation>Yaw üçün gözləyin</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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>İstiqamət</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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>Ofset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation>Nisbi,Mütləq</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set mode</source>
-      <translation>Rejimi təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode</source>
-      <translation>Uçuş rejimini təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode.</source>
-      <translation>Uçuş rejimini təyin edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Custom Mode</source>
-      <translation>Xüsusi rejim</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sub Mode</source>
-      <translation>Alt rejimi</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Jump to item</source>
-      <translation>Elementə keçin</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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>Missiya göstərilən maddədə davam edəcəkdir.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation>Element #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation>Təkrarlamaq</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change speed</source>
-      <translation>Sürəti dəyişdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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>Sürəti və / və ya tənzimləmə nöqtəsini dəyişdirin.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Type</source>
-      <translation>Növ</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Speed</source>
-      <translation>Sürət</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation>Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set launch location</source>
-      <translation>Başlanğıc yerini təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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>Başlanğıc yerini ya cari yerə, ya da müəyyən edilmiş yerə dəyişdirir.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation>Aparatın mövqeyi, Müəyyən edilmiş mövqe</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation>Parametr təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set relay</source>
-      <translation>Releyi təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation>ChibiOS,NuttX</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>Relai vəziyyətə gətirin.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation>Çox Rotor, Vertolyot, Təyyarə, Rover, Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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>Rele #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Value</source>
-      <translation>Dəyər</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle relay</source>
-      <translation>Döngü rölesi</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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>Dövrə relesini söndür/yandır.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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>Dövrlər</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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>Vaxt</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set servo</source>
-      <translation>Servo təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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>Servonu müəyyən PWM dəyərinə təyin edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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>Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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>PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle servo</source>
-      <translation>Döngü servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation>Uçuş sonlandırılması</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land start</source>
-      <translation>Eniş start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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>Eniş ardıcıllığının başlanğıcını göstərən marker.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Rally land</source>
-      <translation>Rally torpaq</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Go around</source>
-      <translation>ətrafına dolanmaq</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation>Təkrar mövqe</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pause/Continue</source>
-      <translation>Fasilə / Davam et</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set moving direction</source>
-      <translation>Getmə istiqamətini təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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>Hərəkət istiqamətini irəli və ya tərsinə təyin edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation>İrəli, tərs</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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>Maraq dairəsi (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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>Kameralar üçün maraq dairəsini təyin edir.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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>Kamera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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>Növbəti yol nöqtəsinə ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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>İstəyəbağlı offsetlər ilə növbəti yol nöqtəsinə işarə etmək üçün maraq dairəsini təyin edir.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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>Pitch ofset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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>Roll ofset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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>Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cancel ROI</source>
-      <translation>ROI ləğv edin</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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>Maraqlanılan bölgəni ləğv edir.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control video</source>
-      <translation>Videoya nəzarət edin</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Region of interest</source>
-      <translation>Maraq dairəsi</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation>Heç biri, Növbəti istiqamət, Missiya elementi, Mövqe, ROI maddəsi</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation>Missiya indeksi</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>ROI Index</source>
-      <translation>ROI Indeksi</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Camera config</source>
-      <translation>Kamera konfiqurasiya</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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>Bortda olan kamera kontrollerini tənzimləyin.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Shutter spd</source>
-      <translation>Shutter sürət</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Aperture</source>
-      <translation>Diyafram</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>ISO</source>
-      <translation>ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation>Məruz qalmaq</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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>Əmr</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation>Kəsinti</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Camera control</source>
-      <translation>Kamera nəzarəti</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation>Bortda olan kameranı kontrol et.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Session</source>
-      <translation>Sessiya</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Zoom</source>
-      <translation>Böyütmək</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Step</source>
-      <translation>Addım</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Focus lock</source>
-      <translation>Fokus kilidi</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Id</source>
-      <translation>Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Configure Mount</source>
-      <translation>Zirvəni tənzimləyin</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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>Vasitə quraşdırılmasını tənzimləyin (məsələn, gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation>Geri çək, neytral, Mavlink hədəfləmə, RC hədəfləmə, GPS nöqtəsi</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Roll</source>
-      <translation>Rollı sabitləşdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation>Xeyr,Bəli</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Pitch</source>
-      <translation>Pitchi sabitləşdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Yaw</source>
-      <translation>Yaw sabitləşdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control Mount</source>
-      <translation>Nəzarət Zirvəsi</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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>Vasitə quraşdırılmasına nəzarət edin (məsələn, gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lat/Pitch</source>
-      <translation>Enlik/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lon/Roll</source>
-      <translation>Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Alt/Yaw</source>
-      <translation>Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation>mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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>Kamera tətikləmə məsafəsi</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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>Kamera tətikləmək məsafəsini seçin.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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>Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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>tətik</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation>Tətikçi yoxdur,dərhal</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable geofence</source>
-      <translation>Geofensiyanı aktivləşdirin</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation>Geofensiyanı aktivləşdir/deaktiv edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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>Təhlükəsizlik</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation>Deaktiv, Yalnız mərtəbə deaktiv et, Aktiv</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation>Tətik paraşütü</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation>Deaktiv,Aktiv,Sərbəst buraxın</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Motor test</source>
-      <translation>Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Inverted flight</source>
-      <translation>Tərs uçuş</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change to/from inverted flight.</source>
-      <translation>Tərs uçuşa\dan dəyişmək.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Inverted</source>
-      <translation>Tərs</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation>Normal,Tərs</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper id</source>
-      <translation>Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation>Hərəkət</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation>Buraxın, Tutun</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>AutoTune Enable</source>
-      <translation>AutoTune aktiv et</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>AutoTune Enable.</source>
-      <translation>AutoTune et.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation>Aktivləşdir, deaktiv edin</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation>Rəhbər olan hədlər</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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>Xarici nəzarət üçün məhdudiyyətlər təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Timeout</source>
-      <translation>Müddət</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min Alt</source>
-      <translation>Min Yüks</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation>Max Yüks</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>H Limit</source>
-      <translation>H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation>Kalibrasiya</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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>Sensor offsetlərini təyin et</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation>ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation>UAVCAN konfiqurasiya</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation>Depolamaq parametrləri</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reboot/Shutdown vehicle</source>
-      <translation>Aparatı yenidən başladın/söndürün</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation>Goto ləğv et</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation>Missiya başlanğıcı</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Arm/Disarm</source>
-      <translation>Başla/Söndür</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get launch position</source>
-      <translation>Başlatma mövqeyini alın</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Bind Spektrum receiver</source>
-      <translation>Spektrum qəbuledicisini bağlayın</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get message interval</source>
-      <translation>Mesaj aralığı alın</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set message interval</source>
-      <translation>Mesaj intervalını təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get capabilities</source>
-      <translation>Bacarıqları əldə edin</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set camera modes</source>
-      <translation>Kamera rejimlərini təyin edin</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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>Kamera şəkli, video rejimlərini təyin edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation>Şəkil çəkin, Video yazın, Dolanma foto rejimi</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start image capture</source>
-      <translation>Şəkil çəkməyə başlayın</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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>Bir və ya daha çox şəkil çəkməyə başlayın.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Interval</source>
-      <translation>Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Photo count</source>
-      <translation>Şəkil sayı</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop image capture</source>
-      <translation>Şəkil çəkməyi dayandırın</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop taking photos.</source>
-      <translation>Şəkil çəkməyi dayandırın.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger control</source>
-      <translation>Tətik nəzarəti</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start video capture</source>
-      <translation>Video çəkməyə başlayın</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start video capture.</source>
-      <translation>Video çəkməyə başlayın.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Status Frequency</source>
-      <translation>Vəziyyət Tezliyi</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop video capture</source>
-      <translation>Video çəkməyi dayandırın</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop video capture.</source>
-      <translation>Video çəkməyi dayandırın.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation>Panorama yaradın</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL Transition</source>
-      <translation>VTOL keçidi</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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>Uçuş rejiminə keçid edin.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation>VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation>Vəziyyət qapısı</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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>Qapı çatana qədər missiya vəziyyət maşınını gecikdir.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Ignore Alt</source>
-      <translation>Alt&apos;a məhəl qoyma</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation>Yalnış, Doğru</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation>İçəri,Bayır</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Payload prepare deploy</source>
-      <translation>Payload yerləşdirməyə hazırlayın</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Payload control deploy</source>
-      <translation>Yük kontrolu yerləşdirilməsi</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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>Dəyişiklik yoxdur,Şəkil çəkmək,Şəkil çəkmək (vaxt),Şəkil çəkmək (məsafə),Şəkil çəkməyi dayandırın,Videoya yazmağa başlayın,Video yazmağı dayandırın</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation>Foto,Video,Dolanma</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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>Yerdən qalxış və verilmiş yüksəkliyə qalxmaq.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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>Verilmiş yüksəkliyə qalxış.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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>VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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>VTOL rejimi ilə eniş et.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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>Tənzimləmə</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation>Heç vaxt, Həmişə, Uçuş rejimi məni izlədikdə</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation>Aç/Qapat</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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>Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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>Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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>Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>Aktiv</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation>Aktiv/Deaktiv</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_bg_BG.ts b/translations/qgc_json_bg_BG.ts
index 566b1e7f3a33..faf5f7104872 100644
--- a/translations/qgc_json_bg_BG.ts
+++ b/translations/qgc_json_bg_BG.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_de_DE.ts b/translations/qgc_json_de_DE.ts
index fd666b508900..b533d9932d9f 100644
--- a/translations/qgc_json_de_DE.ts
+++ b/translations/qgc_json_de_DE.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_el_GR.ts b/translations/qgc_json_el_GR.ts
index 3a36d36128e9..c8cacccc55af 100644
--- a/translations/qgc_json_el_GR.ts
+++ b/translations/qgc_json_el_GR.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_es_ES.ts b/translations/qgc_json_es_ES.ts
index dd11e41fcc1f..e4e194a4d7ce 100644
--- a/translations/qgc_json_es_ES.ts
+++ b/translations/qgc_json_es_ES.ts
@@ -35,2434 +35,2459 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot,PX4 Pro,Mavlink Genérico</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation>Ala fija, Multi-Rotor,VTOL,Explorador,Sub,Mavlink Genérico</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation>Deshabilitado,error,advertencia,arréglame,info,debug,registrar,rastrear</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation>Interiores,exteriores</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation>Nunca,siempre,cuando esté en modo Sígueme </translation>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation>ChibiOS,NuttX</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation>Multi-Rotor,Helicóptero,Avión,explorador,Sub</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>BrandImage.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation>Posición de inicio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation>Posición de inicio planificada para la misión.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <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>Básico</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation>Latitud</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation>Longitud</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation>Punto de ruta</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Travel to a position in 3D space.</source>
+      <translation>Trasladarse a una posición 3D en el espacio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation>Mantener</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation>Aceptación</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation>Radio de paso</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>Guiñada </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <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>Esperar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <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 position indefinitely.</source>
+      <translation>Trasladarse a una posición y esperar alrededor de una posición específica de manera indefinida</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <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>Radio</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation>Esperar (vueltas)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for a number of turns.</source>
+      <translation>Trasladarse a una posición y esperar alrededor de  una posición específica durante un número de vueltas especificado.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Turns</source>
+      <translation>Vueltas.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation>Cesar espera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation>Dirección del siguiente punto de ruta,Cualquier dirección. </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation>Salir de espera desde</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation>Centro, tangente</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation>Espera (tiempo)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <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 position for an amount of time.</source>
+      <translation>Trasladarse a una posición y  esperar alrededor de la posición específica por una cantidad de tiempo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation>Tiempo de espera</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>Controlado por Vehículo,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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation>Dirección del siguiente punto de ruta, dirección actual</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation>Regreso a punto de despegue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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>Enviar el vehículo de regreso a la posición de lanzamiento</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation>Aterrizar</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land vehicle at the specified location.</source>
+      <translation>Aterrizar el vehículo en la ubicación especificada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation>Altitud de abortar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation>Aterrizaje de precisión</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation>Deshabilitado,Oportunista,Requerido</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation>Despegue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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>Despegue desde tierra y viajar hacia la posición de despegue especificada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation>Aterrizaje local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation>Despegue local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation>Seguir navegación </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation>Cambiar altitud</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <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>Continuar en la dirección actual y ascender/descender a la altitud especificada. Cuando se alcance la altitud continuar al siguiente comando</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <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>Control de Vuelo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <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>Modo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation>Ascender,neutro,descender</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation>Espera (altitud)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <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>Esperar en una posición especificada  hasta que se alcance una altitud</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation>Sígueme</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation>Reposición del vehículo.</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation>Planificación de ruta </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation>Control de la planificación autónoma de la ruta</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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>Avanzado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation>Planificación local</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation>Deshabilitar, Activar,Activar+restablecer</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation>Planificación completa</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation>Deshabilitar, activar, activar+reset,Activar+restablecer ruta únicamente </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation>Rumbo objetivo </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation>Punto de ruta Spline</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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>Viaja a una posición en espacio 3D usando la ruta Spline</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation>Altitud de espera </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation>Despegue VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <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>Mantener posición hasta la altitud especificada, hacer transición a ala fija y volar hasta la posición de despegue especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation>Rumbo de transición</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation>Por defecto,siguiente punto de ruta,despegue,especificado,cualquiera </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation>Aterrizaje VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <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>Volar a la ubicación especificada a la altitud actual, hacer transición a multi-rotor y aterrizar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation>Altitud de aproximación </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation>Guiado activado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation>Habilitado/deshabilitado modo guiado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>Habilitar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation>Encendido,Apagado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation>Retardo hasta</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation>Hora (utc)</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation>Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation>Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation>Retraso</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>Retrasar la misión por una cantidad de segundos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation>Esperar a la altitud</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <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>Retrasar la misión hasta que se alcance la altitud especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <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>Condicionales</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <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>Tasa</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation>Esperar distancia</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <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>Retrasar la misión hasta alcanzar la distancia especificada del siguiente punto de ruta
+</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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>Distancia</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation>Esperar a guiñar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation>Retrasar la misión hasta que se alcance el rumbo especificado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation>Rumbo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <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>Dirección</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <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>Compensación</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation>Relativo,Absoluto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation>Establecer modo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation>Establecer modo de vuelo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation>Establecer modo de vuelo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation>Modo personalizado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation>mkv,mov,mp4</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation>Sub modo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation>Saltar al objeto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission will continue at the specified item.</source>
+      <translation>La misión continuará en el elemento especificado.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation>Objeto #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation>Repetir</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation>Cambiar velocidad</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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>Cambia los puntos de velocidad y/o acelerador</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation>Tipo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation>Velocidad</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation>Acelerador</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation>Establecer ubicación de  lanzamiento</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <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>Cambia la ubicación de lanzamiento ya sea a la ubicación actual o a una ubicación especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation>Posición del vehículo, posición especificada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation>Establecer parámetro</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation>Establecer relevo</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay to a condition.</source>
+      <translation>Establecer el relevo a una condición </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <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>Relevo #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation>Valor</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation>Ciclo de relevo </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <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>Ciclos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <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>Tiempo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation>Fijar servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <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>Fijar servo en un valor específico de PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <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>Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <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>PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation>Ciclo de servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation>Finalizar vuelo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation>Inicio de aterrizaje</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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>Marcador para indicar el inicio de secuencia de aterrizaje</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation>Aterrizaje inmediato</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation>Da la vuelta</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation>Reposición </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation>Pausar/continuar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation>Establecer dirección de movimiento </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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>Establecer dirección de movimiento hacia adelante o atras</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation>Hacia delante,Hacia atas</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest (ROI)</source>
+      <translation>Región de interés (RDI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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>Establece la región de interés para las cámaras</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <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>Cámara</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI to next waypoint</source>
+      <translation>RDI para el siguiente punto de ruta</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <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>Establece la region de interés para apuntar hacia el siguiente punto de ruta con compensaciones opcionales</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <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">Command</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <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>Configurar el montaje del vehículo (ej. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation>Retraer,Neutro, selección de objetivo Mavlink, selección de objetivo RC,Punto GPS</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation>Estabilizar Alabeo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation>No, Sí</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation>Estabilizar cabeceo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation>Estabilizar guiñada </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation>Controlar montura</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <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>Controla el montaje del vehículo (por ejemplo, gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation>Lat/Cabeceo </translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation>Lon/alabeo </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation>Alt/guiñada </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera trigger distance</source>
+      <translation>Distancia de disparo de la cámara </translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera trigger distance.</source>
+      <translation>Establecer distancia de disparo de la cámara </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation>Obturador </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <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>Disparador</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation>Sin disparador,una vez de manera inmediata</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation>Habilitar GeoValla</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation>Habilitar/deshabilitar Geovalla</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <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>Seguridad</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation>Deshabilitar,deshabilitar solo piso,habilitar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation>Disparar paracaídas </translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation>n/a,Todos los sistemas de vuelo,Propulsión,aviónica,carga útil</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation>n/a,Ok,Bajo,Crítico,Emergencia,Fallo,Insano,Cargando</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <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">Set limits for external control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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>Ninguno,ninguno,fijado 2d,fijado 3d, fijado 3D DGPS, fijado 3D gps rtk (flotante), fijado 3D gps rtk (fijo),estático (fijo)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <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">Set camera photo, video modes.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
-  </context>
-  <context>
-    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
-  </context>
-  <context>
-    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
+  </context>
+  <context>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
+  </context>
+  <context>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation>Desactivado/activado</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation>Deshabilitado,Activado,No disponible</translation>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation>Norte,Sur</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetpointFact.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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>Ninguno,ninguno,fijado 2d,fijado 3d, fijado 3D DGPS, fijado 3D gps rtk (flotante), fijado 3D gps rtk (fijo),estático (fijo)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2539 +2512,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
     </message>
-  </context>
-  <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
+  </context>
+  <context>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation>Desactivado/activado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation>Norte,Sur</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
-  </context>
-  <context>
-    <name>QGCMapCircle.Facts.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation>Deshabilitado,Activado,No disponible</translation>
     </message>
   </context>
   <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
   </context>
   <context>
-    <name>StructureScan.SettingsGroup.json</name>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>CameraCalc.FactMetaData.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation>n/a,Todos los sistemas de vuelo,Propulsión,aviónica,carga útil</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation>n/a,Ok,Bajo,Crítico,Emergencia,Fallo,Insano,Cargando</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation>Posición de inicio</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation>Posición de inicio planificada para la misión.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</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>Básico</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation>Latitud</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation>Longitud</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation>Punto de ruta</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</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>Trasladarse a una posición 3D en el espacio</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation>Mantener</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation>Aceptación</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation>Radio de paso</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation>Guiñada </translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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>Esperar</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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 position indefinitely.</source>
-      <translation>Trasladarse a una posición y esperar alrededor de una posición específica de manera indefinida</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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>Radio</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (turns)</source>
-      <translation>Esperar (vueltas)</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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 position for a number of turns.</source>
-      <translation>Trasladarse a una posición y esperar alrededor de  una posición específica durante un número de vueltas especificado.</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Turns</source>
-      <translation>Vueltas.</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation>Cesar espera</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation>Dirección del siguiente punto de ruta,Cualquier dirección. </translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation>Salir de espera desde</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation>Centro, tangente</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (time)</source>
-      <translation>Espera (tiempo)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <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 position for an amount of time.</source>
-      <translation>Trasladarse a una posición y  esperar alrededor de la posición específica por una cantidad de tiempo</translation>
+      <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>Controlado por Vehículo,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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation>Tiempo de espera</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation>Dirección del siguiente punto de ruta, dirección actual</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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>Regreso a punto de despegue</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</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>Enviar el vehículo de regreso a la posición de lanzamiento</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation>Aterrizar</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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>Aterrizar el vehículo en la ubicación especificada</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Abort Alt</source>
-      <translation>Altitud de abortar</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation>Aterrizaje de precisión</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation>Deshabilitado,Oportunista,Requerido</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation>Despegue</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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>Despegue desde tierra y viajar hacia la posición de despegue especificada</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land local</source>
-      <translation>Aterrizaje local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff local</source>
-      <translation>Despegue local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation>Seguir navegación </translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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>Cambiar altitud</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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>Continuar en la dirección actual y ascender/descender a la altitud especificada. Cuando se alcance la altitud continuar al siguiente comando</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</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>Control de Vuelo</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</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>Modo</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation>Ascender,neutro,descender</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (altitude)</source>
-      <translation>Espera (altitud)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</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>Esperar en una posición especificada  hasta que se alcance una altitud</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation>Sígueme</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle reposition</source>
-      <translation>Reposición del vehículo.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation>Planificación de ruta </translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control autonomous path planning.</source>
-      <translation>Control de la planificación autónoma de la ruta</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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_GIMBAL_MANAGER_PITCHYAW].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>Avanzado</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Local planning</source>
-      <translation>Planificación local</translation>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation>Deshabilitar, Activar,Activar+restablecer</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Full planning</source>
-      <translation>Planificación completa</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation>Deshabilitar, activar, activar+reset,Activar+restablecer ruta únicamente </translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading goal</source>
-      <translation>Rumbo objetivo </translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Spline waypoint</source>
-      <translation>Punto de ruta Spline</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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>Viaja a una posición en espacio 3D usando la ruta Spline</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Altitude wait</source>
-      <translation>Altitud de espera </translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL takeoff</source>
-      <translation>Despegue VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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>Mantener posición hasta la altitud especificada, hacer transición a ala fija y volar hasta la posición de despegue especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation>Rumbo de transición</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation>Por defecto,siguiente punto de ruta,despegue,especificado,cualquiera </translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL land</source>
-      <translation>Aterrizaje VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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>Volar a la ubicación especificada a la altitud actual, hacer transición a multi-rotor y aterrizar</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation>Altitud de aproximación </translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided enable</source>
-      <translation>Guiado activado</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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>Habilitado/deshabilitado modo guiado</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>Habilitar</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation>Encendido,Apagado</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation>Retardo hasta</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hour (utc)</source>
-      <translation>Hora (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation>Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sec (utc)</source>
-      <translation>Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation>Retraso</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</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>Retrasar la misión por una cantidad de segundos</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for altitude</source>
-      <translation>Esperar a la altitud</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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>Retrasar la misión hasta que se alcance la altitud especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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>Condicionales</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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>Tasa</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for distance</source>
-      <translation>Esperar distancia</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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>Retrasar la misión hasta alcanzar la distancia especificada del siguiente punto de ruta
-</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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>Distancia</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for Yaw</source>
-      <translation>Esperar a guiñar</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation>Retrasar la misión hasta que se alcance el rumbo especificado</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation>Rumbo</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</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>Dirección</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+    </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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>Compensación</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation>Relativo,Absoluto</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set mode</source>
-      <translation>Establecer modo</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode</source>
-      <translation>Establecer modo de vuelo</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode.</source>
-      <translation>Establecer modo de vuelo.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Custom Mode</source>
-      <translation>Modo personalizado</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sub Mode</source>
-      <translation>Sub modo</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Jump to item</source>
-      <translation>Saltar al objeto</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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>La misión continuará en el elemento especificado.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation>Objeto #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation>Repetir</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change speed</source>
-      <translation>Cambiar velocidad</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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>Cambia los puntos de velocidad y/o acelerador</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Type</source>
-      <translation>Tipo</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Speed</source>
-      <translation>Velocidad</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation>Acelerador</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set launch location</source>
-      <translation>Establecer ubicación de  lanzamiento</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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>Cambia la ubicación de lanzamiento ya sea a la ubicación actual o a una ubicación especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation>Posición del vehículo, posición especificada</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation>Establecer parámetro</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set relay</source>
-      <translation>Establecer relevo</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation>ChibiOS,NuttX</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>Establecer el relevo a una condición </translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation>Multi-Rotor,Helicóptero,Avión,explorador,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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>Relevo #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Value</source>
-      <translation>Valor</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle relay</source>
-      <translation>Ciclo de relevo </translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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>Ciclos</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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>Tiempo</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set servo</source>
-      <translation>Fijar servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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>Fijar servo en un valor específico de PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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>Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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>PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle servo</source>
-      <translation>Ciclo de servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation>Finalizar vuelo</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land start</source>
-      <translation>Inicio de aterrizaje</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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>Marcador para indicar el inicio de secuencia de aterrizaje</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Rally land</source>
-      <translation>Aterrizaje inmediato</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Go around</source>
-      <translation>Da la vuelta</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation>Reposición </translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pause/Continue</source>
-      <translation>Pausar/continuar</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set moving direction</source>
-      <translation>Establecer dirección de movimiento </translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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>Establecer dirección de movimiento hacia adelante o atras</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation>Hacia delante,Hacia atas</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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>Región de interés (RDI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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>Establece la región de interés para las cámaras</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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>Cámara</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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>RDI para el siguiente punto de ruta</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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>Establece la region de interés para apuntar hacia el siguiente punto de ruta con compensaciones opcionales</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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>Configurar el montaje del vehículo (ej. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation>Retraer,Neutro, selección de objetivo Mavlink, selección de objetivo RC,Punto GPS</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Roll</source>
-      <translation>Estabilizar Alabeo</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation>No, Sí</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Pitch</source>
-      <translation>Estabilizar cabeceo</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Yaw</source>
-      <translation>Estabilizar guiñada </translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control Mount</source>
-      <translation>Controlar montura</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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>Controla el montaje del vehículo (por ejemplo, gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lat/Pitch</source>
-      <translation>Lat/Cabeceo </translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lon/Roll</source>
-      <translation>Lon/alabeo </translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Alt/Yaw</source>
-      <translation>Alt/guiñada </translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation>mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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>Distancia de disparo de la cámara </translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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>Establecer distancia de disparo de la cámara </translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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>Obturador </translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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>Disparador</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation>Sin disparador,una vez de manera inmediata</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable geofence</source>
-      <translation>Habilitar GeoValla</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation>Habilitar/deshabilitar Geovalla</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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>Seguridad</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation>Deshabilitar,deshabilitar solo piso,habilitar</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation>Disparar paracaídas </translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation>ArduPilot,PX4 Pro,Mavlink Genérico</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation>Ala fija, Multi-Rotor,VTOL,Explorador,Sub,Mavlink Genérico</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation>Deshabilitado,error,advertencia,arréglame,info,debug,registrar,rastrear</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation>Interiores,exteriores</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation>Nunca,siempre,cuando esté en modo Sígueme </translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_fi_FI.ts b/translations/qgc_json_fi_FI.ts
index c74bb8287711..cbba498913fa 100644
--- a/translations/qgc_json_fi_FI.ts
+++ b/translations/qgc_json_fi_FI.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_fr_FR.ts b/translations/qgc_json_fr_FR.ts
index e2b698879292..c16e74698e19 100644
--- a/translations/qgc_json_fr_FR.ts
+++ b/translations/qgc_json_fr_FR.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot,PX4 Pro,Mavlink Générique</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation>Intérieur, Extérieur</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation>Position de départ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation>Position d'origine prévue pour la mission</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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>Élémentaire</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation>Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation>Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation>Repère</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Travel to a position in 3D space.</source>
+      <translation>Se diriger vers une position dans l'espace 3D.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation>Maintenir</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation>Acceptation</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>Axe de lacet</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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>Attendre</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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>Rayon</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Turns</source>
+      <translation>Tours</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation>Quitter l'attente de</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation>Centre,Tangente</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation>Vol d'attente (durée)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation>Retour au Point de Décollage (RTL)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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>Renvoyez le véhicule à la position de décollage.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation>Atterir</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land vehicle at the specified location.</source>
+      <translation>Faire atterrir le véhicule à la position indiquée.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation>Abandonner Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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>Contrôlé par le véhicule,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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation>Décollage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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>Départ depuis le sol et déplacement vers la position de décollage spécifiée.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation>Sélection du Mode de vol</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation>Sélection du Mode de vol</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation>mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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>Aucun,Aucun,Verrouillage 2D,Verrouillage 3D,Verrouillage 3D DGPS,Verrouillage GPS RTK 3D (flottant),Verrouillage GPS RTK 3D (fixe),Statique (fixe)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation>Activer,Désactiver</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation>Désactivé,Activé,Indisponible</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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>Aucun,Aucun,Verrouillage 2D,Verrouillage 3D,Verrouillage 3D DGPS,Verrouillage GPS RTK 3D (flottant),Verrouillage GPS RTK 3D (fixe),Statique (fixe)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation>Activer,Désactiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation>Désactivé,Activé,Indisponible</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation>Position de départ</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation>Position d'origine prévue pour la mission</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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>Élémentaire</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation>Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation>Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation>Repère</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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>Se diriger vers une position dans l'espace 3D.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation>Maintenir</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation>Acceptation</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation>Axe de lacet</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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>Attendre</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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>Rayon</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Turns</source>
-      <translation>Tours</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation>Quitter l'attente de</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation>Centre,Tangente</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (time)</source>
-      <translation>Vol d'attente (durée)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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>Contrôlé par le véhicule,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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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>Retour au Point de Décollage (RTL)</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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>Renvoyez le véhicule à la position de décollage.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation>Atterir</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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>Faire atterrir le véhicule à la position indiquée.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Abort Alt</source>
-      <translation>Abandonner Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation>Décollage</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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>Départ depuis le sol et déplacement vers la position de décollage spécifiée.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode</source>
-      <translation>Sélection du Mode de vol</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode.</source>
-      <translation>Sélection du Mode de vol</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation>mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation>ArduPilot,PX4 Pro,Mavlink Générique</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation>Intérieur, Extérieur</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_he_IL.ts b/translations/qgc_json_he_IL.ts
index 46a8cbdd0228..07c3ce0768a1 100644
--- a/translations/qgc_json_he_IL.ts
+++ b/translations/qgc_json_he_IL.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_it_IT.ts b/translations/qgc_json_it_IT.ts
index c929fa7fbb78..dc304549d1b1 100644
--- a/translations/qgc_json_it_IT.ts
+++ b/translations/qgc_json_it_IT.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_ja_JP.ts b/translations/qgc_json_ja_JP.ts
index 6460e81b0d66..4a76a7a18ff6 100644
--- a/translations/qgc_json_ja_JP.ts
+++ b/translations/qgc_json_ja_JP.ts
@@ -7,5018 +7,5038 @@
       <extracomment>.QGC.MetaData.Facts[gimbalRoll].shortDesc, </extracomment>
       <location filename="../src/Gimbal/GimbalFact.json"/>
       <source>Gimbal Roll</source>
-      <translation type="unfinished">Gimbal Roll</translation>
+      <translation>ジンバル ロール</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[gimbalPitch].shortDesc, </extracomment>
       <location filename="../src/Gimbal/GimbalFact.json"/>
       <source>Gimbal Pitch</source>
-      <translation type="unfinished">Gimbal Pitch</translation>
+      <translation>ジンバル ピッチ</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[gimbalYaw].shortDesc, </extracomment>
       <location filename="../src/Gimbal/GimbalFact.json"/>
       <source>Gimbal Yaw</source>
-      <translation type="unfinished">Gimbal Yaw</translation>
+      <translation>ジンバル ヨー</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[gimbalAzimuth].shortDesc, </extracomment>
       <location filename="../src/Gimbal/GimbalFact.json"/>
       <source>Azimuth</source>
-      <translation type="unfinished">Azimuth</translation>
+      <translation>方位角</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[deviceId].shortDesc, </extracomment>
       <location filename="../src/Gimbal/GimbalFact.json"/>
       <source>gimbal device Id</source>
-      <translation type="unfinished">gimbal device Id</translation>
+      <translation>ジンバル デバイスID</translation>
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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>地上から離陸し、指定された高度まで上昇します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].description, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Takeoff to specified altitude.</source>
+      <translation>指定した高度に離陸します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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>VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].description, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Land using VTOL mode.</source>
+      <translation>VTOLモードを使用して着陸します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation>設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation>ON,OFF</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation>ピッチ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation>ロール</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>ヨー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation>有効,無効</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation>アプローチポイントと着陸ポイントの距離を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation>アプローチポイントから着陸ポイントまでの進入方向を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation>着陸アプローチを開始する高度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation>アプローチ時に特定の速度を指示します。グライドスロープに入る前にエネルギーを減らすのに有効です。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation>アプローチを行う速度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation>ロイター半径</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation>最終アプローチポイントの周囲を時計回りに旋回します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation>着陸ポイントの高度</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation>ロイターポイントと着陸ポイントの間のグライドスロープを示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot,PX4 Pro,MAVLink 汎用</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation>アプローチポイントまでの距離を指定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation>最終アプローチには高度指定付きロイターを使用します。それ以外の場合は通常のウェイポイントを使用します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation>固定翼機,マルチコプター,VTOL機,ローバー,サブマリン,MAVLink 汎用</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation>写真撮影を停止</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation>動画撮影を停止</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation>アプローチポイントと着陸ポイントの距離を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation>アプローチポイントから着陸ポイントまでの進入方向を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation>着陸アプローチを開始する高度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation>アプローチ時に特定の速度を指示します。グライドスロープに入る前にエネルギーを減らすのに有効です。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation>アプローチを行う速度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation>ロイター (旋回) 半径を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation>最終アプローチポイントの周囲を時計回りに旋回します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation>地上の着陸ポイントの高度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation>最終アプローチには高度指定付きロイターを使用します。それ以外の場合は通常のウェイポイントを使用します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation>写真撮影を停止</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation>動画撮影を停止</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation>ピッチ</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation>離陸位置の高度</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation>現在の飛行速度を設定</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation>カメラの名称を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation>カメラのイメージセンサーの幅を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation>カメラのイメージセンサーの高さを示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation>カメラ画像の解像度の幅を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation>カメラ画像の解像度の高さを示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation>カメラレンズの焦点距離を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation>機体搭載カメラが横向き (ランドスケープ) であることを示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation>無効,エラー,警告,FixMe,情報,デバッグ,ログ,トレース</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation>カメラの向きは固定されており変更できません。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation>各カメラトリガーの間隔の最小時間を示します。</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation>ジンバルのピッチ回転を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation>機体は構造物に対して、この高度で接近および離脱します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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>スキャンでカバーされる最も低い領域の高度を示します。この値を調整することで、下層高度が地上の障害物の上を飛行するように設定できます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation>スキャンに使用する層の数を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation>スキャン対象の構造物の高さを示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation>構造物の上端からスキャンを開始します。</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation>カメラで写真を撮影するか動画を撮影するかを指定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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>変更なし,写真を撮る,写真を撮る(時間),写真を撮る(距離),写真撮影を停止,録画を開始,録画を停止</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation>写真撮影する間隔を距離で指定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation>屋内,屋外</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation>写真撮影する間隔を時間で指定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation>ジンバルのピッチ回転を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation>ジンバルのヨー回転を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should switch to Photo, Video or Survey mode</source>
+      <translation>カメラを写真モード、動画モード、または測量モードに切り替えるかを指定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation>写真,動画,調査</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation>グリッドの平行線の角度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation>各パスでトランセクトを1本おきに飛行します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation>ミッションで使用する凹形ポリゴンを分割して、個別の凸形ポリゴンにします。</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation>離脱リターンポイントの位置緯度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation>離脱リターンポイントの位置経度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation>離脱リターンポイントの高度 (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation>ヨー</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation>構造物をスキャンする際の最下層の高度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation>スキャン回廊の幅を示します。幅を0に指定すると単一パスでスキャンします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Distance between each triggering of the camera. 0 specifies not camera trigger.</source>
+      <translation>カメラのトリガー間隔距離を示します。0 を指定するとトリガーしません。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation>グリッドの平行線間の間隔を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of additional distance to add outside the survey area for vehicle turnaround.</source>
+      <translation>機体が旋回できるように、調査エリアの外側に追加する余裕距離を示します。</translation>
     </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation>設定しない,常時設定,フォローミーモード時</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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>機体が旋回できるように、調査エリアの外側に追加する余裕距離を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation>機体が旋回中もカメラが画像を撮影し続けます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation>各撮影ポイントで停止してホバリングした後に画像を撮影</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation>飛行パターンを90度回転させて再飛行</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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>地形の高度差がこの許容値を超えた場合、トランセクト内に追加のウェイポイントが挿入されます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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>地形補正を行う際に、ウェイポイント間で上昇できる最大速度を示します。0 を指定すると最大値の制限はありません。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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>地形補正を行う際に、ウェイポイント間で下降できる最大速度を示します。0 を指定すると最大値の制限はありません。</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation>ラリーポイントの位置緯度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation>ラリーポイントの位置経度</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation>ラリーポイントの高度 (ホーム基準)</translation>
     </message>
   </context>
   <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation>カメラの名称を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation>ChibiOS,NuttX</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation>指定した値は地表までの距離を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation>マルチローター,ヘリコプター,飛行機,ローバー,サブマリン</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation>機体が地表から離れている距離を示します。</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation>地表における画像密度を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation>前方方向における画像の重なり量を示します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation>側方方向における画像の重なり量を示します。</translation>
     </message>
   </context>
   <context>
-    <name>FlightMode.SettingsGroup.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
-    </message>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation>ホーム位置</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation>ミッションにて計画していたホーム位置</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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>基本</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation>緯度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation>経度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation>ポイント</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Travel to a position in 3D space.</source>
+      <translation>3D空間の位置に移動します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation>ホールド</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation>許容半径</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation>経路半径</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>ヨー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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>ロイター</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <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 position indefinitely.</source>
+      <translation>指定された位置に移動し、その周辺で無期限にロイターします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <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>半径</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation>ロイター(ターン)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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 position for a number of turns.</source>
+      <translation>指定された位置に移動し、その周辺で何回転かしてロイターします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Turns</source>
+      <translation>ターン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation>ロイター離脱</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation>次のポイントの方向, 任意の方向</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation>ロイターを終了</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>機体による制御,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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation>センター,接線</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation>ロイター(時間)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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 position for an amount of time.</source>
+      <translation>指定された位置に移動し、その周辺で一定時間ロイターします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation>ロイター時間</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation>次のポイントの方向,現在の方向</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation>離陸地点へ戻る</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <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>機体を離陸位置に戻します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation>着陸</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land vehicle at the specified location.</source>
+      <translation>指定された場所に機体を着陸させます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation>高度制御 中止</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation>高精度着陸</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation>無効,便乗,必須</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation>離陸</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <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>地上から離陸、指定した離陸位置に向かって移動します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation>着陸 ローカル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation>離陸 ローカル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation>Nav フォロー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation>高度を変更</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <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>現在のコースを継続し、指定した高度まで上昇 / 下降します。高度に達したら次のコマンドに進みます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <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>飛行制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <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>モード</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation>上昇,ニュートラル,下降</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation>ロイター(高度)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <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>高度に達するまでの指定位置でロイターを設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation>フォローミー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation>機体位置変更</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation>経路計画</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation>自律的な経路を計画して制御します。</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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>詳細設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation>パーセント, 電圧, パーセント &amp; 電圧</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation>ローカルプラン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation>無効,有効,有効+リセット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation>全体プラン</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation>無効,有効,有効+リセット,有効+経路リセットのみ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation>ヘッディング目標</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation>スプラインポイント</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <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>滑らかな経路を用いて3D空間の指定位置に移動します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation>高度保持</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation>VTOL離陸</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <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>指定された高度まで直立ホバリングし、固定翼飛行に移行して指定された離陸地点まで飛行します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation>ヘッディング遷移</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation>デフォルト,次のポイント,離陸,指定値,すべて</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation>VTOL着陸</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <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>現在の高度で指定した場所まで飛行し、マルチローターに移行して着陸します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation>高度制御アプローチ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation>ガイドを有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation>ガイド補助モードの有効 / 無効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>有効</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation>ON,OFF</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation>遅延時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation>指定時間に達するまで遅延させます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation>時(UTC)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation>分(UTC)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation>秒(UTC)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation>遅延</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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>秒単位でミッションを遅延させます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation>高度の保持</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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>指定された高度に達するまでミッションを遅らせます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <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>条件</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <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>レート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation>間隔を保持</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <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>次のポイントまでの距離が指定された間隔になるまでミッションを遅延させます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <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>距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation>ヨーの保持</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation>指定された方位に到達するまでミッションを遅延させます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation>ヘッディング</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <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>方向</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation>時計回り, 反時計回り</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <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>オフセット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation>mkv,mov,mp4</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation>相対,絶対</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation>モード設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation>飛行モード設定　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation>飛行モードを設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation>カスタムモード</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation>サブマリンモード</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation>項目にジャンプ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission will continue at the specified item.</source>
+      <translation>指定された項目でミッションを継続します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation>項目 #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation>リピート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation>速度変更</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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>速度および / またはスロットルのセットポイントを変更します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation>タイプ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation>飛行速度, 地上速度, 昇降速度, 降下速度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation>速度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation>スロットル</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation>離陸場所を設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <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>離陸場所を現在の場所または指定した場所に変更します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation>機体位置,指定された位置</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation>パラメータ設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation>中継 設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation>CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay to a condition.</source>
+      <translation>条件に中継個所を設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <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>中継 #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation>値</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation>中継サイクル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <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>中継のON / OFFを任意のサイクル回数 / 時間で行います。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <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>サイクル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <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>時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation>サーボ設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <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>指定されたPWM値にサーボを設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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>サーボ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <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>PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation>サーボサイクル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation>アクチュエータ 設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation>アクチュエータを指定した出力値に設定します。(範囲 [-1, 1])</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation>アクチュエータ 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation>アクチュエータ 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation>アクチュエータ 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation>未定義,飛行機/固定翼機,ヘリコプター/マルチローター,ジャイロプレーン,VTOL,羽ばたき飛行船,グライダー,カイト,フリーバロン,キャプティブバロン,飛行船,パラシュート,ロケット,テザー動力機,地上障害物,その他</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation>アクチュエータ 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation>フライト終了</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation>着陸開始</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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>着陸シーケンスの開始を示すマーカー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation>ポイント</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation>FAA,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation>周回</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation>位置変更</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation>一時停止 / 継続</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation>離陸(未サポート),リアルタイムGNNS,固定 (FAA対象外)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation>移動方向設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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>移動方向を前方 / リバース設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation>前方,リバース</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest (ROI)</source>
+      <translation>対象領域(ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <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>カメラの対象領域を設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <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>カメラ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI to next waypoint</source>
+      <translation>対象領域から次のポイントへ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <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>次のポイントを指すように対象領域を設定し、オプションでオフセットを設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch offset</source>
+      <translation>ピッチオフセット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Roll offset</source>
+      <translation>ロールオフセット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw offset</source>
+      <translation>ヨー オフセット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation>ROI キャンセル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation>未申請,公開,特定,認証済</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancels the region of interest.</source>
+      <translation>対象領域をキャンセルします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation>動画制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation>対象領域</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation>未申請,クラス 0,クラス 1,クラス 2,クラス 3,クラス 4,クラス 5,クラス 6</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation>なし,次のポイント,ミッション項目,場所,ROI項目</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation>ミッションインデックス</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation>ROIインデックス</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation>カメラ設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation>オンボードカメラコントローラの設定</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation>シャッターSpd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation>絞り値</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation>クリックでポイント, クリックしてドラッグ</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation>ISO感度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation>露出度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <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>コマンド</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation>カットオフ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation>カメラコントロール</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation>オンボードカメラの制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation>セッション</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation>ズーム</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation>ステップ</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation>フォーカスロック</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation>ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation>マウントの設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <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>機体マウントを設定します。(例: ジンバル)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation>リトラクト,ニュートラル,MAVLinkターゲット,RCターゲット,GPSポイント</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation>スタビライズ ロール</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation>いいえ,はい</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation>スタビライズ ピッチ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation>スタビライズ ヨー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation>マウント制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <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>機体マウントを制御します。(例: ジンバル)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation>緯度 / ピッチ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation>経度 / ロール</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation>高度 / ヨー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation>ジンバル管理 ピッチ ヨー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation>ミッション中のジンバル制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation>ピッチ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation>ピッチ レート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation>ヨー レート</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation>ヨー フォロー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation>ヨー フォロー, ヨー ロック</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation>ジンバル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation>プライマリー, 第1ジンバル, 第2ジンバル</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera trigger distance</source>
+      <translation>カメラのトリガー距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera trigger distance.</source>
+      <translation>カメラのトリガー距離を設定します。</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation>シャッター</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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>トリガー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation>該当なし,全フライトシステム,推進力,アビオニクス,ペイロード</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation>トリガーなし,一度だけすぐに</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation>ジオフェンス有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation>ジオフェンスを有効 / 無効にします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <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>セーフティ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation>無効,フロアのみ無効,有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation>パラシュートトリガー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation>パラシュートの自動リリースを有効 / 無効にするか、手動でリリースします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation>無効,有効,リリース</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation>モーターテスト</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation>上下反転飛行</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change to/from inverted flight.</source>
+      <translation>反転した / 戻したフライトに切り替えます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation>n/a,OK,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation>反転</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation>ノーマル,反転</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation>グリッパー機構</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation>グリッパー機構を制御します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation>Gripper ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation>アクション</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation>リリース,捉える</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation>自動調整 有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation>自動調整を有効にします。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation>有効,無効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation>ガイド制限</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set limits for external control</source>
+      <translation>外部コントロールの制限を設定</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation>タイムアウト</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation>最低高度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation>最大高度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation>H 制限</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation>キャリブレーション</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation>センサーオフセット設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation>UAVCAN設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation>ストアパラメータ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation>機体の再起動 / シャットダウン</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation>行先を上書き</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation>ミッション開始</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation>アーム / ディスアーム</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation>離陸位置を取得</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation>Spektrum受信機のバインド</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation>メッセージ間隔の取得</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation>メッセージ間隔の設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation>機能を取得</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation>カメラモードの設定</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera photo, video modes.</source>
+      <translation>カメラの写真、録画モードを設定します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation>写真を撮る,録画する,写真モード調査</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation>画像キャプチャ 開始</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start taking one or more photos.</source>
+      <translation>1枚または複数枚の写真を撮り始めます。</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation>間隔</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation>写真枚数</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation>画像キャプチャ停止</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation>写真撮影を停止します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation>トリガー制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation>動画撮影開始</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation>動画撮影を開始します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation>周波数ステータス</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation>動画撮影停止</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation>動画撮影を停止します。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation>高遅延リンクの制御</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation>パノラマ写真を作成</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation>VTOL切り替え</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation>飛行モードの切り替えを行います。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation>VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation>マルチローター,固定翼機</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation>ゲートの状態</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <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>ゲートに到達するまでミッション遂行状態にある機体を遅延させます。</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation>高度を無視</translation>
     </message>
-  </context>
-  <context>
-    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation>False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation>ペイロードの準備と展開</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation>ペイロードの制御と展開</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
-    </message>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation>接続しました</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation>現在のサーベイイン精度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation>現在のサーベイイン緯度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation>現在のサーベイイン経度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation>無効,有効</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation>現在のサーベイイン高度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation>現在のサーベイイン時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation>サーベイインの有効性</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation>サーベイイン 有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation>無効,有効,利用不可</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation>衛星捕捉数</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation>地上局から見た機体の角度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation>地上局から機体までの水平距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation>離陸 (ホーム) 位置から機体までの垂直距離</translation>
     </message>
+  </context>
+  <context>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation>RC (送信機) の操作範囲をスケーリング</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation>RC出力が 0 のときに適用されるパラメータ値</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation>パラメータ最小値</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation>パラメータ最大値</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation>ジオフェンスとして設定する円の半径を示します。</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation>指定したアイテム位置緯度</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation>指定したアイテム位置経度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation>アイテム位置の東方向座標 (Easting)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation>アイテム位置の北方向座標 (Northing)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation>UTMゾーン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation>半球の位置 (北半球・南半球)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation>北,南</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation>MGRS 座標</translation>
     </message>
+  </context>
+  <context>
+    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation>ロール設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation>ピッチ設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation>ヨー設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation>ロールレート設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation>ピッチレート設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation>ヨーレート設定</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation>緯度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation>経度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation>MGRSの位置</translation>
     </message>
-  </context>
-  <context>
-    <name>ClockFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/ClockFact.json"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation>HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentUTCTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/ClockFact.json"/>
-      <source>UTC Time</source>
-      <translation type="unfinished">UTC Time</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation>VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/ClockFact.json"/>
-      <source>Date</source>
-      <translation type="unfinished">Date</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation>地上コース</translation>
     </message>
-  </context>
-  <context>
-    <name>LocalPositionFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation>ヨー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation>GPSロック</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation>受信衛星数</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation>保留中のブロック</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation>読み込まれたブロック</translation>
     </message>
   </context>
   <context>
-    <name>HygrometerFact.json</name>
+    <name>ClockFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/ClockFact.json"/>
+      <source>Time</source>
+      <translation>時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
+      <extracomment>.QGC.MetaData.Facts[currentUTCTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/ClockFact.json"/>
+      <source>UTC Time</source>
+      <translation>UTC時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/ClockFact.json"/>
+      <source>Date</source>
+      <translation>日付</translation>
     </message>
   </context>
   <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation>正常</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation>ECUインデックス</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation>RPM</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation>消費燃料</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation>燃料消費率</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation>エンジン負荷</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation>スロットルポジション</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation>点火ドエル時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation>大気圧</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation>吸気マニホールド圧</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation>吸気マニホールド温度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation>シリンダーヘッド温度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation>点火タイミング</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation>燃料噴射時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation>排気温度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation>スロットル出力</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation>Pt補正</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation>X軸 振動</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation>Y軸 振動</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation>Z軸 振動</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation>クリップ数 (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation>クリップ数 (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation>クリップ数 (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation>状態</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation>ジェネレータ速度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation>バッテリー電流</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation>負荷電流</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation>発電量</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation>バス電圧</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation>レクチファイア温度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation>バッテリー電流設定</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation>ジェネレータ温度</translation>
     </message>
-  </context>
-  <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation>ランタイム</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation>メンテナンス残時間</translation>
     </message>
+  </context>
+  <context>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation>カメラ チルト</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation>係留ケーブル巻き数</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation>ライト レベル1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation>ライト レベル2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation>パイロットゲイン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation>入力ホールド</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation>無効,有効</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation>レンジファインダー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation>北,南</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation>RFターゲット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation>ロール / ピッチ トグル</translation>
     </message>
-  </context>
-  <context>
-    <name>QGCMapCircle.Facts.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation>無効,有効,利用不可</translation>
     </message>
   </context>
   <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation>ロール</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation>ピッチ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation>ヘッディング</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation>ロール レート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation>ピッチ レート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation>ヨー レート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation>地上速度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation>飛行速度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation>上昇 レート</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation>高度 (Rel)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation>高度 (AMSL)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation>高度 (地表から)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation>飛行距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation>ホームまでの距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation>ホームまでの時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation>ホームへの方位</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation>GCSまでの距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation>ミッションアイテム インデックス</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation>次のWP方位</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation>次のWP距離</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation>飛行時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation>機体の稼働時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation>スロットル %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation>IMU温度</translation>
     </message>
   </context>
   <context>
-    <name>StructureScan.SettingsGroup.json</name>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation>姿勢推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation>水平速度推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation>垂直速度推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation>水平相対位置推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation>水平絶対位置推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation>垂直絶対位置推定 良好</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation>ヨー</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation>垂直地表高度推定 良好</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation>定位置モード推定 良好</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation>水平予測相対位置推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation>水平予測絶対位置推定 良好</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation>GPS 異常</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation>加速度エラー</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation>速度比</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation>水平位置比</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation>垂直位置比</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation>磁力計の比率</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation>地上高の比率</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation>真対気速度 (TAS) の比率</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation>水平位置精度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation>垂直位置精度</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation>ピッチ</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation>バッテリー ID</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation>バッテリー機能</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation>該当なし,全フライトシステム,推進力,アビオニクス,ペイロード</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation>バッテリータイプ</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation>電圧</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation>パーセント</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation>電力消費量</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation>現在値</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation>温度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation>ワット</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation>残り時間</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation>充電状態</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation>n/a,OK,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation>風向き</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation>風速</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation>風速 (鉛直)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation>このメッセージ内で最初のESCインデックス</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation>回転数 (RPM)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation>現在値</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation>電圧</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation>温度 (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation>温度 (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation>温度 (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation>温度</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation>湿度 %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation>ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation>ホーム位置</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation>前方</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation>ミッションにて計画していたホーム位置</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation>前方 / 右側</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>基本</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation>右側</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation>緯度</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation>後方 / 右側</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation>経度</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation>後方</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation>ポイント</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation>後方 / 左側</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>3D空間の位置に移動します。</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation>左側</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation>前方 / 左側</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation>ホールド</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation>上</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation>許容半径</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation>下</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation>経路半径</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation>センサーが検出できる最小距離</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation>ヨー</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation>センサーが検出できる最大距離</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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>ロイター</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation>X</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 position indefinitely.</source>
-      <translation>指定された位置に移動し、その周辺で無期限にロイターします。</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation>Y</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>半径</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation>Z</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (turns)</source>
-      <translation>ロイター(ターン)</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation>VX</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 position for a number of turns.</source>
-      <translation>指定された位置に移動し、その周辺で何回転かしてロイターします。</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation>Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Turns</source>
-      <translation>ターン</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation>Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation>ロイター離脱</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation>RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation>次のポイントの方向, 任意の方向</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation>RPM 2</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation>ロイターを終了</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation>RPM 3</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation>センター,接線</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation>RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (time)</source>
-      <translation>ロイター(時間)</translation>
+      <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>機体による制御,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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <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 position for an amount of time.</source>
-      <translation>指定された位置に移動し、その周辺で一定時間ロイターします。</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation>オペレータID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation>ロイター時間</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation>オペレータID。最大20文字まで。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation>次のポイントの方向,現在の方向</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation>オペレータIDが有効</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>離陸地点へ戻る</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation>オペレータIDがチェックサムを用いて確認されました。</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>機体を離陸位置に戻します。</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation>オペレータID タイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation>着陸</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation>CAA</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>指定された場所に機体を着陸させます。</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation>オペレータIDを送信</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Abort Alt</source>
-      <translation>高度制御 中止</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation>有効な場合、オペレータIDメッセージを送信</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation>高精度着陸</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation>飛行目的</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation>無効,便乗,必須</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation>オペレータが任意に運用データを指定できる自由記述のプレーンテキストを示します。(最大23文字)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation>離陸</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation>緊急時のテキスト</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>地上から離陸、指定した離陸位置に向かって移動します。</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation>オペレータが任意に運用データを指定できる緊急用の自由記述テキストを示します。(最大23文字)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land local</source>
-      <translation>着陸 ローカル</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation>詳細状態</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff local</source>
-      <translation>離陸 ローカル</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation>オペレータが任意に運用データを指定できる拡張用の自由記述テキストを示します。(最大23文字)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation>Nav フォロー</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation>セルフID タイプ</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>高度を変更</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation>飛行目的,緊急性,拡張ステータス</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>現在のコースを継続し、指定した高度まで上昇 / 下降します。高度に達したら次のコマンドに進みます。</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation>セルフIDを送信</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>飛行制御</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation>有効な場合、セルフIDメッセージを送信</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation>ベーシックID</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>モード</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation>ベーシックID タイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation>上昇,ニュートラル,下降</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation>なし,シリアルナンバー (ANSI/CTA-2063),CAA,UTM (RFC4122),特定</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (altitude)</source>
-      <translation>ロイター(高度)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation>UAタイプ</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>高度に達するまでの指定位置でロイターを設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation>未定義,飛行機/固定翼機,ヘリコプター/マルチローター,ジャイロプレーン,VTOL,羽ばたき飛行船,グライダー,カイト,フリーバロン,キャプティブバロン,飛行船,パラシュート,ロケット,テザー動力機,地上障害物,その他</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation>フォローミー</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation>ベーシックIDを送信</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle reposition</source>
-      <translation>機体位置変更</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation>有効な場合、ベーシックIDメッセージを送信</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation>経路計画</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation>運用地域</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control autonomous path planning.</source>
-      <translation>自律的な経路を計画して制御します。</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation>ミッションが行われる運用地域を示します</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_GIMBAL_MANAGER_PITCHYAW].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>詳細設定</translation>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation>FAA,EU</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Local planning</source>
-      <translation>ローカルプラン</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation>ロケーションタイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation>無効,有効,有効+リセット</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation>オペレータ位置のタイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Full planning</source>
-      <translation>全体プラン</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation>離陸(未サポート),リアルタイムGNNS,固定 (FAA対象外)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation>無効,有効,有効+リセット,有効+経路リセットのみ</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation>緯度修正</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading goal</source>
-      <translation>ヘッディング目標</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation>SYSTEMメッセージで送信する緯度を修正</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Spline waypoint</source>
-      <translation>スプラインポイント</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation>経度修正</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>滑らかな経路を用いて3D空間の指定位置に移動します。</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation>SYSTEMメッセージで送信する経度を修正</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Altitude wait</source>
-      <translation>高度保持</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation>高度修正</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL takeoff</source>
-      <translation>VTOL離陸</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation>SYSTEMメッセージで送信する高度を修正</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>指定された高度まで直立ホバリングし、固定翼飛行に移行して指定された離陸地点まで飛行します。</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation>分類タイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation>ヘッディング遷移</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation>UASの分類タイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation>デフォルト,次のポイント,離陸,指定値,すべて</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation>未申告,EU</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL land</source>
-      <translation>VTOL着陸</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation>カテゴリ</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>現在の高度で指定した場所まで飛行し、マルチローターに移行して着陸します。</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation>EU地域におけるUASカテゴリ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation>高度制御アプローチ</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation>未申請,公開,特定,認証済</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided enable</source>
-      <translation>ガイドを有効</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation>クラス</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>ガイドモードの有効 / 無効</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation>EU地域におけるUASクラス</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>有効</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation>未申請,クラス 0,クラス 1,クラス 2,クラス 3,クラス 4,クラス 5,クラス 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation>ON,OFF</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation>飛行マップで現在選択されている地図プロバイダ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation>遅延時間</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation>飛行マップで現在選択されている地図タイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation>指定時間に達するまで遅延させます。</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation>現在選択されている標高マッププロバイダ</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hour (utc)</source>
-      <translation>時(UTC)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation>サーベイイン精度 (U-blox専用)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation>分(UTC)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>The minimum accuracy value that Survey-In must achieve before it can complete.</source>
+      <translation>サーベイインが完了する前に達成する必要がある最小精度値を示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sec (utc)</source>
-      <translation>秒(UTC)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation>最小観測時間</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation>遅延</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation>位置計算に必要な最小観測時間を示します。</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>秒単位でミッションを遅延させます。</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation>指定された基地局位置を使用</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for altitude</source>
-      <translation>高度の保持</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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>サーベイインを行わずにRTK基地局位置の値を指定します。</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>指定された高度に達するまでミッションを遅らせます。</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation>基地局位置の緯度</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>条件</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation>固定RTK基地局位置の緯度を示します。</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>レート</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation>基地局位置の経度</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for distance</source>
-      <translation>間隔を保持</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation>固定RTK基地局位置の経度を示します。</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>次のポイントまでの距離が指定された間隔になるまでミッションを遅延させます。</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation>基地局位置の高度 (WGS84)</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>距離</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation>固定RTK基地局位置の高度を示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for Yaw</source>
-      <translation>ヨーの保持</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation>基地局位置の精度</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation>指定された方位に到達するまでミッションを遅延させます。</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation>固定RTK基地局位置の精度を示します。</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation>ヘッディング</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation>ダウンロードにおける最小ズームレベルを示します。</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>方向</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation>ダウンロードにおける最大ズームレベルを示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation>時計回り, 反時計回り</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation>ダウンロード可能なタイルの最大数を示します。</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <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>オフセット</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation>飛行毎にテレメトリーログを保存します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation>相対,絶対</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation>このオプションを有効にすると、飛行終了毎にテレメトリーが保存されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set mode</source>
-      <translation>モード設定</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation>機体がアームしていない場合でもテレメトリーログを保存</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode</source>
-      <translation>フライトモード設定</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation>このオプションを有効にすると、機体がアームされていない場合でも、テレメトリーログが保存されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode.</source>
-      <translation>フライトモードを設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation>MAVLinkテレメトリーストリームの開始をリクエスト (ArduPilot専用)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Custom Mode</source>
-      <translation>カスタムモード</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation>CSVテレメトリーログを保存</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sub Mode</source>
-      <translation>サブモード</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</source>
+      <translation>このオプションを有効にすると、すべてのFactデータが1秒毎 (1Hz) にCSVファイルへ記録されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Jump to item</source>
-      <translation>項目にジャンプ</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation>MAVLink転送を有効にする</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>指定された項目でミッションを継続します。</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation>ホスト名</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation>項目 #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation>MAVLinkを転送するホスト名 (例: localhost:14445)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation>リピート</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation>Ardupilot サポートホスト名</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change speed</source>
-      <translation>速度変更</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation>MAVLinkを転送するArduPilotサポートサーバ (例: support.ardupilot.org:xxxx)</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>速度および / またはスロットルのセットポイントを変更します。</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation>MAVLink 2.0の署名キー</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Type</source>
-      <translation>タイプ</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation>GCSハートビート信号を送信</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation>飛行速度, 地上速度, 昇降速度, 降下速度</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation>GCS MAVLink システムID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Speed</source>
-      <translation>速度</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation>Fly View用のJSONカスタムアクションファイル名</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation>スロットル</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation>Joysticks用のJSONカスタムアクションファイル名</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set launch location</source>
-      <translation>離陸場所を設定</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation>最大ディスクキャッシュ</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>離陸場所を現在の場所または指定した場所に変更します。</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation>最大メモリキャッシュ</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation>機体位置,指定された位置</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation>書き込み時の既定ファームウェアタイプ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation>パラメータ設定</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation>ChibiOS,NuttX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set relay</source>
-      <translation>中継 設定</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation>マルチローター,ヘリコプター,飛行機,ローバー,サブマリン</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set relay to a condition.</source>
-      <translation>条件に中継個所を設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation>ガイド操作用高度スライダーの最小高度
+</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>中継 #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation>ガイド操作用高度スライダーの最大高度
+</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Value</source>
-      <translation>値</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation>ログリプレイのステータスバーを表示 / 非表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle relay</source>
-      <translation>中継サイクル</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation>コンパスに追加のヘッディングインジケータを表示</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>中継のON / OFFを任意のサイクル回数 / 時間で行います。</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation>コンパスを機体のノーズアップ方向に固定</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>サイクル</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation>マップ中央に機体を配置</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>時間</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation>【MAV_CMD_DO_DIGICAM_CONTROL】を使用してカメラトリガー制御を表示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set servo</source>
-      <translation>サーボ設定</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation>地図および映像上に障害物までの距離をオーバーレイ表示します。</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>指定されたPWM値にサーボを設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation>指定位置への移動に許可される最大距離です。</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>サーボ</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation>前進飛行中に指定位置を旋回する際の旋回半径です。これは、ファームウェアが【MAV_CMD_DO_REPOSITION】コマンドで半径をサポートしている場合にのみ適用されます。</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>PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation>機体がすでにガイド補助モードにある場合、指定位置への移動にはスライド操作による確認が必要です。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle servo</source>
-      <translation>サーボサイクル</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation>ホーム位置が変更された場合、更新されたGCSのホーム位置をオートパイロットに送信</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation>アクチュエータ 設定</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation>計器パネル用QMLファイル</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation>アクチュエータを指定した出力値に設定します。(範囲 [-1, 1])</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation>統合コンパス＆姿勢計, 水平コンパス＆姿勢計, 大型垂直コンパス</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation>アクチュエータ 1</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation>機体制御を要求された際、他のGCSが自動的に制御を上書きできるようにするか、まずこのGCSが要求を承認する必要があるかを指定します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation>アクチュエータ 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation>GCSに対してテイクオーバーを許可する要求を送信してから、拒否されたとみなすまでのタイムアウト時間 (秒) です。このタイムアウトは、要求元と制御中のGCSにグラフィカルに表示されます。</translation>
+    </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation>非表示飛行モードのカンマ区切りリスト</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation>アクチュエータ 3</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation>マルチローター用 非表示飛行モードのカンマ区切りリスト</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation>アクチュエータ 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation>固定翼用 非表示フライトモードのカンマ区切りリスト</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation>フライト終了</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation>VTOL用 非表示フライトモードのカンマ区切りリスト</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land start</source>
-      <translation>着陸開始</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation>ローバーボート用 非表示フライトモードのカンマ区切りリスト</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>着陸シーケンスの開始を示すマーカー</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation>サブマリン用 非表示フライトモードのカンマ区切りリスト</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Rally land</source>
-      <translation>ポイント</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation>飛行船用 非表示フライトモードのカンマ区切りリスト</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Go around</source>
-      <translation>周回</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation>UDP経由で自動接続を開く</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation>位置変更</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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>このオプションを有効にすると、GroundControlはUDP通信リンクで検出された機体へ自動的に接続します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pause/Continue</source>
-      <translation>一時停止 / 継続</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation>Pixhawkボードに自動接続</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set moving direction</source>
-      <translation>移動方向設定</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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>このオプションを有効にすると、GroundControlはUSB経由で接続されたPixhawkボードへ自動的に接続します。</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>移動方向を前方 / リバース設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation>SiK無線通信に自動接続</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation>前方,リバース</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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>このオプションを有効にすると、GroundControlはSiK無線通信リンクで検出された機体へ自動的に接続します。</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>対象領域(ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation>RTK GPSに自動接続</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>カメラの対象領域を設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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>このオプションを有効にすると、GroundControlはUSB経由で接続されたRTK GPSへ自動的に接続します。</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>カメラ</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation>LibrePilotに自動接続</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>対象領域から次のポイントへ</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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>このオプションを有効にすると、GroundControlはUSB経由で接続されているLibrePilotボードへ自動的に接続します。</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>次のポイントを指すように対象領域を設定し、オプションでオフセットを設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation>GCS位置用 NMEA GPSデバイス</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>ピッチオフセット</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation>NMEA GPS伝送速度</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>ロールオフセット</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation>Zero-Confで自動接続を開く</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>ヨー オフセット</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation>このオプションを有効にすると、GroundControlはZero-Confで検出された機体へ自動的に接続します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cancel ROI</source>
-      <translation>ROI キャンセル</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation>自動接続用 UDPポート</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>対象領域をキャンセルします。</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation>自動接続用 UDPターゲットホストIP</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control video</source>
-      <translation>ビデオ制御</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation>自動接続用 UDPターゲットホストポート</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Region of interest</source>
-      <translation>対象領域</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation>NMEAストリーム 受信用UDPポート</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation>なし,次のポイント,ミッション項目,場所,ROI項目</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation>起動時にプリセットタブを表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation>ミッションインデックス</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation>ミッション項目ステータス表示の表示 / 非表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>ROI Index</source>
-      <translation>ROIインデックス</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation>ミッションで離陸項目を必須としないことを許可</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Camera config</source>
-      <translation>カメラ設定</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation>ファームウェアが対応している場合、複数の着陸シーケンスを設定できます。最初のシーケンスはミッションに使用されますが、RTL (帰還) の際には最も近いシーケンスが使用されます。</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>オンボードカメラコントローラの設定</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation>パターン生成に【MAV_CMD_CONDITION_GATE】を使用</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Shutter spd</source>
-      <translation>シャッターSpd</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation>ウェイポイントで明示的に設定された場合のみ、ジンバルのヨービジュアルを表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Aperture</source>
-      <translation>絞り値</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation>機体が移動を完了するために必要な距離</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>ISO</source>
-      <translation>ISO感度</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation>ADB SBSサーバに接続</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation>露出度</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation>指定したアドレス / ポートを使用してADS-B SBS-1サーバに接続</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>コマンド</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation>ホストアドレス</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation>カットオフ</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation>サーバポート</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Camera control</source>
-      <translation>カメラコントロール</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation>動画 参照元</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation>オンボードカメラの制御</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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>動画の参照元です。UDP、TCP、RTSP、UVCカメラは、機体や地上局のバージョンによってサポートされる場合があります。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Session</source>
-      <translation>セッション</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation>動画 UDP URL</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Zoom</source>
-      <translation>ズーム</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation>ビデオストリーム用にバインドするUDP URL アドレスとポートです。例: 0.0.0.0:5600</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Step</source>
-      <translation>ステップ</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation>動画 RTSP URL</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Focus lock</source>
-      <translation>フォーカスロック</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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>ビデオストリーム用にバインドするRTSP URL アドレスとポートです。例: rtsp://192.168.42.1:554/live</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Id</source>
-      <translation>ID</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation>動画 TCP URL</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Configure Mount</source>
-      <translation>マウントの設定</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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>ビデオストリーム用にバインドするTCP URL アドレスとポートです。例: 192.168.143.200:3001</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>機体マウントを設定します。(例: ジンバル)</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation>動画保存ディレクトリ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation>リトラクト,ニュートラル,MAVLinkターゲット,RCターゲット,GPSポイント</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation>動画を保存するディレクトリです。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Roll</source>
-      <translation>スタビライズ ロール</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation>動画アスペクト比</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation>いいえ,はい</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation>動画のアスペクト比 (幅 / 高さ) です。無視する場合は 0.0 を使用してください。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Pitch</source>
-      <translation>スタビライズ ピッチ</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation>動画グリッド線</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Yaw</source>
-      <translation>スタビライズ ヨー</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation>動画ビュー上にグリッドをオーバーレイ表示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control Mount</source>
-      <translation>マウント制御</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation>動画表示にフィット</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>機体マウントを制御します。(例: ジンバル)</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation>動画アスペクト比を処理します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lat/Pitch</source>
-      <translation>緯度 / ピッチ</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation>フィット幅,フィット高,塗りつぶし,クロップなし</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lon/Roll</source>
-      <translation>経度 / ロール</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation>録画の制御を表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Alt/Yaw</source>
-      <translation>高度 / ヨー</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation>UIで録画コントロールを表示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation>ジンバル管理 ピッチ ヨー</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation>録画形式</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation>ミッション中のジンバル制御</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation>録画ファイル形式を示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation>ピッチ</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation>mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation>ピッチ レート</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation>録画ストレージの最大使用量</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation>ヨー レート</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation>録画で使用するディスク容量の最大値です。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation>ヨー フォロー</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation>ストレージ使用量上限の有効 / 無効</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation>ヨー フォロー, ヨー ロック</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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>有効にするとQGCで記録された動画の合計サイズが最大保存容量を超えた場合、古い動画ファイルが自動的に削除されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation>ジンバル</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation>RTSP動画のタイムアウト</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation>プライマリー, 第1ジンバル, 第2ジンバル</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation>RTSPリンクが切断されたとみなすまでに待機する時間です。</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>カメラのトリガー距離</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation>ビデオストリーム 有効</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>カメラのトリガー距離を設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation>ビデオストリーム 開始 / 停止</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>シャッター</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation>アーム時 ビデオストリーム 無効</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>トリガー</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation>ディスアーム時にビデオストリームを無効化します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation>トリガーなし,一度だけすぐに</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation>低遅延向けに動画を調整</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable geofence</source>
-      <translation>ジオフェンス有効</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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>このオプションを有効にすると、rtpjitterbufferが削除され、映像出力処理が非同期モードに設定されます。これによりおよそ200msの遅延が削減されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation>ジオフェンスを有効 / 無効にします。</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation>特定カテゴリのビデオデコードを強制</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>セーフティ</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation>ビデオデコード方式の優先順位を強制的に変更します。必要に応じて、ユーザが特定のハードウェアデコードプラグインを強制的に使用できるようにします。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation>無効,フロアのみ無効,有効</translation>
-    </message>
-    <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation>パラシュートトリガー</translation>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation>デフォルト,ソフトウェア デコーダー,NVIDIA デコーダー,VA-API デコーダー,DirectX 3D 11 デコーダー,VideoToolbox デコーダー, Intel デコーダー,Vulkan デコーダー</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation>3D Viewerを有効</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation>無効,有効,リリース</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation>3D ViewerのOSMファイルへのパスです。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Motor test</source>
-      <translation>モーターテスト</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation>各建物階層の平均高さ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Inverted flight</source>
-      <translation>上下反転飛行</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation>3D View内の機体の高度バイアス</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change to/from inverted flight.</source>
-      <translation>反転した / 戻したフライトに切り替えます。</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation>画面上のカメラ制御 有効</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Inverted</source>
-      <translation>反転</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation>画面上の制御の種類</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation>ノーマル,反転</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation>クリックでポイント, クリックしてドラッグ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation>グリッパー機構</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation>カメラ垂直視野角</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation>グリッパー機構を制御します。</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation>カメラ水平視野角</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper id</source>
-      <translation>Gripper ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation>クリック＆ドラッグ時のジンバル最大速度 (度/秒)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation>アクション</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation>地図上の機体アイコンにジンバル方位角インジケータを表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation>リリース,捉える</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation>トップツールバーのジンバルインジケータにローカル・ヨーの代わりに方位角を表示する</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>AutoTune Enable</source>
-      <translation>自動調整 有効</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation>ジンバルボタンパネルに方位角取得 / 解放ボタンを表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>AutoTune Enable.</source>
-      <translation>自動調整を有効にします。</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation>ジョイスティックボタン制御で使用する速度 (度/秒)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation>有効,無効</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation>ジョイスティックボタンをジンバルの 左 / 右 / 上 / 下 に設定すると、押している間はこのレートでジンバルが動作し、ボタンを離すと停止します。</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation>ガイド制限</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation>インジケータに表示する値を選択</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>外部コントロールの制限を設定</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation>パーセント, 電圧, パーセント &amp; 電圧</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Timeout</source>
-      <translation>タイムアウト</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation>バッテリーレベル しきい値 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min Alt</source>
-      <translation>最低高度</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation>バッテリーレベル しきい値 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation>最大高度</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation>ユーザ選択ブランド画像</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>H Limit</source>
-      <translation>H 制限</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation>ユーザ選択ブランド画像 (屋内) のファイルシステム上の場所</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation>キャリブレーション</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation>ユーザ選択ブランド画像 (屋外) のファイルシステム上の場所</translation>
     </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set sensor offsets</source>
-      <translation>センサオフセット設定</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation>オフライン編集 ファームウェアクラス</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation>UAVCAN設定</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation>ArduPilot,PX4 Pro,MAVLink 汎用</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation>ストアパラメータ</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation>オフライン編集 機体クラス</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reboot/Shutdown vehicle</source>
-      <translation>機体の再起動 / シャットダウン</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation>固定翼機,マルチコプター,VTOL機,ローバー,サブマリン,MAVLink 汎用</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation>行先を上書き</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation>オフライン編集 クルーズ速度</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation>ミッション開始</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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>ミッション統計計算用のデフォルト速度です。(ホバリング非対応機 / 固定翼VTOL用) 飛行プラン速度は変更されません。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Arm/Disarm</source>
-      <translation>アーム / ディスアーム</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation>オフライン編集 ホバー速度</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get launch position</source>
-      <translation>離陸位置を取得</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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>ホバリング非対応機やVTOL機 (固定翼モード) のミッション統計計算用のデフォルト速度です。飛行プラン速度は変更されません。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Bind Spektrum receiver</source>
-      <translation>Spektrum受信機のバインド</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation>オフライン編集 上昇速度</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get message interval</source>
-      <translation>メッセージ間隔の取得</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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>この値はマルチローターの上昇速度を定義し、ミッション時間の計算に使用されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set message interval</source>
-      <translation>メッセージ間隔の設定</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation>オフライン編集 下降速度</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get capabilities</source>
-      <translation>機能を取得</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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>この値はマルチローターの巡航速度を定義し、ミッション時間の計算に使用されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set camera modes</source>
-      <translation>カメラモードの設定</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation>バッテリー残量をパーセントにてアナウンス</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>カメラの写真、ビデオ録画モードを設定します。</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce the remaining battery percent when it falls below the specified percentage.</source>
+      <translation>設定した割合を下回った場合に、残りのバッテリー残量 (%) をアナウンスします。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation>写真を撮る,ビデオを録画する,写真モード調査</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation>高度のデフォルト値</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start image capture</source>
-      <translation>画像キャプチャ 開始</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>This value specifies the default altitude for new items added to a mission.</source>
+      <translation>この値は、ミッションに追加される新しい項目のデフォルト高度を指定します。</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>1枚または複数枚の写真を撮り始めます。</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation>オーディオ出力をミュート</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Interval</source>
-      <translation>間隔</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation>このオプションを有効にすると、すべての音声出力がミュートされます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Photo count</source>
-      <translation>写真枚数</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation>仮想ジョイスティックを表示</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop image capture</source>
-      <translation>画像キャプチャ停止</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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>このオプションを有効にすると、Fly Viewに仮想ジョイスティックが表示されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop taking photos.</source>
-      <translation>写真撮影を停止します。</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation>スロットル オートセンター</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger control</source>
-      <translation>トリガー制御</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation>有効にすると、スロットルスティックは離した際に中央位置へ戻ります。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start video capture</source>
-      <translation>動画撮影開始</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation>左ききモード</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start video capture.</source>
-      <translation>動画撮影を開始します。</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation>このオプションを有効にすると、仮想ジョイスティックのレイアウトが元に戻されます</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Status Frequency</source>
-      <translation>周波数ステータス</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation>ビデオストリーミングデバッグ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop video capture</source>
-      <translation>動画撮影停止</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Sets the environment variable GST_DEBUG for all pipeline elements on boot.</source>
+      <translation>起動時にすべてのパイプライン要素に対して環境変数【GST_DEBUG】を設定します。</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation>無効,エラー,警告,FixMe,情報,デバッグ,ログ,トレース</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop video capture.</source>
-      <translation>動画撮影を停止します。</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation>飛行前チェックリストの実施</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation>高遅延リンクの制御</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation>このオプションを有効にすると、飛行前チェックリストが使用されます。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation>パノラマ写真を作成</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation>機体をアームする前に飛行前チェックリストを通過する必要があります。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL Transition</source>
-      <translation>VTOL切り替え</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist must pass before arming.</source>
+      <translation>このオプションを有効にすると、期待をアームする前に飛行前チェックリストを通過する必要があります。</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>フライトモードの切り替えを行います。</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation>複数機体パネルを有効</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation>VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation>複数の機体が接続されている場合にマルチビークルパネルを有効にします。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation>マルチローター,固定翼機</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation>アプリケーションフォントサイズ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation>ゲートの状態</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation>使用される既定フォントのポイントサイズを示します。</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>ゲートに到達するまでミッション遂行状態にある機体を遅延させます。</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation>アプリケーション配色</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Ignore Alt</source>
-      <translation>高度を無視</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation>ユーザインターフェイスの配色設定を示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation>False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation>屋内,屋外</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Payload prepare deploy</source>
-      <translation>ペイロードの準備と展開</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation>アプリケーションの保存ディレクトリ</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Payload control deploy</source>
-      <translation>ペイロードの制御と展開</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation>すべてのデータファイルが保存 / 読み込みされるディレクトリ</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation>SDカードに保存</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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>変更なし,写真を撮る,写真を撮る(時間),写真を撮る(距離),写真撮影を停止,ビデオ録画を開始,ビデオ録画を停止</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation>アプリケーションデータはSDカードに保存されます</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation>Mapboxマップのアクセストークン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation>Mapboxマップ用の個人アクセストークンです</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation>Mapboxマップのアカウント名</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation>Mapboxマップ用の個人アカウント名です</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation>マップスタイルID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation>写真,ビデオ,調査</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation>MapboxマップのデザインスタイルIDです</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation>Esriマップのアクセストークン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation>Esriマップ用の個人アクセストークン</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation>カスタムマップURL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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>地上から離陸し、指定された高度まで上昇します。</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation>{x} {y} {z} または {zoom} の置換を利用するXYZマップのURLを示します。例: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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>指定した高度に離陸します。</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation>VWorld トークン</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>VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation>VWorldマップ用の個人アクセストークンです</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>VTOLモードを使用して着陸します。</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation>地上局 (GCS) の座標をオートパイロットに送信</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>設定</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation>設定しない,常時設定,フォローミーモード時</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation>ON,OFF</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation>言語</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>ピッチ</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation>すべてのデータ永続性を無効</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>ロール</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation>このオプションを設定すると、ディスクには何も保存されません。</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>ヨー</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Comma separated list of first run prompt ids which have already been shown.</source>
+      <translation>既に表示された初回実行プロンプトIDのカンマ区切りリストを示します。</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>有効</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation>AirLink ユーザ名</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation>有効,無効</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation>AirLink パスワード</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_ko_KR.ts b/translations/qgc_json_ko_KR.ts
index ebafa62cd372..7c541202a9d7 100644
--- a/translations/qgc_json_ko_KR.ts
+++ b/translations/qgc_json_ko_KR.ts
@@ -40,13 +40,13 @@
       <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>Take off from the ground and ascend to specified altitude.</translation>
+      <translation type="unfinished">Take off from the ground and ascend to specified altitude.</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>Takeoff to specified altitude.</translation>
+      <translation type="unfinished">Takeoff to specified altitude.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].category, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].category, </extracomment>
@@ -58,7 +58,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].description, </extracomment>
       <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
       <source>Land using VTOL mode.</source>
-      <translation>Land using VTOL mode.</translation>
+      <translation type="unfinished">Land using VTOL mode.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
@@ -392,7 +392,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <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>No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <translation type="unfinished">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
@@ -429,7 +429,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
       <source>Photo,Video,Survey</source>
-      <translation>Photo,Video,Survey</translation>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
   </context>
   <context>
@@ -633,7 +633,7 @@
       <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Planned home position for mission.</source>
-      <translation>Planned home position for mission.</translation>
+      <translation type="unfinished">Planned home position for mission.</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>
@@ -663,7 +663,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Travel to a position in 3D space.</source>
-      <translation>Travel to a position in 3D space.</translation>
+      <translation type="unfinished">Travel to a position in 3D space.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
@@ -675,13 +675,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Acceptance</source>
-      <translation>Acceptance</translation>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Pass Radius</source>
-      <translation>Pass Radius</translation>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
@@ -699,7 +699,7 @@
       <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 position indefinitely.</source>
-      <translation>Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</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>
@@ -711,57 +711,57 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter (turns)</source>
-      <translation>Loiter (turns)</translation>
+      <translation type="unfinished">Loiter (turns)</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 position for a number of turns.</source>
-      <translation>Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Turns</source>
-      <translation>Turns</translation>
+      <translation type="unfinished">Turns</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Leave Loiter</source>
-      <translation>Leave Loiter</translation>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Direction of next waypoint,Any direction</source>
-      <translation>Direction of next waypoint,Any direction</translation>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Exit loiter from</source>
-      <translation>Exit loiter from</translation>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Center,Tangent</source>
-      <translation>Center,Tangent</translation>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter (time)</source>
-      <translation>Loiter (time)</translation>
+      <translation type="unfinished">Loiter (time)</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 position for an amount of time.</source>
-      <translation>Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
@@ -774,7 +774,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Direction of next waypoint,Current direction</source>
-      <translation>Direction of next waypoint,Current direction</translation>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
@@ -786,7 +786,7 @@
       <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>Send the vehicle back to the launch position.</translation>
+      <translation type="unfinished">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
@@ -798,13 +798,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Land vehicle at the specified location.</source>
-      <translation>Land vehicle at the specified location.</translation>
+      <translation type="unfinished">Land vehicle at the specified location.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Abort Alt</source>
-      <translation>Abort Alt</translation>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
@@ -817,7 +817,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disabled,Opportunistic,Required</source>
-      <translation>Disabled,Opportunistic,Required</translation>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
@@ -829,25 +829,25 @@
       <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>Launch from the ground and travel towards the specified takeoff position.</translation>
+      <translation type="unfinished">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Land local</source>
-      <translation>Land local</translation>
+      <translation type="unfinished">Land local</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Takeoff local</source>
-      <translation>Takeoff local</translation>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Nav follow</source>
-      <translation>Nav follow</translation>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
@@ -859,13 +859,13 @@
       <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>Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <translation type="unfinished">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</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>Flight control</translation>
+      <translation type="unfinished">Flight control</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>
@@ -878,7 +878,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Climb,Neutral,Descend</source>
-      <translation>Climb,Neutral,Descend</translation>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
@@ -890,7 +890,7 @@
       <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>Loiter at specified position until altitude reached.</translation>
+      <translation type="unfinished">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
@@ -902,7 +902,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Vehicle reposition</source>
-      <translation>Vehicle reposition</translation>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
@@ -914,7 +914,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control autonomous path planning.</source>
-      <translation>Control autonomous path planning.</translation>
+      <translation type="unfinished">Control autonomous path planning.</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_GIMBAL_MANAGER_PITCHYAW].category, .mavCmdInfo[MAV_CMD_DO_GRIPPER].category, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].category, </extracomment>
@@ -926,51 +926,51 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Local planning</source>
-      <translation>Local planning</translation>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Enable,Enable+reset</source>
-      <translation>Disable,Enable,Enable+reset</translation>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Full planning</source>
-      <translation>Full planning</translation>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation>Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Heading goal</source>
-      <translation>Heading goal</translation>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Spline waypoint</source>
-      <translation>Spline waypoint</translation>
+      <translation type="unfinished">Spline waypoint</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>Travel to a position in 3D space using spline path.</translation>
+      <translation type="unfinished">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Altitude wait</source>
-      <translation>Altitude wait</translation>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
@@ -982,20 +982,20 @@
       <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>Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <translation type="unfinished">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Transition Heading</source>
-      <translation>Transition Heading</translation>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation>Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
@@ -1007,25 +1007,25 @@
       <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>Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <translation type="unfinished">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Approach Alt</source>
-      <translation>Approach Alt</translation>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Guided enable</source>
-      <translation>Guided enable</translation>
+      <translation type="unfinished">Guided enable</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>Enable/Disabled guided mode.</translation>
+      <translation type="unfinished">Enable/Disabled guided mode.</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].param1.label, </extracomment>
@@ -1080,43 +1080,43 @@
       <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>Delay the mission for the number of seconds.</translation>
+      <translation type="unfinished">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Wait for altitude</source>
-      <translation>Wait for altitude</translation>
+      <translation type="unfinished">Wait for altitude</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>Delay the mission until the specified altitide is reached.</translation>
+      <translation type="unfinished">Delay the mission until the specified altitide is reached.</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>Conditionals</translation>
+      <translation type="unfinished">Conditionals</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>Rate</translation>
+      <translation type="unfinished">Rate</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Wait for distance</source>
-      <translation>Wait for distance</translation>
+      <translation type="unfinished">Wait for distance</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>Delay the mission until within the specified distance of the next waypoint.</translation>
+      <translation type="unfinished">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].param1.label, .mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param1.label, </extracomment>
@@ -1128,13 +1128,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Wait for Yaw</source>
-      <translation>Wait for Yaw</translation>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Delay the mission until the specified heading is reached.</source>
-      <translation>Delay the mission until the specified heading is reached.</translation>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
@@ -1166,7 +1166,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Relative,Absolute</source>
-      <translation>Relative,Absolute</translation>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
@@ -1178,13 +1178,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set flight mode</source>
-      <translation>Set flight mode</translation>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set flight mode.</source>
-      <translation>Set flight mode.</translation>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
@@ -1196,25 +1196,25 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Sub Mode</source>
-      <translation>Sub Mode</translation>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Jump to item</source>
-      <translation>Jump to item</translation>
+      <translation type="unfinished">Jump to item</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>Mission will continue at the specified item.</translation>
+      <translation type="unfinished">Mission will continue at the specified item.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Item #</source>
-      <translation>Item #</translation>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
@@ -1232,7 +1232,7 @@
       <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>Change speed and/or throttle set points.</translation>
+      <translation type="unfinished">Change speed and/or throttle set points.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
@@ -1263,44 +1263,44 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set launch location</source>
-      <translation>Set launch location</translation>
+      <translation type="unfinished">Set launch location</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>Changes the launch location either to the current location or a specified location.</translation>
+      <translation type="unfinished">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Vehicle position,Specified position</source>
-      <translation>Vehicle position,Specified position</translation>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set Parameter</source>
-      <translation>Set Parameter</translation>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set relay</source>
-      <translation>Set relay</translation>
+      <translation type="unfinished">Set relay</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>Set relay to a condition.</translation>
+      <translation type="unfinished">Set relay to a condition.</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>Relay #</translation>
+      <translation type="unfinished">Relay #</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
@@ -1312,19 +1312,19 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cycle relay</source>
-      <translation>Cycle relay</translation>
+      <translation type="unfinished">Cycle relay</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>Cycle relay on/off for desired cycles/time.</translation>
+      <translation type="unfinished">Cycle relay on/off for desired cycles/time.</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>Cycles</translation>
+      <translation type="unfinished">Cycles</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].param3.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].param4.label, </extracomment>
@@ -1336,13 +1336,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set servo</source>
-      <translation>Set servo</translation>
+      <translation type="unfinished">Set servo</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>Set servo to specified PWM value.</translation>
+      <translation type="unfinished">Set servo to specified PWM value.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].param1.label, .mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].param1.label, </extracomment>
@@ -1360,7 +1360,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cycle servo</source>
-      <translation>Cycle servo</translation>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
@@ -1402,7 +1402,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Flight termination</source>
-      <translation>Flight termination</translation>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
@@ -1414,50 +1414,50 @@
       <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>Marker to indicate start of landing sequence.</translation>
+      <translation type="unfinished">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Rally land</source>
-      <translation>Rally land</translation>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Go around</source>
-      <translation>Go around</translation>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Reposition</source>
-      <translation>Reposition</translation>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Pause/Continue</source>
-      <translation>Pause/Continue</translation>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set moving direction</source>
-      <translation>Set moving direction</translation>
+      <translation type="unfinished">Set moving direction</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>Set moving direction to forward or reverse.</translation>
+      <translation type="unfinished">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Forward,Reverse</source>
-      <translation>Forward,Reverse</translation>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].friendlyName, </extracomment>
@@ -1469,7 +1469,7 @@
       <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>Sets the region of interest for cameras.</translation>
+      <translation type="unfinished">Sets the region of interest for cameras.</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>
@@ -1487,7 +1487,7 @@
       <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>Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <translation type="unfinished">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param5.label, </extracomment>
@@ -1517,26 +1517,26 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cancels the region of interest.</source>
-      <translation>Cancels the region of interest.</translation>
+      <translation type="unfinished">Cancels the region of interest.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control video</source>
-      <translation>Control video</translation>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Region of interest</source>
-      <translation>Region of interest</translation>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation>None,Next waypoint,Mission item,Location,ROI item</translation>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
@@ -1548,7 +1548,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>ROI Index</source>
-      <translation>ROI Index</translation>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
@@ -1560,7 +1560,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Configure onboard camera controller.</source>
-      <translation>Configure onboard camera controller.</translation>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
@@ -1572,7 +1572,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Aperture</source>
-      <translation>Aperture</translation>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
@@ -1584,7 +1584,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Exposure</source>
-      <translation>Exposure</translation>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param6.label, .mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param5.label, </extracomment>
@@ -1596,19 +1596,19 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cut off</source>
-      <translation>Cut off</translation>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Camera control</source>
-      <translation>Camera control</translation>
+      <translation type="unfinished">Camera control</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control onboard camera.</source>
-      <translation>Control onboard camera.</translation>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
@@ -1632,7 +1632,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Focus lock</source>
-      <translation>Focus lock</translation>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
@@ -1644,26 +1644,26 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Configure Mount</source>
-      <translation>Configure Mount</translation>
+      <translation type="unfinished">Configure Mount</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>Configure the vehicle mount (e.g. gimbal).</translation>
+      <translation type="unfinished">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stabilize Roll</source>
-      <translation>Stabilize Roll</translation>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
@@ -1676,43 +1676,43 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stabilize Pitch</source>
-      <translation>Stabilize Pitch</translation>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stabilize Yaw</source>
-      <translation>Stabilize Yaw</translation>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control Mount</source>
-      <translation>Control Mount</translation>
+      <translation type="unfinished">Control Mount</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>Control the vehicle mount (e.g. gimbal).</translation>
+      <translation type="unfinished">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Lat/Pitch</source>
-      <translation>Lat/Pitch</translation>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Lon/Roll</source>
-      <translation>Lon/Roll</translation>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Alt/Yaw</source>
-      <translation>Alt/Yaw</translation>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
@@ -1774,13 +1774,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Camera trigger distance</source>
-      <translation>Camera trigger distance</translation>
+      <translation type="unfinished">Camera trigger distance</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>Set camera trigger distance.</translation>
+      <translation type="unfinished">Set camera trigger distance.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
@@ -1799,19 +1799,19 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>No Trigger,Once Immediately</source>
-      <translation>No Trigger,Once Immediately</translation>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable geofence</source>
-      <translation>Enable geofence</translation>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable/Disable geofence.</source>
-      <translation>Enable/Disable geofence.</translation>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].category, .mavCmdInfo[MAV_CMD_DO_PARACHUTE].category, </extracomment>
@@ -1824,13 +1824,13 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Disable floor only,Enable</source>
-      <translation>Disable,Disable floor only,Enable</translation>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Trigger parachute</source>
-      <translation>Trigger parachute</translation>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
@@ -1843,7 +1843,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Enable,Release</source>
-      <translation>Disable,Enable,Release</translation>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
@@ -1855,13 +1855,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Inverted flight</source>
-      <translation>Inverted flight</translation>
+      <translation type="unfinished">Inverted flight</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>Change to/from inverted flight.</translation>
+      <translation type="unfinished">Change to/from inverted flight.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
@@ -1874,7 +1874,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Normal,Inverted</source>
-      <translation>Normal,Inverted</translation>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
@@ -1892,75 +1892,75 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Gripper id</source>
-      <translation>Gripper id</translation>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Action</source>
-      <translation>Action</translation>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Release,Grab</source>
-      <translation>Release,Grab</translation>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>AutoTune Enable</source>
-      <translation>AutoTune Enable</translation>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>AutoTune Enable.</source>
-      <translation>AutoTune Enable.</translation>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable,Disable</source>
-      <translation>Enable,Disable</translation>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Guided limits</source>
-      <translation>Guided limits</translation>
+      <translation type="unfinished">Guided limits</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>Set limits for external control</translation>
+      <translation type="unfinished">Set limits for external control</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Timeout</source>
-      <translation>Timeout</translation>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Min Alt</source>
-      <translation>Min Alt</translation>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Max Alt</source>
-      <translation>Max Alt</translation>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>H Limit</source>
-      <translation>H Limit</translation>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
@@ -1972,7 +1972,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set sensor offsets</source>
-      <translation>Set sensor offsets</translation>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
@@ -1984,19 +1984,19 @@
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Store parameters</source>
-      <translation>Store parameters</translation>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Reboot/Shutdown vehicle</source>
-      <translation>Reboot/Shutdown vehicle</translation>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Override goto</source>
-      <translation>Override goto</translation>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
@@ -2014,68 +2014,68 @@
       <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Get launch position</source>
-      <translation>Get launch position</translation>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Bind Spektrum receiver</source>
-      <translation>Bind Spektrum receiver</translation>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Get message interval</source>
-      <translation>Get message interval</translation>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set message interval</source>
-      <translation>Set message interval</translation>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Get capabilities</source>
-      <translation>Get capabilities</translation>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set camera modes</source>
-      <translation>Set camera modes</translation>
+      <translation type="unfinished">Set camera modes</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>Set camera photo, video modes.</translation>
+      <translation type="unfinished">Set camera photo, video modes.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Take photos,Record video,Survey photo mode</source>
-      <translation>Take photos,Record video,Survey photo mode</translation>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Start image capture</source>
-      <translation>Start image capture</translation>
+      <translation type="unfinished">Start image capture</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>Start taking one or more photos.</translation>
+      <translation type="unfinished">Start taking one or more photos.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Interval</source>
-      <translation>Interval</translation>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
@@ -2087,7 +2087,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stop image capture</source>
-      <translation>Stop image capture</translation>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
@@ -2099,7 +2099,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Trigger control</source>
-      <translation>Trigger control</translation>
+      <translation type="unfinished">Trigger control</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
@@ -2117,7 +2117,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Status Frequency</source>
-      <translation>Status Frequency</translation>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
@@ -2135,7 +2135,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control high latency link</source>
-      <translation>Control high latency link</translation>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
@@ -2153,7 +2153,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Perform flight mode transition.</source>
-      <translation>Perform flight mode transition.</translation>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
@@ -2166,44 +2166,44 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Multi Rotor,Fixed Wing</source>
-      <translation>Multi Rotor,Fixed Wing</translation>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Condition Gate</source>
-      <translation>Condition Gate</translation>
+      <translation type="unfinished">Condition Gate</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>Delay mission state machine until gate has been reached.</translation>
+      <translation type="unfinished">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Ignore Alt</source>
-      <translation>Ignore Alt</translation>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>False,True</source>
-      <translation>False,True</translation>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Payload prepare deploy</source>
-      <translation>Payload prepare deploy</translation>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Payload control deploy</source>
-      <translation>Payload control deploy</translation>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
   </context>
   <context>
@@ -2466,7 +2466,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/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>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <translation type="unfinished">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
@@ -3393,7 +3393,7 @@
       <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>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</translation>
+      <translation type="unfinished">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</translation>
     </message>
   </context>
   <context>
@@ -4687,7 +4687,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
@@ -4826,7 +4826,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
diff --git a/translations/qgc_json_nl_NL.ts b/translations/qgc_json_nl_NL.ts
index 17d2a3639a08..1047b11ead16 100644
--- a/translations/qgc_json_nl_NL.ts
+++ b/translations/qgc_json_nl_NL.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_nb_NO.ts b/translations/qgc_json_no_NO.ts
similarity index 99%
rename from translations/qgc_json_nb_NO.ts
rename to translations/qgc_json_no_NO.ts
index 9c3c71bea436..69bf5fead34c 100644
--- a/translations/qgc_json_nb_NO.ts
+++ b/translations/qgc_json_no_NO.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="nb" sourcelanguage="en">
+<TS version="2.1" language="no" sourcelanguage="en">
   <context>
     <name>GimbalFact.json</name>
     <message>
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_pl_PL.ts b/translations/qgc_json_pl_PL.ts
index c2482c416922..3e64a2bcb027 100644
--- a/translations/qgc_json_pl_PL.ts
+++ b/translations/qgc_json_pl_PL.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_pt_PT.ts b/translations/qgc_json_pt_PT.ts
index ba4a498463b4..6274ab93aff7 100644
--- a/translations/qgc_json_pt_PT.ts
+++ b/translations/qgc_json_pt_PT.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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>Decola do chão e ascende a altitude especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].description, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Takeoff to specified altitude.</source>
+      <translation>Decola para a altitude especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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>VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].description, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Land using VTOL mode.</source>
+      <translation>Pousa usando o modo VTOL.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation>Configuração</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation>Ligado,Desligado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation>Arfagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation>Rolagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>Guinada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>Ativa</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation>Ativar,Desativar</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot,PX4 Pro, Mavlink Genérico</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation>Asas Fixas,Multi-Rotor,VTOL,Rover,Sub,Mavlink Genérico</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation>Arfagem</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation>Desativado,Erro,Aviso,Corrigir,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation>Interior,exterior</translation>
+      <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>Nenhuma mudança,Tirar foto,Tirar fotos (tempo),Tirar fotos (distância),Parar de tirar fotos,Iniciar gravação de vídeo,Parar gravação de vídeo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation>Foto,Vídeo,Pesquisa</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation>Guinada</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation>Nunca,Sempre,Quando no modo de voo Siga-me</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
     </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
   </context>
   <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation>ChibiOS,NuttX</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation>Multi-Rotor,Helicóptero,Avião,Rover,Sub</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>FlightMode.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation>Posição Inicial</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation>Posição inicial planejada para missão.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <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>Básico</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation>Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation>Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation>Ponto de passagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Travel to a position in 3D space.</source>
+      <translation>Viaja para uma posição no espaço 3D.</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation>Aguarda</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation>Aceitação</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation>Raio de Passagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation>Guinada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <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>Loiter</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 position indefinitely.</source>
+      <translation>Viaja para uma posição e permanece no modo Loiter ao redor da posição especificada indefinitivamente.</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>Raio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation>Loiter (voltas)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <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 position for a number of turns.</source>
+      <translation>Viaja para uma posição e permanece no modo Loiter ao redor da posição especificada por um número de voltas.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Turns</source>
+      <translation>Voltas</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation>Sai do modo Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation>Direção do próximo ponto,Qualquer direção</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation>Sai do modo Loiter de</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation>Centro,Tangente</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation>Loiter (tempo)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <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 position for an amount of time.</source>
+      <translation>Viaja para um posição e permanece no modo Loiter ao redor da posição especificada por uma quantidade de tempo.</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>Controlado por Veículo,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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation>Tempo Loiter</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation>Direção do próximo ponto,Direção atual</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation>Retornar para Posição Inicial</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <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>Envia o veículo de volta para o local de decolagem.</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation>Pousar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land vehicle at the specified location.</source>
+      <translation>Pousa o veículo na posição especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation>Interrompe Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation>Pouso com Precisão</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation>Desativado,Oportunista,Obrigatório</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation>Decolar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <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>Decola do chão e voa até a posição  especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation>Local de pouso</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation>Local de decolagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation>Seguir Nav</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation>Mudar altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <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>Continua no curso atual e sobe/desce até a altitude especificada. Quando a altitude for atingida continua para o próximo comando.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <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>Controle de voo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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>Modo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation>Sobe,Neutro,Desce</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation>Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <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>Permanece no modo Loiter na posição especificada até a altitude ser alcançada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation>Siga-me</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation>Reposicionamento do veículo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation>Planejamento do caminho</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation>Controla o planejamento autonômo do caminho.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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>Avançado</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation>Planejamento local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation>Desabilita,Habilita,Habilita+redefine</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation>Planejamento completo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation>Desativado,Ativado,Habilitar+redefine,Habilita+redefine o caminho apenas</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation>Objetivo de direção</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation>Ponto Curva Spline</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <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>Viaja para uma posição no espaço 3D usando um caminho spline.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation>Espera Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation>Decola VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <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>Voe lentamente até a altitude especificada, mude para asa-fixa e voe até a localização de decolagem especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation>Transição de Direção</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation>Padrão, Próximo ponto,Decolar,Especificado,Qualquer</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation>Pousa VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <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>Voa na altitude atual até a localização especificada, muda para multi-rotor e pousa.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation>Alt de Aproximação</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation>Modo guiado habilitado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation>Ativar/desativar modo guiado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation>Ativar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation>Ligado,Desligado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation>Esperar até</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation>Hora (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation>Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation>Segs (utc)</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation>Atraso</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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>Pausa a missão por um número de segundos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation>Espera por altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <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>Pausa a missão até a altitude especificada for atingida.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <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>Condições</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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>Taxa</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation>Espera por distância</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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>Pausa a missão até estar dentro da distância especificada do próximo ponto.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <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>Distância</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation>Espera por Guinada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation>Pausa a missão até a direção especificada ser atingida.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation>Direção</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <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>Direção</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <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>Deslocamento</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation>Relativo,Absoluto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation>Define modo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation>Define modo de voo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation>Define modo de voo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation>Modo Personalizado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation>mkv,mov,mp4</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation>Modo Sub</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation>Pula para o item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission will continue at the specified item.</source>
+      <translation>A Missão irá continuar a partir do item especificado.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation>Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation>Repetir</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation>Altera velocidade</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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>Altera velocidade e/ou aceleração.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation>Tipo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation>Velocidade</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation>Acelerador</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation>Define local de decolagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <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>Muda o local de decolagem ou para a localização atual ou para uma localização especificada.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation>Posição do veículo,Posição especificada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation>Define Parâmetro</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation>Definir relé</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay to a condition.</source>
+      <translation>Definir uma condição para o relé.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <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>Relé #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation>Valor</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation>Ciclo relé</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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>Ciclo on/off do relé pelo número desejado de ciclos/tempo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <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>Ciclos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <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>Tempo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation>Definir servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <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>Define servo para o valor PWM especificado.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <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>Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <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>PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation>Ciclo do servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation>Interrompe o voo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation>Inicia pouso</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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>Marcador para indicar o início da sequência de pouso.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation>Dá a volta</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation>Reposiciona</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation>Pausar/Continuar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation>Definir direção do movimento</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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>Definir direção de movimento para frente ou para trás.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation>Para frente,Para trás</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_LOCATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest (ROI)</source>
+      <translation>Região de interesse (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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>Define a região de interesse para as câmeras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <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>Câmera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI to next waypoint</source>
+      <translation>ROI para próxima ponto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <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>Define que a região de interesse aponte em direção ao próximo ponto com deslocamentos opcionais.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch offset</source>
+      <translation>Deslocamento Arfagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Roll offset</source>
+      <translation>Deslocamento rolagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw offset</source>
+      <translation>Deslocamento guinada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation>Cancela ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancels the region of interest.</source>
+      <translation>Cancela a região de interesse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation>Controla vídeo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation>Região de interesse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation>Nenhum,Próximo Ponto,Item da Missão,Localização,Item ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation>Índice da Missão</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation>Índice do ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation>Configuração da câmera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation>Configurar controlador da câmera a bordo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation>Velocidade do Obturador</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation>Abertura</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation>ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation>Exposição</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <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>Comando</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation>Cortar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation>Controle da câmera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation>Controla a câmera a bordo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation>Sessão</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation>Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation>Passo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation>Travamento do Foco</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation>Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation>Retrair,Neutro,Alvejando Mavlink,Alvejando RC, Ponto GPS</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation>Estabilizar Rolagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation>Não,Sim</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation>Estabilizar Arfagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation>Estabilizar Guinada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation>Lat/Arfagem</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation>Lon/Rolagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation>Alt/Guinada</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera trigger distance</source>
+      <translation>Distância do gatilho da câmera</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera trigger distance.</source>
+      <translation>Define a distância do gatilho da câmera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation>Obturador</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <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>Gatilho</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation>Não há Gatilho,Uma vez imediatamente</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation>Ativa geocerca</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation>Ativar/desativar geocerca.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <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>Segurança</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation>Desativar,Desabilitar apenas o andar,Ativar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation>Ativa paraquedas</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation>n/a,Todos os Sistemas de Voo,Propulsão,Aviônica,Carga</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation>Desabilitar,Habilitar,Liberar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation>Teste do motor</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation>Voo invertido</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change to/from inverted flight.</source>
+      <translation>Mudar para/de voo invertido.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation>Invertido</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation>Normal,Invertido</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation>Garra id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation>Ação</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation>n/a,Ok,Baixo,Crítico,Emergência,Falhou,Doente,Carregando</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation>Liberar,Agarrar</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation>Habilita AutoTune</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation>Habilita AutoTune.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation>Ativar,Desativar</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation>Limites modo Guiado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set limits for external control</source>
+      <translation>Define limites para controle externo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation>Tempo limite</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation>Mín Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation>Máx Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation>limite H</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation>Calibração</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation>Define deslocamentos do sensor</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation>Configura UAVCAN</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation>Salva parâmetros</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation>Reinicia/desliga o veículo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation>Sobrepor vá para</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation>Início da missão</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation>Armar/Desarmar</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation>Obter posição inicial</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (flutuante),3D RTK GPS Lock (fixo),Estático (fixo)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation>Vincular recepetor Spektrum</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation>Obter intervalo da mensagem</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation>Definir intervalo da mensagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation>Obter recursos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation>Definir modos da câmera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera photo, video modes.</source>
+      <translation>Definir foto da câmera, modos de vídeo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation>Tirar fotos,Gravar vídeo,Modo de fotografia</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation>Iniciar captura de imagem</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start taking one or more photos.</source>
+      <translation>Comece a tirar uma ou mais fotos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation>Intervalo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation>Contagem de fotos</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation>Parar captura de imagem</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation>Parar de tirar fotos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation>Controles do Gatilho</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation>Iniciar captura de vídeo</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation>Iniciar a captura de vídeo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation>Frequência do Estado</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation>Parar captura de vídeo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation>Parar captura de vídeo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation>Controla ligação de alta latência</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation>Cria panorama</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation>Transição VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation>Realiza transição do modo de voo.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation>VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation>Multi Rotor,Asa Fixa</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation>Condição do Portão</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <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>Pausar máquina de estado da missão até o portão ser atingido.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation>Ignorar Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation>Falso,Verdadeiro</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation>Prepara lançamento da carga</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation>Configurações do lançamento da carga</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
-  </context>
-  <context>
-    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
-  </context>
-  <context>
-    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
+  </context>
+  <context>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
+  </context>
+  <context>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation>Desativado,Ativado</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
     </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation>Desativado,Ativado,Indisponível</translation>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation>Norte,Sul</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetpointFact.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (flutuante),3D RTK GPS Lock (fixo),Estático (fixo)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation>Desativado,Ativado</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation>Norte,Sul</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation>Desativado,Ativado,Indisponível</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation>Guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation>Arfagem</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation>n/a,Todos os Sistemas de Voo,Propulsão,Aviônica,Carga</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation>n/a,Ok,Baixo,Crítico,Emergência,Falhou,Doente,Carregando</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation>Posição Inicial</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation>Posição inicial planejada para missão.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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>Básico</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation>Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation>Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation>Ponto de passagem</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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>Viaja para uma posição no espaço 3D.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation>Aguarda</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation>Aceitação</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation>Raio de Passagem</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation>Guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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>Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation>Viaja para uma posição e permanece no modo Loiter ao redor da posição especificada indefinitivamente.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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>Raio</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (turns)</source>
-      <translation>Loiter (voltas)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation>Viaja para uma posição e permanece no modo Loiter ao redor da posição especificada por um número de voltas.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Turns</source>
-      <translation>Voltas</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation>Sai do modo Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation>Direção do próximo ponto,Qualquer direção</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation>Sai do modo Loiter de</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation>Centro,Tangente</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (time)</source>
-      <translation>Loiter (tempo)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation>Viaja para um posição e permanece no modo Loiter ao redor da posição especificada por uma quantidade de tempo.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation>Tempo Loiter</translation>
+      <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>Controlado por Veículo,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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation>Direção do próximo ponto,Direção atual</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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>Retornar para Posição Inicial</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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>Envia o veículo de volta para o local de decolagem.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation>Pousar</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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>Pousa o veículo na posição especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Abort Alt</source>
-      <translation>Interrompe Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation>Pouso com Precisão</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation>Desativado,Oportunista,Obrigatório</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation>Decolar</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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>Decola do chão e voa até a posição  especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land local</source>
-      <translation>Local de pouso</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff local</source>
-      <translation>Local de decolagem</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation>Seguir Nav</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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>Mudar altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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>Continua no curso atual e sobe/desce até a altitude especificada. Quando a altitude for atingida continua para o próximo comando.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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>Controle de voo</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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>Modo</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation>Sobe,Neutro,Desce</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter (altitude)</source>
-      <translation>Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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>Permanece no modo Loiter na posição especificada até a altitude ser alcançada.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation>Siga-me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle reposition</source>
-      <translation>Reposicionamento do veículo</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation>Planejamento do caminho</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control autonomous path planning.</source>
-      <translation>Controla o planejamento autonômo do caminho.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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>Avançado</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Local planning</source>
-      <translation>Planejamento local</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation>Desabilita,Habilita,Habilita+redefine</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Full planning</source>
-      <translation>Planejamento completo</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation>Desativado,Ativado,Habilitar+redefine,Habilita+redefine o caminho apenas</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading goal</source>
-      <translation>Objetivo de direção</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Spline waypoint</source>
-      <translation>Ponto Curva Spline</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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>Viaja para uma posição no espaço 3D usando um caminho spline.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Altitude wait</source>
-      <translation>Espera Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL takeoff</source>
-      <translation>Decola VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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>Voe lentamente até a altitude especificada, mude para asa-fixa e voe até a localização de decolagem especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation>Transição de Direção</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation>Padrão, Próximo ponto,Decolar,Especificado,Qualquer</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL land</source>
-      <translation>Pousa VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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>Voa na altitude atual até a localização especificada, muda para multi-rotor e pousa.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation>Alt de Aproximação</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided enable</source>
-      <translation>Modo guiado habilitado</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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>Ativar/desativar modo guiado</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>Ativar</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation>Ligado,Desligado</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation>Esperar até</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hour (utc)</source>
-      <translation>Hora (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation>Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sec (utc)</source>
-      <translation>Segs (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation>Atraso</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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>Pausa a missão por um número de segundos.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for altitude</source>
-      <translation>Espera por altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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>Pausa a missão até a altitude especificada for atingida.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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>Condições</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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>Taxa</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for distance</source>
-      <translation>Espera por distância</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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>Pausa a missão até estar dentro da distância especificada do próximo ponto.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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>Distância</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Wait for Yaw</source>
-      <translation>Espera por Guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation>Pausa a missão até a direção especificada ser atingida.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation>Direção</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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>Direção</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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>Deslocamento</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation>Relativo,Absoluto</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set mode</source>
-      <translation>Define modo</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode</source>
-      <translation>Define modo de voo</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set flight mode.</source>
-      <translation>Define modo de voo.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Custom Mode</source>
-      <translation>Modo Personalizado</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Sub Mode</source>
-      <translation>Modo Sub</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Jump to item</source>
-      <translation>Pula para o item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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>A Missão irá continuar a partir do item especificado.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation>Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation>Repetir</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change speed</source>
-      <translation>Altera velocidade</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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>Altera velocidade e/ou aceleração.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Type</source>
-      <translation>Tipo</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Speed</source>
-      <translation>Velocidade</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation>Acelerador</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set launch location</source>
-      <translation>Define local de decolagem</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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>Muda o local de decolagem ou para a localização atual ou para uma localização especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation>Posição do veículo,Posição especificada</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation>Define Parâmetro</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set relay</source>
-      <translation>Definir relé</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation>ChibiOS,NuttX</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>Definir uma condição para o relé.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation>Multi-Rotor,Helicóptero,Avião,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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>Relé #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Value</source>
-      <translation>Valor</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle relay</source>
-      <translation>Ciclo relé</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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>Ciclo on/off do relé pelo número desejado de ciclos/tempo.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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>Ciclos</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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>Tempo</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set servo</source>
-      <translation>Definir servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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>Define servo para o valor PWM especificado.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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>Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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>PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cycle servo</source>
-      <translation>Ciclo do servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation>Interrompe o voo</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land start</source>
-      <translation>Inicia pouso</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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>Marcador para indicar o início da sequência de pouso.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Go around</source>
-      <translation>Dá a volta</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation>Reposiciona</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pause/Continue</source>
-      <translation>Pausar/Continuar</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set moving direction</source>
-      <translation>Definir direção do movimento</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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>Definir direção de movimento para frente ou para trás.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation>Para frente,Para trás</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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>Região de interesse (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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>Define a região de interesse para as câmeras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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>Câmera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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>ROI para próxima ponto</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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>Define que a região de interesse aponte em direção ao próximo ponto com deslocamentos opcionais.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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>Deslocamento Arfagem</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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>Deslocamento rolagem</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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>Deslocamento guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cancel ROI</source>
-      <translation>Cancela ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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>Cancela a região de interesse.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control video</source>
-      <translation>Controla vídeo</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Region of interest</source>
-      <translation>Região de interesse</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation>Nenhum,Próximo Ponto,Item da Missão,Localização,Item ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation>Índice da Missão</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>ROI Index</source>
-      <translation>Índice do ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Camera config</source>
-      <translation>Configuração da câmera</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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>Configurar controlador da câmera a bordo.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Shutter spd</source>
-      <translation>Velocidade do Obturador</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Aperture</source>
-      <translation>Abertura</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>ISO</source>
-      <translation>ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation>Exposição</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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>Comando</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation>Cortar</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Camera control</source>
-      <translation>Controle da câmera</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation>Controla a câmera a bordo.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Session</source>
-      <translation>Sessão</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Zoom</source>
-      <translation>Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Step</source>
-      <translation>Passo</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Focus lock</source>
-      <translation>Travamento do Foco</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Id</source>
-      <translation>Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation>Retrair,Neutro,Alvejando Mavlink,Alvejando RC, Ponto GPS</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Roll</source>
-      <translation>Estabilizar Rolagem</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation>Não,Sim</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Pitch</source>
-      <translation>Estabilizar Arfagem</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stabilize Yaw</source>
-      <translation>Estabilizar Guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lat/Pitch</source>
-      <translation>Lat/Arfagem</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Lon/Roll</source>
-      <translation>Lon/Rolagem</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Alt/Yaw</source>
-      <translation>Alt/Guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation>mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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>Distância do gatilho da câmera</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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>Define a distância do gatilho da câmera</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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>Obturador</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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>Gatilho</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation>Não há Gatilho,Uma vez imediatamente</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable geofence</source>
-      <translation>Ativa geocerca</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation>Ativar/desativar geocerca.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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>Segurança</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation>Desativar,Desabilitar apenas o andar,Ativar</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation>Ativa paraquedas</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation>Desabilitar,Habilitar,Liberar</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Motor test</source>
-      <translation>Teste do motor</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Inverted flight</source>
-      <translation>Voo invertido</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Change to/from inverted flight.</source>
-      <translation>Mudar para/de voo invertido.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Inverted</source>
-      <translation>Invertido</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation>Normal,Invertido</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper id</source>
-      <translation>Garra id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation>Ação</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation>Liberar,Agarrar</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>AutoTune Enable</source>
-      <translation>Habilita AutoTune</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>AutoTune Enable.</source>
-      <translation>Habilita AutoTune.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation>Ativar,Desativar</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation>Limites modo Guiado</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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>Define limites para controle externo</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Timeout</source>
-      <translation>Tempo limite</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min Alt</source>
-      <translation>Mín Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation>Máx Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>H Limit</source>
-      <translation>limite H</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation>Calibração</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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>Define deslocamentos do sensor</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation>ArduPilot,PX4 Pro, Mavlink Genérico</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation>Configura UAVCAN</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation>Salva parâmetros</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation>Asas Fixas,Multi-Rotor,VTOL,Rover,Sub,Mavlink Genérico</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reboot/Shutdown vehicle</source>
-      <translation>Reinicia/desliga o veículo</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation>Sobrepor vá para</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation>Início da missão</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Arm/Disarm</source>
-      <translation>Armar/Desarmar</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get launch position</source>
-      <translation>Obter posição inicial</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Bind Spektrum receiver</source>
-      <translation>Vincular recepetor Spektrum</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get message interval</source>
-      <translation>Obter intervalo da mensagem</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set message interval</source>
-      <translation>Definir intervalo da mensagem</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Get capabilities</source>
-      <translation>Obter recursos</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set camera modes</source>
-      <translation>Definir modos da câmera</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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>Definir foto da câmera, modos de vídeo.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation>Tirar fotos,Gravar vídeo,Modo de fotografia</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start image capture</source>
-      <translation>Iniciar captura de imagem</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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>Comece a tirar uma ou mais fotos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Interval</source>
-      <translation>Intervalo</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Photo count</source>
-      <translation>Contagem de fotos</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop image capture</source>
-      <translation>Parar captura de imagem</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop taking photos.</source>
-      <translation>Parar de tirar fotos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger control</source>
-      <translation>Controles do Gatilho</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start video capture</source>
-      <translation>Iniciar captura de vídeo</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Start video capture.</source>
-      <translation>Iniciar a captura de vídeo.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Status Frequency</source>
-      <translation>Frequência do Estado</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop video capture</source>
-      <translation>Parar captura de vídeo</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation>Desativado,Erro,Aviso,Corrigir,Info,Debug,Log,Trace</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Stop video capture.</source>
-      <translation>Parar captura de vídeo.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation>Controla ligação de alta latência</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation>Cria panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL Transition</source>
-      <translation>Transição VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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>Realiza transição do modo de voo.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation>VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation>Multi Rotor,Asa Fixa</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation>Condição do Portão</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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>Pausar máquina de estado da missão até o portão ser atingido.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Ignore Alt</source>
-      <translation>Ignorar Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation>Falso,Verdadeiro</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation>Interior,exterior</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Payload prepare deploy</source>
-      <translation>Prepara lançamento da carga</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Payload control deploy</source>
-      <translation>Configurações do lançamento da carga</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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>Nenhuma mudança,Tirar foto,Tirar fotos (tempo),Tirar fotos (distância),Parar de tirar fotos,Iniciar gravação de vídeo,Parar gravação de vídeo</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation>Foto,Vídeo,Pesquisa</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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>Decola do chão e ascende a altitude especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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>Decola para a altitude especificada.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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>VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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>Pousa usando o modo VTOL.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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>Configuração</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation>Nunca,Sempre,Quando no modo de voo Siga-me</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation>Ligado,Desligado</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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>Arfagem</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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>Rolagem</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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>Guinada</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation>Ativa</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation>Ativar,Desativar</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_ru_RU.ts b/translations/qgc_json_ru_RU.ts
index eb24fc90c8d3..8ded7bee076c 100644
--- a/translations/qgc_json_ru_RU.ts
+++ b/translations/qgc_json_ru_RU.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_sv_SE.ts b/translations/qgc_json_sv_SE.ts
index 4916d626b311..79ae6c1be79d 100644
--- a/translations/qgc_json_sv_SE.ts
+++ b/translations/qgc_json_sv_SE.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_tr_TR.ts b/translations/qgc_json_tr_TR.ts
index 2c8db4f76744..292bbe09210d 100644
--- a/translations/qgc_json_tr_TR.ts
+++ b/translations/qgc_json_tr_TR.ts
@@ -40,69 +40,69 @@
       <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>Take off from the ground and ascend to specified altitude.</translation>
+      <translation type="unfinished">Take off from the ground and ascend to specified altitude.</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>Takeoff to specified altitude.</translation>
+      <translation type="unfinished">Takeoff to specified altitude.</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>VTOL</translation>
+      <translation type="unfinished">VTOL</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>Land using VTOL mode.</translation>
+      <translation type="unfinished">Land using VTOL mode.</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>Setting</translation>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
       <source>On,Off</source>
-      <translation>On,Off</translation>
+      <translation type="unfinished">On,Off</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>Pitch</translation>
+      <translation type="unfinished">Pitch</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>Roll</translation>
+      <translation type="unfinished">Roll</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>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
       <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
       <source>Enable</source>
-      <translation>Enable</translation>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
       <source>Enable,Disable</source>
-      <translation>Enable,Disable</translation>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
   </context>
   <context>
@@ -261,7 +261,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
   </context>
   <context>
@@ -391,7 +391,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <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>No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <translation type="unfinished">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
@@ -428,7 +428,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
       <source>Photo,Video,Survey</source>
-      <translation>Photo,Video,Survey</translation>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
   </context>
   <context>
@@ -479,7 +479,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
   </context>
   <context>
@@ -626,424 +626,424 @@
       <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Home Position</source>
-      <translation>Home Position</translation>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Planned home position for mission.</source>
-      <translation>Planned home position for mission.</translation>
+      <translation type="unfinished">Planned home position for mission.</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>Basic</translation>
+      <translation type="unfinished">Basic</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Latitude</source>
-      <translation>Latitude</translation>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Longitude</source>
-      <translation>Longitude</translation>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Waypoint</source>
-      <translation>Waypoint</translation>
+      <translation type="unfinished">Waypoint</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>Travel to a position in 3D space.</translation>
+      <translation type="unfinished">Travel to a position in 3D space.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Hold</source>
-      <translation>Hold</translation>
+      <translation type="unfinished">Hold</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Acceptance</source>
-      <translation>Acceptance</translation>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Pass Radius</source>
-      <translation>Pass Radius</translation>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</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>Loiter</translation>
+      <translation type="unfinished">Loiter</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 position indefinitely.</source>
-      <translation>Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</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>Radius</translation>
+      <translation type="unfinished">Radius</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter (turns)</source>
-      <translation>Loiter (turns)</translation>
+      <translation type="unfinished">Loiter (turns)</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 position for a number of turns.</source>
-      <translation>Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Turns</source>
-      <translation>Turns</translation>
+      <translation type="unfinished">Turns</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Leave Loiter</source>
-      <translation>Leave Loiter</translation>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Direction of next waypoint,Any direction</source>
-      <translation>Direction of next waypoint,Any direction</translation>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Exit loiter from</source>
-      <translation>Exit loiter from</translation>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Center,Tangent</source>
-      <translation>Center,Tangent</translation>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter (time)</source>
-      <translation>Loiter (time)</translation>
+      <translation type="unfinished">Loiter (time)</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 position for an amount of time.</source>
-      <translation>Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter Time</source>
-      <translation>Loiter Time</translation>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Direction of next waypoint,Current direction</source>
-      <translation>Direction of next waypoint,Current direction</translation>
+      <translation type="unfinished">Direction of next waypoint,Current direction</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>Return To Launch</translation>
+      <translation type="unfinished">Return To Launch</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>Send the vehicle back to the launch position.</translation>
+      <translation type="unfinished">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Land</source>
-      <translation>Land</translation>
+      <translation type="unfinished">Land</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>Land vehicle at the specified location.</translation>
+      <translation type="unfinished">Land vehicle at the specified location.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Abort Alt</source>
-      <translation>Abort Alt</translation>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Precision Land</source>
-      <translation>Precision Land</translation>
+      <translation type="unfinished">Precision Land</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disabled,Opportunistic,Required</source>
-      <translation>Disabled,Opportunistic,Required</translation>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</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>Launch from the ground and travel towards the specified takeoff position.</translation>
+      <translation type="unfinished">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Land local</source>
-      <translation>Land local</translation>
+      <translation type="unfinished">Land local</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Takeoff local</source>
-      <translation>Takeoff local</translation>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Nav follow</source>
-      <translation>Nav follow</translation>
+      <translation type="unfinished">Nav follow</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>Change Altitude</translation>
+      <translation type="unfinished">Change Altitude</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>Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <translation type="unfinished">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</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>Flight control</translation>
+      <translation type="unfinished">Flight control</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>Mode</translation>
+      <translation type="unfinished">Mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Climb,Neutral,Descend</source>
-      <translation>Climb,Neutral,Descend</translation>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter (altitude)</source>
-      <translation>Loiter (altitude)</translation>
+      <translation type="unfinished">Loiter (altitude)</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>Loiter at specified position until altitude reached.</translation>
+      <translation type="unfinished">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Follow Me</source>
-      <translation>Follow Me</translation>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Vehicle reposition</source>
-      <translation>Vehicle reposition</translation>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Path planning</source>
-      <translation>Path planning</translation>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control autonomous path planning.</source>
-      <translation>Control autonomous path planning.</translation>
+      <translation type="unfinished">Control autonomous path planning.</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_GIMBAL_MANAGER_PITCHYAW].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>Advanced</translation>
+      <translation type="unfinished">Advanced</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Local planning</source>
-      <translation>Local planning</translation>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Enable,Enable+reset</source>
-      <translation>Disable,Enable,Enable+reset</translation>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Full planning</source>
-      <translation>Full planning</translation>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation>Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Heading goal</source>
-      <translation>Heading goal</translation>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Spline waypoint</source>
-      <translation>Spline waypoint</translation>
+      <translation type="unfinished">Spline waypoint</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>Travel to a position in 3D space using spline path.</translation>
+      <translation type="unfinished">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Altitude wait</source>
-      <translation>Altitude wait</translation>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>VTOL takeoff</source>
-      <translation>VTOL takeoff</translation>
+      <translation type="unfinished">VTOL takeoff</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>Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <translation type="unfinished">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Transition Heading</source>
-      <translation>Transition Heading</translation>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation>Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>VTOL land</source>
-      <translation>VTOL land</translation>
+      <translation type="unfinished">VTOL land</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>Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <translation type="unfinished">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Approach Alt</source>
-      <translation>Approach Alt</translation>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Guided enable</source>
-      <translation>Guided enable</translation>
+      <translation type="unfinished">Guided enable</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>Enable/Disabled guided mode.</translation>
+      <translation type="unfinished">Enable/Disabled guided mode.</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].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable</source>
-      <translation>Enable</translation>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>On,Off</source>
-      <translation>On,Off</translation>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Delay until</source>
-      <translation>Delay until</translation>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
@@ -1055,97 +1055,97 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Hour (utc)</source>
-      <translation>Hour (utc)</translation>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Min (utc)</source>
-      <translation>Min (utc)</translation>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Sec (utc)</source>
-      <translation>Sec (utc)</translation>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Delay</source>
-      <translation>Delay</translation>
+      <translation type="unfinished">Delay</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>Delay the mission for the number of seconds.</translation>
+      <translation type="unfinished">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Wait for altitude</source>
-      <translation>Wait for altitude</translation>
+      <translation type="unfinished">Wait for altitude</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>Delay the mission until the specified altitide is reached.</translation>
+      <translation type="unfinished">Delay the mission until the specified altitide is reached.</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>Conditionals</translation>
+      <translation type="unfinished">Conditionals</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>Rate</translation>
+      <translation type="unfinished">Rate</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Wait for distance</source>
-      <translation>Wait for distance</translation>
+      <translation type="unfinished">Wait for distance</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>Delay the mission until within the specified distance of the next waypoint.</translation>
+      <translation type="unfinished">Delay the mission until within the specified distance of the next waypoint.</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>Distance</translation>
+      <translation type="unfinished">Distance</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Wait for Yaw</source>
-      <translation>Wait for Yaw</translation>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Delay the mission until the specified heading is reached.</source>
-      <translation>Delay the mission until the specified heading is reached.</translation>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Heading</source>
-      <translation>Heading</translation>
+      <translation type="unfinished">Heading</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>Direction</translation>
+      <translation type="unfinished">Direction</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
@@ -1158,86 +1158,86 @@
       <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>Offset</translation>
+      <translation type="unfinished">Offset</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Relative,Absolute</source>
-      <translation>Relative,Absolute</translation>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set mode</source>
-      <translation>Set mode</translation>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set flight mode</source>
-      <translation>Set flight mode</translation>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set flight mode.</source>
-      <translation>Set flight mode.</translation>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Custom Mode</source>
-      <translation>Custom Mode</translation>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Sub Mode</source>
-      <translation>Sub Mode</translation>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Jump to item</source>
-      <translation>Jump to item</translation>
+      <translation type="unfinished">Jump to item</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>Mission will continue at the specified item.</translation>
+      <translation type="unfinished">Mission will continue at the specified item.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Item #</source>
-      <translation>Item #</translation>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Repeat</source>
-      <translation>Repeat</translation>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Change speed</source>
-      <translation>Change speed</translation>
+      <translation type="unfinished">Change speed</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>Change speed and/or throttle set points.</translation>
+      <translation type="unfinished">Change speed and/or throttle set points.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Type</source>
-      <translation>Type</translation>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
@@ -1250,116 +1250,116 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Speed</source>
-      <translation>Speed</translation>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Throttle</source>
-      <translation>Throttle</translation>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set launch location</source>
-      <translation>Set launch location</translation>
+      <translation type="unfinished">Set launch location</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>Changes the launch location either to the current location or a specified location.</translation>
+      <translation type="unfinished">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Vehicle position,Specified position</source>
-      <translation>Vehicle position,Specified position</translation>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set Parameter</source>
-      <translation>Set Parameter</translation>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set relay</source>
-      <translation>Set relay</translation>
+      <translation type="unfinished">Set relay</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>Set relay to a condition.</translation>
+      <translation type="unfinished">Set relay to a condition.</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>Relay #</translation>
+      <translation type="unfinished">Relay #</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Value</source>
-      <translation>Value</translation>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cycle relay</source>
-      <translation>Cycle relay</translation>
+      <translation type="unfinished">Cycle relay</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>Cycle relay on/off for desired cycles/time.</translation>
+      <translation type="unfinished">Cycle relay on/off for desired cycles/time.</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>Cycles</translation>
+      <translation type="unfinished">Cycles</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>Time</translation>
+      <translation type="unfinished">Time</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set servo</source>
-      <translation>Set servo</translation>
+      <translation type="unfinished">Set servo</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>Set servo to specified PWM value.</translation>
+      <translation type="unfinished">Set servo to specified PWM value.</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>Servo</translation>
+      <translation type="unfinished">Servo</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>PWM</translation>
+      <translation type="unfinished">PWM</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cycle servo</source>
-      <translation>Cycle servo</translation>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
@@ -1401,317 +1401,317 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Flight termination</source>
-      <translation>Flight termination</translation>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Land start</source>
-      <translation>Land start</translation>
+      <translation type="unfinished">Land start</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>Marker to indicate start of landing sequence.</translation>
+      <translation type="unfinished">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Rally land</source>
-      <translation>Rally land</translation>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Go around</source>
-      <translation>Go around</translation>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Reposition</source>
-      <translation>Reposition</translation>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Pause/Continue</source>
-      <translation>Pause/Continue</translation>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set moving direction</source>
-      <translation>Set moving direction</translation>
+      <translation type="unfinished">Set moving direction</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>Set moving direction to forward or reverse.</translation>
+      <translation type="unfinished">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Forward,Reverse</source>
-      <translation>Forward,Reverse</translation>
+      <translation type="unfinished">Forward,Reverse</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>Region of interest (ROI)</translation>
+      <translation type="unfinished">Region of interest (ROI)</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>Sets the region of interest for cameras.</translation>
+      <translation type="unfinished">Sets the region of interest for cameras.</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>Camera</translation>
+      <translation type="unfinished">Camera</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>ROI to next waypoint</translation>
+      <translation type="unfinished">ROI to next waypoint</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>Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <translation type="unfinished">Sets the region of interest to point towards the next waypoint with optional offsets.</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>Pitch offset</translation>
+      <translation type="unfinished">Pitch offset</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>Roll offset</translation>
+      <translation type="unfinished">Roll offset</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>Yaw offset</translation>
+      <translation type="unfinished">Yaw offset</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cancel ROI</source>
-      <translation>Cancel ROI</translation>
+      <translation type="unfinished">Cancel ROI</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>Cancels the region of interest.</translation>
+      <translation type="unfinished">Cancels the region of interest.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control video</source>
-      <translation>Control video</translation>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Region of interest</source>
-      <translation>Region of interest</translation>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation>None,Next waypoint,Mission item,Location,ROI item</translation>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Mission Index</source>
-      <translation>Mission Index</translation>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>ROI Index</source>
-      <translation>ROI Index</translation>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Camera config</source>
-      <translation>Camera config</translation>
+      <translation type="unfinished">Camera config</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>Configure onboard camera controller.</translation>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Shutter spd</source>
-      <translation>Shutter spd</translation>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Aperture</source>
-      <translation>Aperture</translation>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>ISO</source>
-      <translation>ISO</translation>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Exposure</source>
-      <translation>Exposure</translation>
+      <translation type="unfinished">Exposure</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>Command</translation>
+      <translation type="unfinished">Command</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Cut off</source>
-      <translation>Cut off</translation>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Camera control</source>
-      <translation>Camera control</translation>
+      <translation type="unfinished">Camera control</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control onboard camera.</source>
-      <translation>Control onboard camera.</translation>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Session</source>
-      <translation>Session</translation>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Zoom</source>
-      <translation>Zoom</translation>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Step</source>
-      <translation>Step</translation>
+      <translation type="unfinished">Step</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Focus lock</source>
-      <translation>Focus lock</translation>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Id</source>
-      <translation>Id</translation>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Configure Mount</source>
-      <translation>Configure Mount</translation>
+      <translation type="unfinished">Configure Mount</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>Configure the vehicle mount (e.g. gimbal).</translation>
+      <translation type="unfinished">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stabilize Roll</source>
-      <translation>Stabilize Roll</translation>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>No,Yes</source>
-      <translation>No,Yes</translation>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stabilize Pitch</source>
-      <translation>Stabilize Pitch</translation>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stabilize Yaw</source>
-      <translation>Stabilize Yaw</translation>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control Mount</source>
-      <translation>Control Mount</translation>
+      <translation type="unfinished">Control Mount</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>Control the vehicle mount (e.g. gimbal).</translation>
+      <translation type="unfinished">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Lat/Pitch</source>
-      <translation>Lat/Pitch</translation>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Lon/Roll</source>
-      <translation>Lon/Roll</translation>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Alt/Yaw</source>
-      <translation>Alt/Yaw</translation>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
@@ -1773,63 +1773,63 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Camera trigger distance</source>
-      <translation>Camera trigger distance</translation>
+      <translation type="unfinished">Camera trigger distance</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>Set camera trigger distance.</translation>
+      <translation type="unfinished">Set camera trigger distance.</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>Shutter</translation>
+      <translation type="unfinished">Shutter</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>Trigger</translation>
+      <translation type="unfinished">Trigger</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>No Trigger,Once Immediately</source>
-      <translation>No Trigger,Once Immediately</translation>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable geofence</source>
-      <translation>Enable geofence</translation>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable/Disable geofence.</source>
-      <translation>Enable/Disable geofence.</translation>
+      <translation type="unfinished">Enable/Disable geofence.</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>Safety</translation>
+      <translation type="unfinished">Safety</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Disable floor only,Enable</source>
-      <translation>Disable,Disable floor only,Enable</translation>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Trigger parachute</source>
-      <translation>Trigger parachute</translation>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
@@ -1842,38 +1842,38 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disable,Enable,Release</source>
-      <translation>Disable,Enable,Release</translation>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Motor test</source>
-      <translation>Motor test</translation>
+      <translation type="unfinished">Motor test</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Inverted flight</source>
-      <translation>Inverted flight</translation>
+      <translation type="unfinished">Inverted flight</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>Change to/from inverted flight.</translation>
+      <translation type="unfinished">Change to/from inverted flight.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Inverted</source>
-      <translation>Inverted</translation>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Normal,Inverted</source>
-      <translation>Normal,Inverted</translation>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
@@ -1891,318 +1891,318 @@
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Gripper id</source>
-      <translation>Gripper id</translation>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Action</source>
-      <translation>Action</translation>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Release,Grab</source>
-      <translation>Release,Grab</translation>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>AutoTune Enable</source>
-      <translation>AutoTune Enable</translation>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>AutoTune Enable.</source>
-      <translation>AutoTune Enable.</translation>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Enable,Disable</source>
-      <translation>Enable,Disable</translation>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Guided limits</source>
-      <translation>Guided limits</translation>
+      <translation type="unfinished">Guided limits</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>Set limits for external control</translation>
+      <translation type="unfinished">Set limits for external control</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Timeout</source>
-      <translation>Timeout</translation>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Min Alt</source>
-      <translation>Min Alt</translation>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Max Alt</source>
-      <translation>Max Alt</translation>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>H Limit</source>
-      <translation>H Limit</translation>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Calibration</source>
-      <translation>Calibration</translation>
+      <translation type="unfinished">Calibration</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>Set sensor offsets</translation>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>UAVCAN configure</source>
-      <translation>UAVCAN configure</translation>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Store parameters</source>
-      <translation>Store parameters</translation>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Reboot/Shutdown vehicle</source>
-      <translation>Reboot/Shutdown vehicle</translation>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Override goto</source>
-      <translation>Override goto</translation>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Mission start</source>
-      <translation>Mission start</translation>
+      <translation type="unfinished">Mission start</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Arm/Disarm</source>
-      <translation>Arm/Disarm</translation>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Get launch position</source>
-      <translation>Get launch position</translation>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Bind Spektrum receiver</source>
-      <translation>Bind Spektrum receiver</translation>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Get message interval</source>
-      <translation>Get message interval</translation>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set message interval</source>
-      <translation>Set message interval</translation>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Get capabilities</source>
-      <translation>Get capabilities</translation>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Set camera modes</source>
-      <translation>Set camera modes</translation>
+      <translation type="unfinished">Set camera modes</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>Set camera photo, video modes.</translation>
+      <translation type="unfinished">Set camera photo, video modes.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Take photos,Record video,Survey photo mode</source>
-      <translation>Take photos,Record video,Survey photo mode</translation>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Start image capture</source>
-      <translation>Start image capture</translation>
+      <translation type="unfinished">Start image capture</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>Start taking one or more photos.</translation>
+      <translation type="unfinished">Start taking one or more photos.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Interval</source>
-      <translation>Interval</translation>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Photo count</source>
-      <translation>Photo count</translation>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stop image capture</source>
-      <translation>Stop image capture</translation>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stop taking photos.</source>
-      <translation>Stop taking photos.</translation>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Trigger control</source>
-      <translation>Trigger control</translation>
+      <translation type="unfinished">Trigger control</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Start video capture</source>
-      <translation>Start video capture</translation>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Start video capture.</source>
-      <translation>Start video capture.</translation>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Status Frequency</source>
-      <translation>Status Frequency</translation>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stop video capture</source>
-      <translation>Stop video capture</translation>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Stop video capture.</source>
-      <translation>Stop video capture.</translation>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control high latency link</source>
-      <translation>Control high latency link</translation>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Create panorama</source>
-      <translation>Create panorama</translation>
+      <translation type="unfinished">Create panorama</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>VTOL Transition</source>
-      <translation>VTOL Transition</translation>
+      <translation type="unfinished">VTOL Transition</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>Perform flight mode transition.</translation>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>VTOL</source>
-      <translation>VTOL</translation>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Multi Rotor,Fixed Wing</source>
-      <translation>Multi Rotor,Fixed Wing</translation>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Condition Gate</source>
-      <translation>Condition Gate</translation>
+      <translation type="unfinished">Condition Gate</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>Delay mission state machine until gate has been reached.</translation>
+      <translation type="unfinished">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Ignore Alt</source>
-      <translation>Ignore Alt</translation>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>False,True</source>
-      <translation>False,True</translation>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Payload prepare deploy</source>
-      <translation>Payload prepare deploy</translation>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Payload control deploy</source>
-      <translation>Payload control deploy</translation>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
   </context>
   <context>
@@ -2362,7 +2362,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
       <source>North,South</source>
-      <translation>North,South</translation>
+      <translation type="unfinished">North,South</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
@@ -2465,7 +2465,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/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>None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <translation type="unfinished">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
@@ -2766,7 +2766,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
       <source>Disabled,Enabled</source>
-      <translation>Disabled,Enabled</translation>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
@@ -2791,7 +2791,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
       <source>Disabled,Enabled,Unavailable</source>
-      <translation>Disabled,Enabled,Unavailable</translation>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
@@ -3083,7 +3083,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
       <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation>n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
@@ -3096,7 +3096,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
       <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
@@ -3151,7 +3151,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
       <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
   </context>
   <context>
@@ -3391,7 +3391,7 @@
       <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>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</translation>
+      <translation type="unfinished">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</translation>
     </message>
   </context>
   <context>
@@ -3947,14 +3947,14 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
       <source>ChibiOS,NuttX</source>
-      <translation>ChibiOS,NuttX</translation>
+      <translation type="unfinished">ChibiOS,NuttX</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
       <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation>Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
   </context>
   <context>
@@ -4419,7 +4419,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/Video.SettingsGroup.json"/>
       <source>mkv,mov,mp4</source>
-      <translation>mkv,mov,mp4</translation>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
@@ -4672,7 +4672,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
@@ -4685,7 +4685,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
@@ -4824,7 +4824,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
@@ -4891,7 +4891,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Indoor,Outdoor</source>
-      <translation>Indoor,Outdoor</translation>
+      <translation type="unfinished">Indoor,Outdoor</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
@@ -5000,7 +5000,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation>Never,Always,When in Follow Me Flight Mode</translation>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
diff --git a/translations/qgc_json_uk_UA.ts b/translations/qgc_json_uk_UA.ts
index 2f5f56fc60b7..4dad1fe56299 100644
--- a/translations/qgc_json_uk_UA.ts
+++ b/translations/qgc_json_uk_UA.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_json_zh_CN.ts b/translations/qgc_json_zh_CN.ts
index 9a507b92f76e..8d0261015d18 100644
--- a/translations/qgc_json_zh_CN.ts
+++ b/translations/qgc_json_zh_CN.ts
@@ -102,7 +102,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
       <source>Enable,Disable</source>
-      <translation>启用/禁用</translation>
+      <translation>启用,禁用</translation>
     </message>
   </context>
   <context>
@@ -261,7 +261,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
   </context>
   <context>
@@ -479,7 +479,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
   </context>
   <context>
@@ -735,7 +735,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Direction of next waypoint,Any direction</source>
-      <translation>Direction of next waypoint,Any direction</translation>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
@@ -760,20 +760,20 @@
       <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 position for an amount of time.</source>
-      <translation>Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Loiter Time</source>
-      <translation>Loiter Time</translation>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Direction of next waypoint,Current direction</source>
-      <translation>Direction of next waypoint,Current direction</translation>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
@@ -809,14 +809,14 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Precision Land</source>
-      <translation>Precision Land</translation>
+      <translation type="unfinished">Precision Land</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Disabled,Opportunistic,Required</source>
-      <translation>Disabled,Opportunistic,Required</translation>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
@@ -987,14 +987,14 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Transition Heading</source>
-      <translation>Transition Heading</translation>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation>Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
@@ -1012,7 +1012,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Approach Alt</source>
-      <translation>Approach Alt</translation>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
@@ -1133,13 +1133,13 @@
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Delay the mission until the specified heading is reached.</source>
-      <translation>Delay the mission until the specified heading is reached.</translation>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Heading</source>
-      <translation>Heading</translation>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.label, .mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.label, </extracomment>
@@ -1989,7 +1989,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Reboot/Shutdown vehicle</source>
-      <translation>重启/关闭载具</translation>
+      <translation>重启/关闭车辆</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
@@ -2134,7 +2134,7 @@
       <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
       <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
       <source>Control high latency link</source>
-      <translation>Control high latency link</translation>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
       <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
@@ -2362,7 +2362,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
       <source>North,South</source>
-      <translation>北，南</translation>
+      <translation>北,南</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
@@ -2465,7 +2465,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/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>无，无，2D锁定，3D锁定，3D DGPS锁定，3D RTK GPS 锁定（浮动），3D RTK GPS锁定（固定），静态（固定）</translation>
+      <translation>无,无,2D锁定,3D锁定,3D DGPS锁定,3D RTK GPS 锁定（浮动）,3D RTK GPS锁定（固定）,静态（固定）</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
@@ -2645,7 +2645,7 @@
       <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
       <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
       <source>Clip Count (2)</source>
-      <translation>片段数量 (2)</translation>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
@@ -2766,7 +2766,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
       <source>Disabled,Enabled</source>
-      <translation>禁用，启用</translation>
+      <translation>禁用,启用</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
@@ -2791,7 +2791,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
       <source>Disabled,Enabled,Unavailable</source>
-      <translation>禁用，启用，不可用</translation>
+      <translation>禁用,启用,不可用</translation>
     </message>
   </context>
   <context>
@@ -3083,7 +3083,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
       <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation>n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
@@ -3096,7 +3096,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
       <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation>n/a,LIPO,LIFE,LION,NIMH</translation>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
@@ -3151,7 +3151,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
       <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
   </context>
   <context>
@@ -3214,7 +3214,7 @@
       <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
       <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
       <source>Temperature (2)</source>
-      <translation>温度 (2)</translation>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
@@ -3391,7 +3391,7 @@
       <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>由无人机控制，0 赫兹，1赫兹,2  赫兹，3  赫兹，4 赫兹，5  赫兹，6 赫兹，7 赫兹，8  赫兹，9 赫兹，10  赫兹，50  赫兹，100 赫兹</translation>
+      <translation>由无人机控制,0 赫兹,1 赫兹,2 赫兹,3 赫兹,4 赫兹,5 赫兹,6 赫兹,7 赫兹,8 赫兹,9 赫兹,10 赫兹,50 赫兹,100 赫兹</translation>
     </message>
   </context>
   <context>
@@ -3709,7 +3709,7 @@
       <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
       <location filename="../src/Settings/RTK.SettingsGroup.json"/>
       <source>Survey in accuracy (U-blox only)</source>
-      <translation>精确度调查 (仅限U-blex)</translation>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </extracomment>
@@ -3841,7 +3841,7 @@
       <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
       <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
       <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation>请求启动MAVLink遥测流（仅ArduPilot）</translation>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
@@ -3947,14 +3947,14 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
       <source>ChibiOS,NuttX</source>
-      <translation>ChibiOS，NuttX</translation>
+      <translation>ChibiOS,NuttX</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
       <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation>多机器人，直升机，固定翼，旋翼和水下装置</translation>
+      <translation>多机器人,直升机,固定翼,旋翼,水下装置</translation>
     </message>
   </context>
   <context>
@@ -4249,7 +4249,7 @@
       <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
       <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
       <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation>仅当为航点明确设置时，才显示云台偏航视觉信息。</translation>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
@@ -4369,13 +4369,13 @@
       <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
       <location filename="../src/Settings/Video.SettingsGroup.json"/>
       <source>Displays a grid overlaid over the video view.</source>
-      <translation>在视频视图上显示网格覆盖。</translation>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
       <location filename="../src/Settings/Video.SettingsGroup.json"/>
       <source>Video Display Fit</source>
-      <translation>适合的视频显示</translation>
+      <translation type="unfinished">Video Display Fit</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
@@ -4419,7 +4419,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/Video.SettingsGroup.json"/>
       <source>mkv,mov,mp4</source>
-      <translation>mkv，mov，mp4</translation>
+      <translation>mkv,mov,mp4</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
@@ -4672,7 +4672,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation>ArduPilot，PX4 Pro，Mavlink 通用</translation>
+      <translation>ArduPilot,PX4 Pro,Mavlink 通用</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
@@ -4685,7 +4685,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
@@ -4824,7 +4824,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
@@ -4842,13 +4842,13 @@
       <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Preflight checklist must pass before arming</source>
-      <translation>在解锁前必须先通过检查清单</translation>
+      <translation type="unfinished">Preflight checklist must pass before arming</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </extracomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>If this option is enabled the preflight checklist must pass before arming.</source>
-      <translation>如果启用此选项，则在解锁前必须通过解锁检查。</translation>
+      <translation type="unfinished">If this option is enabled the preflight checklist must pass before arming.</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
@@ -4866,7 +4866,7 @@
       <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Application font size</source>
-      <translation>应用字体大小</translation>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
@@ -4878,7 +4878,7 @@
       <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Application color scheme</source>
-      <translation>应用配色方案</translation>
+      <translation type="unfinished">Application color scheme</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
@@ -4891,13 +4891,13 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Indoor,Outdoor</source>
-      <translation>室内，室外</translation>
+      <translation>室内,室外</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Application save directory</source>
-      <translation>应用程序保存目录</translation>
+      <translation type="unfinished">Application save directory</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
@@ -4915,7 +4915,7 @@
       <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Application data is saved to the sd card</source>
-      <translation>应用程序数据保存到 sd 卡</translation>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
@@ -5000,7 +5000,7 @@
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
       <location filename="../src/Settings/App.SettingsGroup.json"/>
       <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation>从不，总是，处于“跟随我”飞行模式时</translation>
+      <translation>从不,总是,处于“跟随我”飞行模式时</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
diff --git a/translations/qgc_json_zh_TW.ts b/translations/qgc_json_zh_TW.ts
index 2353b36a0763..a9d5e0191e3d 100644
--- a/translations/qgc_json_zh_TW.ts
+++ b/translations/qgc_json_zh_TW.ts
@@ -35,2434 +35,2458 @@
     </message>
   </context>
   <context>
-    <name>OfflineMaps.SettingsGroup.json</name>
+    <name>APM-MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Minimum zoom level for downloads.</source>
-      <translation type="unfinished">Minimum zoom level for downloads.</translation>
+      <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">Take off from the ground and ascend to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum zoom level for downloads.</source>
-      <translation type="unfinished">Maximum zoom level for downloads.</translation>
+      <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">Takeoff to specified altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
-      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
-      <source>Maximum number of tiles for download.</source>
-      <translation type="unfinished">Maximum number of tiles for download.</translation>
+      <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">VTOL</translation>
     </message>
-  </context>
-  <context>
-    <name>FlyView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Minimum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</translation>
+      <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">Land using VTOL mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum altitude for guided actions altitude slider.</source>
-      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Setting</source>
+      <translation type="unfinished">Setting</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show/Hide Log Replay status bar</source>
-      <translation type="unfinished">Show/Hide Log Replay status bar</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Keep map centered on vehicle</source>
-      <translation type="unfinished">Keep map centered on vehicle</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
-      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Show obstacle distance overlay on map and video.</source>
-      <translation type="unfinished">Show obstacle distance overlay on map and video.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
+  </context>
+  <context>
+    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Maximum distance allowed for Go To Location.</source>
-      <translation type="unfinished">Maximum distance allowed for Go To Location.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
-      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
-      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
-      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Qml file for instrument panel</source>
-      <translation type="unfinished">Qml file for instrument panel</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
-      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
-      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
-      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
-      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point.</source>
+      <translation type="unfinished">Altitude for landing point.</translation>
     </message>
-  </context>
-  <context>
-    <name>App.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing firmware class</source>
-      <translation type="unfinished">Offline editing firmware class</translation>
+      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>The glide slope between the loiter and landing point.</source>
+      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
-      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Value controller approach point is distance</source>
+      <translation type="unfinished">Value controller approach point is distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing vehicle class</source>
-      <translation type="unfinished">Offline editing vehicle class</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
-      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing cruise speed</source>
-      <translation type="unfinished">Offline editing cruise speed</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Distance between approach and land points.</source>
+      <translation type="unfinished">Distance between approach and land points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing hover speed</source>
-      <translation type="unfinished">Offline editing hover speed</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Heading from approach to land point.</source>
+      <translation type="unfinished">Heading from approach to land point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude to begin landing approach from.</source>
+      <translation type="unfinished">Altitude to begin landing approach from.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing ascent speed</source>
-      <translation type="unfinished">Offline editing ascent speed</translation>
+      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
+      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Speed to perform the approach at.</source>
+      <translation type="unfinished">Speed to perform the approach at.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Offline editing descent speed</source>
-      <translation type="unfinished">Offline editing descent speed</translation>
-    </message>
+      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter radius.</source>
+      <translation type="unfinished">Loiter radius.</translation>
+    </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</translation>
+      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Loiter clockwise around the final approach point.</source>
+      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Announce battery remaining percent</source>
-      <translation type="unfinished">Announce battery remaining percent</translation>
+      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Altitude for landing point on ground.</source>
+      <translation type="unfinished">Altitude for landing point on ground.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</translation>
+      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
+      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Default value for altitude</source>
-      <translation type="unfinished">Default value for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking photos</source>
+      <translation type="unfinished">Stop taking photos</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
+      <source>Stop taking video</source>
+      <translation type="unfinished">Stop taking video</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoFixedWing.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Mute audio output</source>
-      <translation type="unfinished">Mute audio output</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
+  </context>
+  <context>
+    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled all audio output will be muted.</source>
-      <translation type="unfinished">If this option is enabled all audio output will be muted.</translation>
+      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
+      <source>Launch position altitude</source>
+      <translation type="unfinished">Launch position altitude</translation>
     </message>
+  </context>
+  <context>
+    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Show virtual joystick</source>
-      <translation type="unfinished">Show virtual joystick</translation>
+      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
+      <source>Set the current flight speed</source>
+      <translation type="unfinished">Set the current flight speed</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</translation>
+      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Width of camera image sensor.</source>
+      <translation type="unfinished">Width of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If enabled the throttle stick will snap back to center when released.</source>
-      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</translation>
+      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Height of camera image sensor.</source>
+      <translation type="unfinished">Height of camera image sensor.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Left Handed Mode</source>
-      <translation type="unfinished">Left Handed Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution width.</source>
+      <translation type="unfinished">Camera image resolution width.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the virtual joystick layout will be reversed</source>
-      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera image resolution height.</source>
+      <translation type="unfinished">Camera image resolution height.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Video streaming debug</source>
-      <translation type="unfinished">Video streaming debug</translation>
+      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Focal length of camera lens.</source>
+      <translation type="unfinished">Focal length of camera lens.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</translation>
+      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera on vehicle is in landscape orientation.</source>
+      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
-      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</translation>
+      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Camera orientation ix fixed and cannot be changed.</source>
+      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Use preflight checklist</source>
-      <translation type="unfinished">Use preflight checklist</translation>
+      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
+      <source>Minimum amount of time between each camera trigger.</source>
+      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
     </message>
+  </context>
+  <context>
+    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is enabled the preflight checklist will be used.</source>
-      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Preflight checklist must pass before arming</source>
-      <translation type="unfinished">Preflight checklist must pass before arming</translation>
+      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Vehicle will fly to/from the structure at this altitude.</source>
+      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</translation>
+      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Number of scan layers.</source>
+      <translation type="unfinished">Number of scan layers.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
+      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Height of structure being scanned.</source>
+      <translation type="unfinished">Height of structure being scanned.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application font size</source>
-      <translation type="unfinished">Application font size</translation>
+      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
+      <source>Start scanning from top of structure.</source>
+      <translation type="unfinished">Start scanning from top of structure.</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The point size for the default font used.</source>
-      <translation type="unfinished">The point size for the default font used.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify whether the camera should take photos or video</source>
+      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application color scheme</source>
-      <translation type="unfinished">Application color scheme</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>The color scheme for the user interface.</source>
-      <translation type="unfinished">The color scheme for the user interface.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the distance between each photo</source>
+      <translation type="unfinished">Specify the distance between each photo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Specify the time between each photo</source>
+      <translation type="unfinished">Specify the time between each photo</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal pitch rotation.</source>
+      <translation type="unfinished">Gimbal pitch rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Gimbal yaw rotation.</source>
+      <translation type="unfinished">Gimbal yaw rotation.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Indoor,Outdoor</source>
-      <translation type="unfinished">Indoor,Outdoor</translation>
+      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
+      <source>Photo,Video,Survey</source>
+      <translation type="unfinished">Photo,Video,Survey</translation>
     </message>
+  </context>
+  <context>
+    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application save directory</source>
-      <translation type="unfinished">Application save directory</translation>
+      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Angle for parallel lines of grid.</source>
+      <translation type="unfinished">Angle for parallel lines of grid.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Directory to which all data files are saved/loaded from</source>
-      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
+      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Fly every other transect in each pass.</source>
+      <translation type="unfinished">Fly every other transect in each pass.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Save to SD card</source>
-      <translation type="unfinished">Save to SD card</translation>
+      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
+      <source>Split mission concave polygons into separate regular, convex polygons.</source>
+      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
     </message>
+  </context>
+  <context>
+    <name>BreachReturn.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Application data is saved to the sd card</source>
-      <translation type="unfinished">Application data is saved to the sd card</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Latitude of breach return point position</source>
+      <translation type="unfinished">Latitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Mapbox maps</source>
-      <translation type="unfinished">Access token to Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Longitude of breach return point position</source>
+      <translation type="unfinished">Longitude of breach return point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Mapbox maps</source>
-      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
+      <source>Altitude of breach return point position (Rel)</source>
+      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
     </message>
+  </context>
+  <context>
+    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Account name for Mapbox maps</source>
-      <translation type="unfinished">Account name for Mapbox maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
+  </context>
+  <context>
+    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal account name for Mapbox maps</source>
-      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Altitude for the bottom layer of the structure scan.</source>
+      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map style ID</source>
-      <translation type="unfinished">Map style ID</translation>
+      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Corridor width. Specify 0 width for a single pass scan.</source>
+      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Map design style ID for Mapbox maps</source>
-      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Access token to Esri maps</source>
-      <translation type="unfinished">Access token to Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
+      <source>Amount of spacing in between parallel grid lines.</source>
+      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for Esri maps</source>
-      <translation type="unfinished">Your personal access token for Esri maps</translation>
+      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TransectStyle.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Camera continues taking images in turn arounds.</source>
+      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Stop and Hover at each image point before taking image</source>
+      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
+      <source>Refly the pattern at a 90 degree angle</source>
+      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
-      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>VWorld Token</source>
-      <translation type="unfinished">VWorld Token</translation>
+      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
     </message>
+  </context>
+  <context>
+    <name>RallyPoint.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Your personal access token for VWorld maps</source>
-      <translation type="unfinished">Your personal access token for VWorld maps</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Latitude of rally point position</source>
+      <translation type="unfinished">Latitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Stream GCS&apos; coordinates to Autopilot</source>
-      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Longitude of rally point position</source>
+      <translation type="unfinished">Longitude of rally point position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Never,Always,When in Follow Me Flight Mode</source>
-      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
+      <source>Altitude of rally point position (home relative)</source>
+      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
     </message>
+  </context>
+  <context>
+    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Camera name.</source>
+      <translation type="unfinished">Camera name.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>Disable all data persistence</source>
-      <translation type="unfinished">Disable all data persistence</translation>
+      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Value specified is distance to surface.</source>
+      <translation type="unfinished">Value specified is distance to surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>If this option is set, nothing will be saved to disk.</source>
-      <translation type="unfinished">If this option is set, nothing will be saved to disk.</translation>
+      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Distance vehicle is away from surface.</source>
+      <translation type="unfinished">Distance vehicle is away from surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
+      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Image desity at surface.</source>
+      <translation type="unfinished">Image desity at surface.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink User Name</source>
-      <translation type="unfinished">AirLink User Name</translation>
+      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the forward facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
-      <location filename="../src/Settings/App.SettingsGroup.json"/>
-      <source>AirLink Password</source>
-      <translation type="unfinished">AirLink Password</translation>
+      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
+      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
+      <source>Amount of overlap between images in the side facing direction.</source>
+      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
     </message>
   </context>
   <context>
-    <name>MavlinkActions.SettingsGroup.json</name>
+    <name>MavCmdInfoCommon.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Fly View</source>
-      <translation type="unfinished">Name of JSON custom actions file for Fly View</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Home Position</source>
+      <translation type="unfinished">Home Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
-      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
-      <source>Name of JSON custom actions file for Joysticks</source>
-      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Planned home position for mission.</source>
+      <translation type="unfinished">Planned home position for mission.</translation>
     </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Default firmware type for flashing</source>
-      <translation type="unfinished">Default firmware type for flashing</translation>
+      <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">Basic</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>ChibiOS,NuttX</source>
-      <translation type="unfinished">ChibiOS,NuttX</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
-      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
-      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
+      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
-  </context>
-  <context>
-    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>User-selected brand image</source>
-      <translation type="unfinished">User-selected brand image</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Waypoint</source>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (indoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
+      <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">Travel to a position in 3D space.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
-      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
-      <source>Location in file system of user-selected brand image (outdoor)</source>
-      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hold</source>
+      <translation type="unfinished">Hold</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Acceptance</source>
+      <translation type="unfinished">Acceptance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for MultiRotor</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pass Radius</source>
+      <translation type="unfinished">Pass Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for FixedWing</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for VTOL</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+      <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">Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for RoverBoat</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</translation>
+      <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 position indefinitely.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Sub</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</translation>
+      <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">Radius</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
-      <source>Comma separated list of hidden flight modes for Airship</source>
-      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (turns)</source>
+      <translation type="unfinished">Loiter (turns)</translation>
     </message>
-  </context>
-  <context>
-    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Survey in accuracy (U-blox only)</source>
-      <translation type="unfinished">Survey in accuracy (U-blox only)</translation>
+      <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 position for a number of turns.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</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">Turns</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Leave Loiter</source>
+      <translation type="unfinished">Leave Loiter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Any direction</source>
+      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Min observation time</source>
-      <translation type="unfinished">Min observation time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exit loiter from</source>
+      <translation type="unfinished">Exit loiter from</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the minimum amount of observation time for the position calculation.</source>
-      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Center,Tangent</source>
+      <translation type="unfinished">Center,Tangent</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Use specified base position</source>
-      <translation type="unfinished">Use specified base position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (time)</source>
+      <translation type="unfinished">Loiter (time)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</translation>
+      <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 position for an amount of time.</source>
+      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Latitude</source>
-      <translation type="unfinished">Base Position Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter Time</source>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the latitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Direction of next waypoint,Current direction</source>
+      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Longitude</source>
-      <translation type="unfinished">Base Position Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_RETURN_TO_LAUNCH].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Return To Launch</source>
+      <translation type="unfinished">Return To Launch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the longitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</translation>
+      <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">Send the vehicle back to the launch position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Alt (WGS84)</source>
-      <translation type="unfinished">Base Position Alt (WGS84)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land</source>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the altitude of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
+      <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">Land vehicle at the specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Base Position Accuracy</source>
-      <translation type="unfinished">Base Position Accuracy</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Abort Alt</source>
+      <translation type="unfinished">Abort Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
-      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
-      <source>Defines the accuracy of the fixed RTK base position.</source>
-      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Precision Land</source>
+      <translation type="unfinished">Precision Land</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">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</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disabled,Opportunistic,Required</source>
+      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
     </message>
-  </context>
-  <context>
-    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map provider for flight maps</source>
-      <translation type="unfinished">Currently selected map provider for flight maps</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff</source>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected map type for flight maps</source>
-      <translation type="unfinished">Currently selected map type for flight maps</translation>
+      <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">Launch from the ground and travel towards the specified takeoff position.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
-      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
-      <source>Currently selected elevation map provider</source>
-      <translation type="unfinished">Currently selected elevation map provider</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land local</source>
+      <translation type="unfinished">Land local</translation>
     </message>
-  </context>
-  <context>
-    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection over UDP</source>
-      <translation type="unfinished">Automatically open a connection over UDP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF_LOCAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Takeoff local</source>
+      <translation type="unfinished">Takeoff local</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Nav follow</source>
+      <translation type="unfinished">Nav follow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a Pixhawk board</source>
-      <translation type="unfinished">Automatically connect to a Pixhawk board</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change Altitude</source>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
+      <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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a SiK Radio</source>
-      <translation type="unfinished">Automatically connect to a SiK Radio</translation>
+      <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">Flight control</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</translation>
+      <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">Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to an RTK GPS</source>
-      <translation type="unfinished">Automatically connect to an RTK GPS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Climb,Neutral,Descend</source>
+      <translation type="unfinished">Climb,Neutral,Descend</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Loiter (altitude)</source>
+      <translation type="unfinished">Loiter (altitude)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically connect to a LibrePilot</source>
-      <translation type="unfinished">Automatically connect to a LibrePilot</translation>
+      <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">Loiter at specified position until altitude reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow Me</source>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS device for GCS position</source>
-      <translation type="unfinished">NMEA GPS device for GCS position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle reposition</source>
+      <translation type="unfinished">Vehicle reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Path planning</source>
+      <translation type="unfinished">Path planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Automatically open a connection with Zero-Conf</source>
-      <translation type="unfinished">Automatically open a connection with Zero-Conf</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control autonomous path planning.</source>
+      <translation type="unfinished">Control autonomous path planning.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
-      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</translation>
+      <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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP port for autoconnect</source>
-      <translation type="unfinished">UDP port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Local planning</source>
+      <translation type="unfinished">Local planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host IP for autoconnect</source>
-      <translation type="unfinished">UDP target host IP for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>UDP target host port for autoconnect</source>
-      <translation type="unfinished">UDP target host port for autoconnect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Full planning</source>
+      <translation type="unfinished">Full planning</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
-      <source>Udp port to receive NMEA streams</source>
-      <translation type="unfinished">Udp port to receive NMEA streams</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
+      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
     </message>
-  </context>
-  <context>
-    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Enable the 3D viewer</source>
-      <translation type="unfinished">Enable the 3D viewer</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading goal</source>
+      <translation type="unfinished">Heading goal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Path to the OSM file for the 3D viewer.</source>
-      <translation type="unfinished">Path to the OSM file for the 3D viewer.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Spline waypoint</source>
+      <translation type="unfinished">Spline waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Average Height for each level of the buildings</source>
-      <translation type="unfinished">Average Height for each level of the buildings</translation>
+      <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">Travel to a position in 3D space using spline path.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
-      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
-      <source>Altitude bias for vehicles in the 3D View</source>
-      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_ALTITUDE_WAIT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Altitude wait</source>
+      <translation type="unfinished">Altitude wait</translation>
     </message>
-  </context>
-  <context>
-    <name>Maps.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max disk cache</source>
-      <translation type="unfinished">Max disk cache</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL takeoff</source>
+      <translation type="unfinished">VTOL takeoff</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
-      <source>Max memory cache</source>
-      <translation type="unfinished">Max memory cache</translation>
+      <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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Select values to display in indicator</source>
-      <translation type="unfinished">Select values to display in indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Transition Heading</source>
+      <translation type="unfinished">Transition Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Percentage,Voltage,Percentage and Voltage</source>
-      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
+      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 1</source>
-      <translation type="unfinished">Battery level threshold 1</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL land</source>
+      <translation type="unfinished">VTOL land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
-      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
-      <source>Battery level threshold 2</source>
-      <translation type="unfinished">Battery level threshold 2</translation>
+      <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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
     </message>
-  </context>
-  <context>
-    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry Log after each flight</source>
-      <translation type="unfinished">Save telemetry Log after each flight</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Approach Alt</source>
+      <translation type="unfinished">Approach Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
-      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided enable</source>
+      <translation type="unfinished">Guided enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save telemetry log even if vehicle was not armed</source>
-      <translation type="unfinished">Save telemetry log even if vehicle was not armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disabled guided mode.</source>
+      <translation type="unfinished">Enable/Disabled guided mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
-      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.label, .mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable</source>
+      <translation type="unfinished">Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
-      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>On,Off</source>
+      <translation type="unfinished">On,Off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Save CSV Telementry Logs</source>
-      <translation type="unfinished">Save CSV Telementry Logs</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until</source>
+      <translation type="unfinished">Delay until</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay until the specified time is reached.</source>
+      <translation type="unfinished">Delay until the specified time is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Enable mavlink forwarding</source>
-      <translation type="unfinished">Enable mavlink forwarding</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Hour (utc)</source>
+      <translation type="unfinished">Hour (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name</source>
-      <translation type="unfinished">Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min (utc)</source>
+      <translation type="unfinished">Min (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
-      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sec (utc)</source>
+      <translation type="unfinished">Sec (utc)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support Host name</source>
-      <translation type="unfinished">Ardupilot Support Host name</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay</source>
+      <translation type="unfinished">Delay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
-      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</translation>
+      <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">Delay the mission for the number of seconds.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>MAVLink 2.0 signing key</source>
-      <translation type="unfinished">MAVLink 2.0 signing key</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_CHANGE_ALT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for altitude</source>
+      <translation type="unfinished">Wait for altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>Send GCS Heartbeat</source>
-      <translation type="unfinished">Send GCS Heartbeat</translation>
+      <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">Delay the mission until the specified altitide is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
-      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
-      <source>GCS MAVLink System ID</source>
-      <translation type="unfinished">GCS MAVLink System ID</translation>
+      <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">Conditionals</translation>
     </message>
-  </context>
-  <context>
-    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video source</source>
-      <translation type="unfinished">Video source</translation>
+      <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">Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DISTANCE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for distance</source>
+      <translation type="unfinished">Wait for distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video UDP Url</source>
-      <translation type="unfinished">Video UDP Url</translation>
+      <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">Delay the mission until within the specified distance of the next waypoint.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
-      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</translation>
+      <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">Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video RTSP Url</source>
-      <translation type="unfinished">Video RTSP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Wait for Yaw</source>
+      <translation type="unfinished">Wait for Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Delay the mission until the specified heading is reached.</source>
+      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video TCP Url</source>
-      <translation type="unfinished">Video TCP Url</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
+      <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">Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video save directory</source>
-      <translation type="unfinished">Video save directory</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Clockwise,Shortest,Counter-Clockwise</source>
+      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Directory to save videos to.</source>
-      <translation type="unfinished">Directory to save videos to.</translation>
+      <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">Offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio</source>
-      <translation type="unfinished">Video Aspect Ratio</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Relative,Absolute</source>
+      <translation type="unfinished">Relative,Absolute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
-      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set mode</source>
+      <translation type="unfinished">Set mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode</source>
+      <translation type="unfinished">Set flight mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Displays a grid overlaid over the video view.</source>
-      <translation type="unfinished">Displays a grid overlaid over the video view.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set flight mode.</source>
+      <translation type="unfinished">Set flight mode.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Display Fit</source>
-      <translation type="unfinished">Video Display Fit</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Custom Mode</source>
+      <translation type="unfinished">Custom Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Handle Video Aspect Ratio.</source>
-      <translation type="unfinished">Handle Video Aspect Ratio.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_MODE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Sub Mode</source>
+      <translation type="unfinished">Sub Mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Fit Width,Fit Height,Fill,No Crop</source>
-      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Jump to item</source>
+      <translation type="unfinished">Jump to item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show Video Record Control</source>
-      <translation type="unfinished">Show Video Record Control</translation>
+      <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">Mission will continue at the specified item.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Show recording control in the UI.</source>
-      <translation type="unfinished">Show recording control in the UI.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Item #</source>
+      <translation type="unfinished">Item #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Recording Format</source>
-      <translation type="unfinished">Video Recording Format</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Repeat</source>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video recording file format.</source>
-      <translation type="unfinished">Video recording file format.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Change speed</source>
+      <translation type="unfinished">Change speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>mkv,mov,mp4</source>
-      <translation type="unfinished">mkv,mov,mp4</translation>
+      <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">Change speed and/or throttle set points.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Max Video Storage Usage</source>
-      <translation type="unfinished">Max Video Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Type</source>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Maximum amount of disk space used by video recording.</source>
-      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
+      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Enable/Disable Limits on Storage Usage</source>
-      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Speed</source>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Throttle</source>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>RTSP Video Timeout</source>
-      <translation type="unfinished">RTSP Video Timeout</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set launch location</source>
+      <translation type="unfinished">Set launch location</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>How long to wait before assuming RTSP link is gone.</source>
-      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</translation>
+      <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">Changes the launch location either to the current location or a specified location.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Enabled</source>
-      <translation type="unfinished">Video Stream Enabled</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Vehicle position,Specified position</source>
+      <translation type="unfinished">Vehicle position,Specified position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Start/Stop Video Stream.</source>
-      <translation type="unfinished">Start/Stop Video Stream.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set Parameter</source>
+      <translation type="unfinished">Set Parameter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Video Stream Disnabled When Armed</source>
-      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set relay</source>
+      <translation type="unfinished">Set relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Disable Video Stream when disarmed.</source>
-      <translation type="unfinished">Disable Video Stream when disarmed.</translation>
+      <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">Set relay to a condition.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Tweaks video for lower latency</source>
-      <translation type="unfinished">Tweaks video for lower latency</translation>
+      <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">Relay #</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Value</source>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force specific category of video decode</source>
-      <translation type="unfinished">Force specific category of video decode</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_RELAY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle relay</source>
+      <translation type="unfinished">Cycle relay</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
-      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
+      <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">Cycle relay on/off for desired cycles/time.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/Video.SettingsGroup.json"/>
-      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
-      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
+      <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">Cycles</translation>
     </message>
-  </context>
-  <context>
-    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID</source>
-      <translation type="unfinished">Operator ID</translation>
+      <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">Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID. Maximum 20 characters.</source>
-      <translation type="unfinished">Operator ID. Maximum 20 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set servo</source>
+      <translation type="unfinished">Set servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID is valid</source>
-      <translation type="unfinished">Operator ID is valid</translation>
+      <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">Set servo to specified PWM value.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID has been checked using checksum.</source>
-      <translation type="unfinished">Operator ID has been checked using checksum.</translation>
+      <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">Servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator ID type</source>
-      <translation type="unfinished">Operator ID type</translation>
+      <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">PWM</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>CAA</source>
-      <translation type="unfinished">CAA</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPEAT_SERVO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cycle servo</source>
+      <translation type="unfinished">Cycle servo</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Operator ID</source>
-      <translation type="unfinished">Send Operator ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator</source>
+      <translation type="unfinished">Set actuator</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends operator ID message</source>
-      <translation type="unfinished">When enabled, sends operator ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set actuator to specified output value (range [-1, 1]).</source>
+      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose</source>
-      <translation type="unfinished">Flight Purpose</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 1</source>
+      <translation type="unfinished">Actuator 1</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 2</source>
+      <translation type="unfinished">Actuator 2</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Emergency Text</source>
-      <translation type="unfinished">Emergency Text</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 3</source>
+      <translation type="unfinished">Actuator 3</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Actuator 4</source>
+      <translation type="unfinished">Actuator 4</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Flight termination</source>
+      <translation type="unfinished">Flight termination</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
-      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_LAND_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Land start</source>
+      <translation type="unfinished">Land start</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Self ID type</source>
-      <translation type="unfinished">Self ID type</translation>
+      <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">Marker to indicate start of landing sequence.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Flight Purpose,Emergency,Extended Status</source>
-      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_RALLY_LAND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Rally land</source>
+      <translation type="unfinished">Rally land</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Self ID</source>
-      <translation type="unfinished">Send Self ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GO_AROUND].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Go around</source>
+      <translation type="unfinished">Go around</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends self ID message</source>
-      <translation type="unfinished">When enabled, sends self ID message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reposition</source>
+      <translation type="unfinished">Reposition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PAUSE_CONTINUE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pause/Continue</source>
+      <translation type="unfinished">Pause/Continue</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Basic ID Type</source>
-      <translation type="unfinished">Basic ID Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set moving direction</source>
+      <translation type="unfinished">Set moving direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
-      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
+      <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">Set moving direction to forward or reverse.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>UA type</source>
-      <translation type="unfinished">UA type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Forward,Reverse</source>
+      <translation type="unfinished">Forward,Reverse</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
-      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
+      <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">Region of interest (ROI)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Send Basic ID</source>
-      <translation type="unfinished">Send Basic ID</translation>
+      <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">Sets the region of interest for cameras.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>When enabled, sends basic ID message</source>
-      <translation type="unfinished">When enabled, sends basic ID message</translation>
+      <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">Camera</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Region of operation</source>
-      <translation type="unfinished">Region of operation</translation>
+      <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">ROI to next waypoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>The region of operation the mission will take place in</source>
-      <translation type="unfinished">The region of operation the mission will take place in</translation>
+      <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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>FAA,EU</source>
-      <translation type="unfinished">FAA,EU</translation>
+      <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">Pitch offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Location Type</source>
-      <translation type="unfinished">Location Type</translation>
+      <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">Roll offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Operator location Type</source>
-      <translation type="unfinished">Operator location Type</translation>
+      <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">Yaw offset</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
-      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI_NONE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cancel ROI</source>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Latitude Fixed</source>
-      <translation type="unfinished">Latitude Fixed</translation>
+      <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">Cancels the region of interest.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed latitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed latitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_CONTROL_VIDEO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control video</source>
+      <translation type="unfinished">Control video</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Longitude Fixed</source>
-      <translation type="unfinished">Longitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Region of interest</source>
+      <translation type="unfinished">Region of interest</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Longitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>None,Next waypoint,Mission item,Location,ROI item</source>
+      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Altitude Fixed</source>
-      <translation type="unfinished">Altitude Fixed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission Index</source>
+      <translation type="unfinished">Mission Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Fixed Altitude to send on SYSTEM message</source>
-      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ROI Index</source>
+      <translation type="unfinished">ROI Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type</source>
-      <translation type="unfinished">Classification Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera config</source>
+      <translation type="unfinished">Camera config</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Classification Type of UAS</source>
-      <translation type="unfinished">Classification Type of UAS</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure onboard camera controller.</source>
+      <translation type="unfinished">Configure onboard camera controller.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,EU</source>
-      <translation type="unfinished">Undeclared,EU</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter spd</source>
+      <translation type="unfinished">Shutter spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category</source>
-      <translation type="unfinished">Category</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Aperture</source>
+      <translation type="unfinished">Aperture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Category of the UAS in the EU region</source>
-      <translation type="unfinished">Category of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>ISO</source>
+      <translation type="unfinished">ISO</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Open,Specific,Certified</source>
-      <translation type="unfinished">Undeclared,Open,Specific,Certified</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Exposure</source>
+      <translation type="unfinished">Exposure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class</source>
-      <translation type="unfinished">Class</translation>
+      <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">Command</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Class of the UAS in the EU region</source>
-      <translation type="unfinished">Class of the UAS in the EU region</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Cut off</source>
+      <translation type="unfinished">Cut off</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
-      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
-      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Camera control</source>
+      <translation type="unfinished">Camera control</translation>
     </message>
-  </context>
-  <context>
-    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS server</source>
-      <translation type="unfinished">Connect to ADSB SBS server</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control onboard camera.</source>
+      <translation type="unfinished">Control onboard camera.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Connect to ADSB SBS-1 server using specified address/port</source>
-      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Session</source>
+      <translation type="unfinished">Session</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Host address</source>
-      <translation type="unfinished">Host address</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Zoom</source>
+      <translation type="unfinished">Zoom</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
-      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
-      <source>Server port</source>
-      <translation type="unfinished">Server port</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Step</source>
+      <translation type="unfinished">Step</translation>
     </message>
-  </context>
-  <context>
-    <name>GimbalController.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Enable on Screen Camera Control</source>
-      <translation type="unfinished">Enable on Screen Camera Control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Focus lock</source>
+      <translation type="unfinished">Focus lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Type of on-screen control</source>
-      <translation type="unfinished">Type of on-screen control</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].param6.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Id</source>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Click to point, click and drag</source>
-      <translation type="unfinished">Click to point, click and drag</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Configure Mount</source>
+      <translation type="unfinished">Configure Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Vertical camera field of view</source>
-      <translation type="unfinished">Vertical camera field of view</translation>
+      <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">Configure the vehicle mount (e.g. gimbal).</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Horizontal camera field of view</source>
-      <translation type="unfinished">Horizontal camera field of view</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
+      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
-      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Roll</source>
+      <translation type="unfinished">Stabilize Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
-      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No,Yes</source>
+      <translation type="unfinished">No,Yes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
-      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Pitch</source>
+      <translation type="unfinished">Stabilize Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
-      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stabilize Yaw</source>
+      <translation type="unfinished">Stabilize Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>Rate used for joystick button control (deg/sec)</source>
-      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control Mount</source>
+      <translation type="unfinished">Control Mount</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
-      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
-      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
-      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
+      <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">Control the vehicle mount (e.g. gimbal).</translation>
     </message>
-  </context>
-  <context>
-    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Display the presets tab at start</source>
-      <translation type="unfinished">Display the presets tab at start</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lat/Pitch</source>
+      <translation type="unfinished">Lat/Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show/Hide the mission item status display</source>
-      <translation type="unfinished">Show/Hide the mission item status display</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Lon/Roll</source>
+      <translation type="unfinished">Lon/Roll</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow missions to not require a takeoff item</source>
-      <translation type="unfinished">Allow missions to not require a takeoff item</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Alt/Yaw</source>
+      <translation type="unfinished">Alt/Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal Manager PitchYaw</source>
+      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control the gimbal during the mission</source>
+      <translation type="unfinished">Control the gimbal during the mission</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
-      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
-      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
-      <source>Amount of distance required for vehicle to complete a transition</source>
-      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Pitch rate</source>
+      <translation type="unfinished">Pitch rate</translation>
     </message>
-  </context>
-  <context>
-    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Yaw rate</source>
+      <translation type="unfinished">Yaw rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Right</source>
-      <translation type="unfinished">Forward/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw</source>
+      <translation type="unfinished">Follow yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Right</source>
-      <translation type="unfinished">Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Follow yaw, Lock yaw</source>
+      <translation type="unfinished">Follow yaw, Lock yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Right</source>
-      <translation type="unfinished">Rear/Right</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gimbal</source>
+      <translation type="unfinished">Gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear</source>
-      <translation type="unfinished">Rear</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Primary,first gimbal,second gimbal</source>
+      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Rear/Left</source>
-      <translation type="unfinished">Rear/Left</translation>
+      <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">Camera trigger distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Left</source>
-      <translation type="unfinished">Left</translation>
+      <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">Set camera trigger distance.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Forward/Left</source>
-      <translation type="unfinished">Forward/Left</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Shutter</source>
+      <translation type="unfinished">Shutter</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Up</source>
-      <translation type="unfinished">Up</translation>
+      <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">Trigger</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Down</source>
-      <translation type="unfinished">Down</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>No Trigger,Once Immediately</source>
+      <translation type="unfinished">No Trigger,Once Immediately</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Minimum distance sensor can detect</source>
-      <translation type="unfinished">Minimum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable geofence</source>
+      <translation type="unfinished">Enable geofence</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
-      <source>Maximum distance sensor can detect</source>
-      <translation type="unfinished">Maximum distance sensor can detect</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable geofence.</source>
+      <translation type="unfinished">Enable/Disable geofence.</translation>
     </message>
-  </context>
-  <context>
-    <name>SetpointFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Setpoint</source>
-      <translation type="unfinished">Roll Setpoint</translation>
+      <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">Safety</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Setpoint</source>
-      <translation type="unfinished">Pitch Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Disable floor only,Enable</source>
+      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Setpoint</source>
-      <translation type="unfinished">Yaw Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger parachute</source>
+      <translation type="unfinished">Trigger parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Roll Rate Setpoint</source>
-      <translation type="unfinished">Roll Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable/Disable auto-release or Release a parachute</source>
+      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Pitch Rate Setpoint</source>
-      <translation type="unfinished">Pitch Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Disable,Enable,Release</source>
+      <translation type="unfinished">Disable,Enable,Release</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
-      <source>Yaw Rate Setpoint</source>
-      <translation type="unfinished">Yaw Rate Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOTOR_TEST].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Motor test</source>
+      <translation type="unfinished">Motor test</translation>
     </message>
-  </context>
-  <context>
-    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Id</source>
-      <translation type="unfinished">Battery Id</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted flight</source>
+      <translation type="unfinished">Inverted flight</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Function</source>
-      <translation type="unfinished">Battery Function</translation>
+      <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">Change to/from inverted flight.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
-      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Inverted</source>
+      <translation type="unfinished">Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Battery Type</source>
-      <translation type="unfinished">Battery Type</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Normal,Inverted</source>
+      <translation type="unfinished">Normal,Inverted</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,LIPO,LIFE,LION,NIMH</source>
-      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper Mechanism</source>
+      <translation type="unfinished">Gripper Mechanism</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control a gripper mechanism.</source>
+      <translation type="unfinished">Control a gripper mechanism.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Percent</source>
-      <translation type="unfinished">Percent</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Gripper id</source>
+      <translation type="unfinished">Gripper id</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Action</source>
+      <translation type="unfinished">Action</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Release,Grab</source>
+      <translation type="unfinished">Release,Grab</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable</source>
+      <translation type="unfinished">AutoTune Enable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Watts</source>
-      <translation type="unfinished">Watts</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>AutoTune Enable.</source>
+      <translation type="unfinished">AutoTune Enable.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Time Remaining</source>
-      <translation type="unfinished">Time Remaining</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Enable,Disable</source>
+      <translation type="unfinished">Enable,Disable</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Guided limits</source>
+      <translation type="unfinished">Guided limits</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
-      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
-      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
+      <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">Set limits for external control</translation>
     </message>
-  </context>
-  <context>
-    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param1.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Timeout</source>
+      <translation type="unfinished">Timeout</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Speed</source>
-      <translation type="unfinished">Generator Speed</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Min Alt</source>
+      <translation type="unfinished">Min Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current</source>
-      <translation type="unfinished">Battery Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Max Alt</source>
+      <translation type="unfinished">Max Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Load Current</source>
-      <translation type="unfinished">Load Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param4.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>H Limit</source>
+      <translation type="unfinished">H Limit</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Power Generated</source>
-      <translation type="unfinished">Power Generated</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Calibration</source>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Bus Voltage</source>
-      <translation type="unfinished">Bus Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set sensor offsets</source>
+      <translation type="unfinished">Set sensor offsets</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Rectifier Temperature</source>
-      <translation type="unfinished">Rectifier Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>UAVCAN configure</source>
+      <translation type="unfinished">UAVCAN configure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Battery Current Setpoint</source>
-      <translation type="unfinished">Battery Current Setpoint</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Store parameters</source>
+      <translation type="unfinished">Store parameters</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Generator Temperature</source>
-      <translation type="unfinished">Generator Temperature</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Reboot/Shutdown vehicle</source>
+      <translation type="unfinished">Reboot/Shutdown vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>runtime</source>
-      <translation type="unfinished">runtime</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Override goto</source>
+      <translation type="unfinished">Override goto</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
-      <source>Time until Maintenance</source>
-      <translation type="unfinished">Time until Maintenance</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Mission start</source>
+      <translation type="unfinished">Mission start</translation>
     </message>
-  </context>
-  <context>
-    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_COMPONENT_ARM_DISARM].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Arm/Disarm</source>
+      <translation type="unfinished">Arm/Disarm</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_HOME_POSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get launch position</source>
+      <translation type="unfinished">Get launch position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>MGRS Position</source>
-      <translation type="unfinished">MGRS Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_START_RX_PAIR].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Bind Spektrum receiver</source>
+      <translation type="unfinished">Bind Spektrum receiver</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>HDOP</source>
-      <translation type="unfinished">HDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_GET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get message interval</source>
+      <translation type="unfinished">Get message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>VDOP</source>
-      <translation type="unfinished">VDOP</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_MESSAGE_INTERVAL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set message interval</source>
+      <translation type="unfinished">Set message interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Course Over Ground</source>
-      <translation type="unfinished">Course Over Ground</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Get capabilities</source>
+      <translation type="unfinished">Get capabilities</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>GPS Lock</source>
-      <translation type="unfinished">GPS Lock</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Set camera modes</source>
+      <translation type="unfinished">Set camera modes</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <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">Set camera photo, video modes.</translation>
+    </message>
+    <message>
+      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Take photos,Record video,Survey photo mode</source>
+      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
-      <source>Sat Count</source>
-      <translation type="unfinished">Sat Count</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start image capture</source>
+      <translation type="unfinished">Start image capture</translation>
     </message>
-  </context>
-  <context>
-    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe xAxis</source>
-      <translation type="unfinished">Vibe xAxis</translation>
+      <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">Start taking one or more photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe yAxis</source>
-      <translation type="unfinished">Vibe yAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Interval</source>
+      <translation type="unfinished">Interval</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Vibe zAxis</source>
-      <translation type="unfinished">Vibe zAxis</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_START_CAPTURE].param3.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Photo count</source>
+      <translation type="unfinished">Photo count</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (1)</source>
-      <translation type="unfinished">Clip Count (1)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop image capture</source>
+      <translation type="unfinished">Stop image capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (2)</source>
-      <translation type="unfinished">Clip Count (2)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_IMAGE_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop taking photos.</source>
+      <translation type="unfinished">Stop taking photos.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
-      <source>Clip Count (3)</source>
-      <translation type="unfinished">Clip Count (3)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_TRIGGER_CONTROL].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Trigger control</source>
+      <translation type="unfinished">Trigger control</translation>
     </message>
-  </context>
-  <context>
-    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Direction</source>
-      <translation type="unfinished">Wind Direction</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture</source>
+      <translation type="unfinished">Start video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd</source>
-      <translation type="unfinished">Wind Spd</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Start video capture.</source>
+      <translation type="unfinished">Start video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
-      <source>Wind Spd (vert)</source>
-      <translation type="unfinished">Wind Spd (vert)</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_START_CAPTURE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Status Frequency</source>
+      <translation type="unfinished">Status Frequency</translation>
     </message>
-  </context>
-  <context>
-    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Index Of The First ESC In This Message</source>
-      <translation type="unfinished">Index Of The First ESC In This Message</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture</source>
+      <translation type="unfinished">Stop video capture</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Rotation Per Minute</source>
-      <translation type="unfinished">Rotation Per Minute</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_VIDEO_STOP_CAPTURE].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Stop video capture.</source>
+      <translation type="unfinished">Stop video capture.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Current</source>
-      <translation type="unfinished">Current</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Control high latency link</source>
+      <translation type="unfinished">Control high latency link</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Create panorama</source>
+      <translation type="unfinished">Create panorama</translation>
     </message>
-  </context>
-  <context>
-    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Pending</source>
-      <translation type="unfinished">Blocks Pending</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL Transition</source>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
-      <source>Blocks Loaded</source>
-      <translation type="unfinished">Blocks Loaded</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].description, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Perform flight mode transition.</source>
+      <translation type="unfinished">Perform flight mode transition.</translation>
     </message>
-  </context>
-  <context>
-    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Health</source>
-      <translation type="unfinished">Health</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>VTOL</source>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ecu Index</source>
-      <translation type="unfinished">Ecu Index</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Multi Rotor,Fixed Wing</source>
+      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Rpm</source>
-      <translation type="unfinished">Rpm</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Condition Gate</source>
+      <translation type="unfinished">Condition Gate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Consumed</source>
-      <translation type="unfinished">Fuel Consumed</translation>
+      <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">Delay mission state machine until gate has been reached.</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Fuel Flow</source>
-      <translation type="unfinished">Fuel Flow</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.label, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Ignore Alt</source>
+      <translation type="unfinished">Ignore Alt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Engine Load</source>
-      <translation type="unfinished">Engine Load</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>False,True</source>
+      <translation type="unfinished">False,True</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Position</source>
-      <translation type="unfinished">Throttle Position</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_PREPARE_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload prepare deploy</source>
+      <translation type="unfinished">Payload prepare deploy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Spark dwell time</source>
-      <translation type="unfinished">Spark dwell time</translation>
+      <extracomment>.mavCmdInfo[MAV_CMD_PAYLOAD_CONTROL_DEPLOY].friendlyName, </extracomment>
+      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
+      <source>Payload control deploy</source>
+      <translation type="unfinished">Payload control deploy</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSRTKFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>BarometricPressure</source>
-      <translation type="unfinished">BarometricPressure</translation>
+      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Connected</source>
+      <translation type="unfinished">Connected</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold pressure</source>
-      <translation type="unfinished">Intake mainfold pressure</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Accuracy</source>
+      <translation type="unfinished">Current Survey-In Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Intake mainfold temperature</source>
-      <translation type="unfinished">Intake mainfold temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Latitude</source>
+      <translation type="unfinished">Current Survey-In Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Cylinder head temperature</source>
-      <translation type="unfinished">Cylinder head temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Longitude</source>
+      <translation type="unfinished">Current Survey-In Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Ignition Timing</source>
-      <translation type="unfinished">Ignition Timing</translation>
+      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Altitude</source>
+      <translation type="unfinished">Current Survey-In Altitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Injection Time</source>
-      <translation type="unfinished">Injection Time</translation>
+      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Current Survey-In Duration</source>
+      <translation type="unfinished">Current Survey-In Duration</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Exhaust gas Temperature</source>
-      <translation type="unfinished">Exhaust gas Temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Valid</source>
+      <translation type="unfinished">Survey-In Valid</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Throttle Out</source>
-      <translation type="unfinished">Throttle Out</translation>
+      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Survey-In Active</source>
+      <translation type="unfinished">Survey-In Active</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
-      <source>Pt Compensation</source>
-      <translation type="unfinished">Pt Compensation</translation>
+      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
+      <location filename="../src/GPS/GPSRTKFact.json"/>
+      <source>Number of Satellites</source>
+      <translation type="unfinished">Number of Satellites</translation>
     </message>
   </context>
   <context>
-    <name>TemperatureFact.json</name>
+    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (1)</source>
-      <translation type="unfinished">Temperature (1)</translation>
+      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Angle from ground station to vehicle</source>
+      <translation type="unfinished">Angle from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (2)</source>
-      <translation type="unfinished">Temperature (2)</translation>
+      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Horizontal distance from ground station to vehicle</source>
+      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
-      <source>Temperature (3)</source>
-      <translation type="unfinished">Temperature (3)</translation>
+      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
+      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
+      <source>Vertical distance from Launch (home) position to vehicle</source>
+      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
     </message>
   </context>
   <context>
-    <name>SubmarineFact.json</name>
+    <name>RCToParamDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Camera Tilt</source>
-      <translation type="unfinished">Camera Tilt</translation>
+      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Scale the RC range</source>
+      <translation type="unfinished">Scale the RC range</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Tether Turns</source>
-      <translation type="unfinished">Tether Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Parameter value when RC output is 0</source>
+      <translation type="unfinished">Parameter value when RC output is 0</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 1 level</source>
-      <translation type="unfinished">Lights 1 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Minimum parameter value</source>
+      <translation type="unfinished">Minimum parameter value</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Lights 2 level</source>
-      <translation type="unfinished">Lights 2 level</translation>
+      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
+      <source>Maximum parameter value</source>
+      <translation type="unfinished">Maximum parameter value</translation>
+    </message>
+  </context>
+  <context>
+    <name>QGCMapCircle.Facts.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
+      <source>Radius for geofence circle.</source>
+      <translation type="unfinished">Radius for geofence circle.</translation>
     </message>
+  </context>
+  <context>
+    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Pilot Gain</source>
-      <translation type="unfinished">Pilot Gain</translation>
+      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Latitude of item position</source>
+      <translation type="unfinished">Latitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Input Hold</source>
-      <translation type="unfinished">Input Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Longitude of item position</source>
+      <translation type="unfinished">Longitude of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled</source>
-      <translation type="unfinished">Disabled,Enabled</translation>
+      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Easting of item position</source>
+      <translation type="unfinished">Easting of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Rangefinder</source>
-      <translation type="unfinished">Rangefinder</translation>
+      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Northing of item position</source>
+      <translation type="unfinished">Northing of item position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>RFTarget</source>
-      <translation type="unfinished">RFTarget</translation>
+      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>UTM zone</source>
+      <translation type="unfinished">UTM zone</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Roll/Pitch Toggle</source>
-      <translation type="unfinished">Roll/Pitch Toggle</translation>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>Hemisphere for position</source>
+      <translation type="unfinished">Hemisphere for position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
-      <source>Disabled,Enabled,Unavailable</source>
-      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>North,South</source>
+      <translation type="unfinished">North,South</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
+      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
+      <source>MGRS coordinate</source>
+      <translation type="unfinished">MGRS coordinate</translation>
     </message>
   </context>
   <context>
-    <name>VehicleFact.json</name>
+    <name>SetpointFact.json</name>
     <message>
       <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Setpoint</source>
+      <translation type="unfinished">Roll Setpoint</translation>
     </message>
     <message>
       <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Roll Rate</source>
-      <translation type="unfinished">Roll Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Pitch Rate</source>
-      <translation type="unfinished">Pitch Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Yaw Rate</source>
-      <translation type="unfinished">Yaw Rate</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Ground Speed</source>
-      <translation type="unfinished">Ground Speed</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Air Speed</source>
-      <translation type="unfinished">Air Speed</translation>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Setpoint</source>
+      <translation type="unfinished">Pitch Setpoint</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Climb Rate</source>
-      <translation type="unfinished">Climb Rate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Setpoint</source>
+      <translation type="unfinished">Yaw Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Rel)</source>
-      <translation type="unfinished">Alt (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Roll Rate Setpoint</source>
+      <translation type="unfinished">Roll Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (AMSL)</source>
-      <translation type="unfinished">Alt (AMSL)</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Pitch Rate Setpoint</source>
+      <translation type="unfinished">Pitch Rate Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Alt (Above Terrain)</source>
-      <translation type="unfinished">Alt (Above Terrain)</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SetpointFact.json"/>
+      <source>Yaw Rate Setpoint</source>
+      <translation type="unfinished">Yaw Rate Setpoint</translation>
     </message>
+  </context>
+  <context>
+    <name>GPSFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Distance</source>
-      <translation type="unfinished">Flight Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lat].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Latitude</source>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to Home</source>
-      <translation type="unfinished">Distance to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[lon].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Longitude</source>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Time to Home</source>
-      <translation type="unfinished">Time to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[mgrs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>MGRS Position</source>
+      <translation type="unfinished">MGRS Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Heading to Home</source>
-      <translation type="unfinished">Heading to Home</translation>
+      <extracomment>.QGC.MetaData.Facts[hdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>HDOP</source>
+      <translation type="unfinished">HDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Distance to GCS</source>
-      <translation type="unfinished">Distance to GCS</translation>
+      <extracomment>.QGC.MetaData.Facts[vdop].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>VDOP</source>
+      <translation type="unfinished">VDOP</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Mission Item Index</source>
-      <translation type="unfinished">Mission Item Index</translation>
+      <extracomment>.QGC.MetaData.Facts[courseOverGround].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Course Over Ground</source>
+      <translation type="unfinished">Course Over Ground</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP Heading</source>
-      <translation type="unfinished">Next WP Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[yaw].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Yaw</source>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Next WP distance</source>
-      <translation type="unfinished">Next WP distance</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>GPS Lock</source>
+      <translation type="unfinished">GPS Lock</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Flight Time</source>
-      <translation type="unfinished">Flight Time</translation>
+      <extracomment>.QGC.MetaData.Facts[lock].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/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">None,None,2D Lock,3D Lock,3D DGPS Lock,3D RTK GPS Lock (float),3D RTK GPS Lock (fixed),Static (fixed)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Hobbs Meter</source>
-      <translation type="unfinished">Hobbs Meter</translation>
+      <extracomment>.QGC.MetaData.Facts[count].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GPSFact.json"/>
+      <source>Sat Count</source>
+      <translation type="unfinished">Sat Count</translation>
     </message>
+  </context>
+  <context>
+    <name>TerrainFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Throttle %</source>
-      <translation type="unfinished">Throttle %</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksPending].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Pending</source>
+      <translation type="unfinished">Blocks Pending</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
-      <source>Imu temperature</source>
-      <translation type="unfinished">Imu temperature</translation>
+      <extracomment>.QGC.MetaData.Facts[blocksLoaded].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TerrainFactGroup.json"/>
+      <source>Blocks Loaded</source>
+      <translation type="unfinished">Blocks Loaded</translation>
     </message>
   </context>
   <context>
@@ -2487,2538 +2511,2532 @@
     </message>
   </context>
   <context>
-    <name>LocalPositionFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>VX</source>
-      <translation type="unfinished">VX</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vy</source>
-      <translation type="unfinished">Vy</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
-      <source>Vz</source>
-      <translation type="unfinished">Vz</translation>
-    </message>
-  </context>
-  <context>
-    <name>HygrometerFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>Humidity %</source>
-      <translation type="unfinished">Humidity %</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
-      <source>ID</source>
-      <translation type="unfinished">ID</translation>
-    </message>
-  </context>
-  <context>
-    <name>RPMFact.json</name>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 1</source>
-      <translation type="unfinished">RPM 1</translation>
-    </message>
+    <name>EFIFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 2</source>
-      <translation type="unfinished">RPM 2</translation>
+      <extracomment>.QGC.MetaData.Facts[health].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Health</source>
+      <translation type="unfinished">Health</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 3</source>
-      <translation type="unfinished">RPM 3</translation>
+      <extracomment>.QGC.MetaData.Facts[ecuIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ecu Index</source>
+      <translation type="unfinished">Ecu Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
-      <source>RPM 4</source>
-      <translation type="unfinished">RPM 4</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Rpm</source>
+      <translation type="unfinished">Rpm</translation>
     </message>
-  </context>
-  <context>
-    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Attitude Esimate</source>
-      <translation type="unfinished">Good Attitude Esimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Consumed</source>
+      <translation type="unfinished">Fuel Consumed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Vel Estimate</source>
-      <translation type="unfinished">Good Horiz Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[fuelFlow].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Fuel Flow</source>
+      <translation type="unfinished">Fuel Flow</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Vel Estimate</source>
-      <translation type="unfinished">Good Vert Vel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[engineLoad].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Engine Load</source>
+      <translation type="unfinished">Engine Load</translation>
     </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePos].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Position</source>
+      <translation type="unfinished">Throttle Position</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[sparkTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Spark dwell time</source>
+      <translation type="unfinished">Spark dwell time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos Abs Estimate</source>
-      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[baroPress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>BarometricPressure</source>
+      <translation type="unfinished">BarometricPressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Vert Pos AGL Estimate</source>
-      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakePress].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold pressure</source>
+      <translation type="unfinished">Intake mainfold pressure</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Const Pos Mode Estimate</source>
-      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[intakeTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Intake mainfold temperature</source>
+      <translation type="unfinished">Intake mainfold temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Rel Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[cylinderTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Cylinder head temperature</source>
+      <translation type="unfinished">Cylinder head temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Good Pred Horiz Pos Abs Estimate</source>
-      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
+      <extracomment>.QGC.MetaData.Facts[ignTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Ignition Timing</source>
+      <translation type="unfinished">Ignition Timing</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Gps Glitch</source>
-      <translation type="unfinished">Gps Glitch</translation>
+      <extracomment>.QGC.MetaData.Facts[injTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Injection Time</source>
+      <translation type="unfinished">Injection Time</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Accel Error</source>
-      <translation type="unfinished">Accel Error</translation>
+      <extracomment>.QGC.MetaData.Facts[exGasTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Exhaust gas Temperature</source>
+      <translation type="unfinished">Exhaust gas Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vel Ratio</source>
-      <translation type="unfinished">Vel Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[throttleOut].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Throttle Out</source>
+      <translation type="unfinished">Throttle Out</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Ratio</source>
-      <translation type="unfinished">Horiz Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[ptComp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EFIFact.json"/>
+      <source>Pt Compensation</source>
+      <translation type="unfinished">Pt Compensation</translation>
     </message>
+  </context>
+  <context>
+    <name>VibrationFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Ratio</source>
-      <translation type="unfinished">Vert Pos Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[xAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe xAxis</source>
+      <translation type="unfinished">Vibe xAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Mag Ratio</source>
-      <translation type="unfinished">Mag Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[yAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe yAxis</source>
+      <translation type="unfinished">Vibe yAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>HAGL Ratio</source>
-      <translation type="unfinished">HAGL Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[zAxis].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Vibe zAxis</source>
+      <translation type="unfinished">Vibe zAxis</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>TAS Ratio</source>
-      <translation type="unfinished">TAS Ratio</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (1)</source>
+      <translation type="unfinished">Clip Count (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Horiz Pos Accuracy</source>
-      <translation type="unfinished">Horiz Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (2)</source>
+      <translation type="unfinished">Clip Count (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
-      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
-      <source>Vert Pos Accuracy</source>
-      <translation type="unfinished">Vert Pos Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[clipCount3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VibrationFact.json"/>
+      <source>Clip Count (3)</source>
+      <translation type="unfinished">Clip Count (3)</translation>
     </message>
   </context>
   <context>
-    <name>GPSRTKFact.json</name>
+    <name>GeneratorFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[connected].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
+      <extracomment>.QGC.MetaData.Facts[status].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Status</source>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAccuracy].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Accuracy</source>
-      <translation type="unfinished">Current Survey-In Accuracy</translation>
+      <extracomment>.QGC.MetaData.Facts[genSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Speed</source>
+      <translation type="unfinished">Generator Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLatitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Latitude</source>
-      <translation type="unfinished">Current Survey-In Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current</source>
+      <translation type="unfinished">Battery Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentLongitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Longitude</source>
-      <translation type="unfinished">Current Survey-In Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[loadCurrent].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Load Current</source>
+      <translation type="unfinished">Load Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentAltitude].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Altitude</source>
-      <translation type="unfinished">Current Survey-In Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[powerGenerated].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Power Generated</source>
+      <translation type="unfinished">Power Generated</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[currentDuration].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Current Survey-In Duration</source>
-      <translation type="unfinished">Current Survey-In Duration</translation>
+      <extracomment>.QGC.MetaData.Facts[busVoltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Bus Voltage</source>
+      <translation type="unfinished">Bus Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[valid].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Valid</source>
-      <translation type="unfinished">Survey-In Valid</translation>
+      <extracomment>.QGC.MetaData.Facts[rectifierTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Rectifier Temperature</source>
+      <translation type="unfinished">Rectifier Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[active].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Survey-In Active</source>
-      <translation type="unfinished">Survey-In Active</translation>
+      <extracomment>.QGC.MetaData.Facts[batCurrentSetpoint].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Battery Current Setpoint</source>
+      <translation type="unfinished">Battery Current Setpoint</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[numSatellites].shortDesc, </extracomment>
-      <location filename="../src/GPS/GPSRTKFact.json"/>
-      <source>Number of Satellites</source>
-      <translation type="unfinished">Number of Satellites</translation>
+      <extracomment>.QGC.MetaData.Facts[genTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Generator Temperature</source>
+      <translation type="unfinished">Generator Temperature</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[runtime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>runtime</source>
+      <translation type="unfinished">runtime</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[timeMaintenance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/GeneratorFact.json"/>
+      <source>Time until Maintenance</source>
+      <translation type="unfinished">Time until Maintenance</translation>
     </message>
   </context>
   <context>
-    <name>RCToParamDialog.FactMetaData.json</name>
+    <name>SubmarineFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Scale].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Scale the RC range</source>
-      <translation type="unfinished">Scale the RC range</translation>
+      <extracomment>.QGC.MetaData.Facts[cameraTilt].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Camera Tilt</source>
+      <translation type="unfinished">Camera Tilt</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CenterValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Parameter value when RC output is 0</source>
-      <translation type="unfinished">Parameter value when RC output is 0</translation>
+      <extracomment>.QGC.MetaData.Facts[tetherTurns].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Tether Turns</source>
+      <translation type="unfinished">Tether Turns</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Minimum parameter value</source>
-      <translation type="unfinished">Minimum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 1 level</source>
+      <translation type="unfinished">Lights 1 level</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MaxValue].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/RCToParamDialog.FactMetaData.json"/>
-      <source>Maximum parameter value</source>
-      <translation type="unfinished">Maximum parameter value</translation>
+      <extracomment>.QGC.MetaData.Facts[lights2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Lights 2 level</source>
+      <translation type="unfinished">Lights 2 level</translation>
     </message>
-  </context>
-  <context>
-    <name>EditPositionDialog.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Latitude of item position</source>
-      <translation type="unfinished">Latitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[pilotGain].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Pilot Gain</source>
+      <translation type="unfinished">Pilot Gain</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Longitude of item position</source>
-      <translation type="unfinished">Longitude of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Input Hold</source>
+      <translation type="unfinished">Input Hold</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Easting].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Easting of item position</source>
-      <translation type="unfinished">Easting of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[inputHold].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled</source>
+      <translation type="unfinished">Disabled,Enabled</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Northing].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Northing of item position</source>
-      <translation type="unfinished">Northing of item position</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Rangefinder</source>
+      <translation type="unfinished">Rangefinder</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Zone].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>UTM zone</source>
-      <translation type="unfinished">UTM zone</translation>
+      <extracomment>.QGC.MetaData.Facts[rangefinderTarget].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>RFTarget</source>
+      <translation type="unfinished">RFTarget</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>Hemisphere for position</source>
-      <translation type="unfinished">Hemisphere for position</translation>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Roll/Pitch Toggle</source>
+      <translation type="unfinished">Roll/Pitch Toggle</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Hemisphere].enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[rollPitchToggle].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>North,South</source>
-      <translation type="unfinished">North,South</translation>
-    </message>
-    <message>
-      <extracomment>.QGC.MetaData.Facts[MGRS].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/EditPositionDialog.FactMetaData.json"/>
-      <source>MGRS coordinate</source>
-      <translation type="unfinished">MGRS coordinate</translation>
+      <location filename="../src/Vehicle/FactGroups/SubmarineFact.json"/>
+      <source>Disabled,Enabled,Unavailable</source>
+      <translation type="unfinished">Disabled,Enabled,Unavailable</translation>
     </message>
   </context>
   <context>
-    <name>QGCMapCircle.Facts.json</name>
+    <name>VehicleFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Radius].shortDesc, </extracomment>
-      <location filename="../src/QmlControls/QGCMapCircle.Facts.json"/>
-      <source>Radius for geofence circle.</source>
-      <translation type="unfinished">Radius for geofence circle.</translation>
+      <extracomment>.QGC.MetaData.Facts[roll].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll</source>
+      <translation type="unfinished">Roll</translation>
     </message>
-  </context>
-  <context>
-    <name>APMFollowComponent.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[angle].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Angle from ground station to vehicle</source>
-      <translation type="unfinished">Angle from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[pitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch</source>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[distance].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Horizontal distance from ground station to vehicle</source>
-      <translation type="unfinished">Horizontal distance from ground station to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[heading].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading</source>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[height].shortDesc, </extracomment>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.FactMetaData.json"/>
-      <source>Vertical distance from Launch (home) position to vehicle</source>
-      <translation type="unfinished">Vertical distance from Launch (home) position to vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[rollRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Roll Rate</source>
+      <translation type="unfinished">Roll Rate</translation>
     </message>
-  </context>
-  <context>
-    <name>TransectStyle.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnAroundDistance].shortDesc, .QGC.MetaData.Facts[TurnAroundDistanceMultiRotor].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turn around.</translation>
+      <extracomment>.QGC.MetaData.Facts[pitchRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Pitch Rate</source>
+      <translation type="unfinished">Pitch Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraTriggerInTurnAround].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Camera continues taking images in turn arounds.</source>
-      <translation type="unfinished">Camera continues taking images in turn arounds.</translation>
+      <extracomment>.QGC.MetaData.Facts[yawRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Yaw Rate</source>
+      <translation type="unfinished">Yaw Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[HoverAndCapture].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Stop and Hover at each image point before taking image</source>
-      <translation type="unfinished">Stop and Hover at each image point before taking image</translation>
+      <extracomment>.QGC.MetaData.Facts[groundSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Ground Speed</source>
+      <translation type="unfinished">Ground Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Refly90Degrees].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/TransectStyle.SettingsGroup.json"/>
-      <source>Refly the pattern at a 90 degree angle</source>
-      <translation type="unfinished">Refly the pattern at a 90 degree angle</translation>
+      <extracomment>.QGC.MetaData.Facts[airSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Air Speed</source>
+      <translation type="unfinished">Air Speed</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustTolerance].shortDesc, </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">Additional waypoints within the transect will be added if the terrain altitude difference grows larger than this tolerance.</translation>
+      <extracomment>.QGC.MetaData.Facts[climbRate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Climb Rate</source>
+      <translation type="unfinished">Climb Rate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxClimbRate].shortDesc, </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">The maximum climb rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeRelative].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Rel)</source>
+      <translation type="unfinished">Alt (Rel)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TerrainAdjustMaxDescentRate].shortDesc, </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">The maximum descent rate from one waypoint to another when adjusting for terrain. Set to 0 for no max.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAMSL].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (AMSL)</source>
+      <translation type="unfinished">Alt (AMSL)</translation>
     </message>
-  </context>
-  <context>
-    <name>VTOLLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Distance between landing and approach points.</source>
-      <translation type="unfinished">Distance between landing and approach points.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeAboveTerr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Alt (Above Terrain)</source>
+      <translation type="unfinished">Alt (Above Terrain)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Distance</source>
+      <translation type="unfinished">Flight Distance</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to Home</source>
+      <translation type="unfinished">Distance to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Time to Home</source>
+      <translation type="unfinished">Time to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToHome].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Heading to Home</source>
+      <translation type="unfinished">Heading to Home</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point on ground.</source>
-      <translation type="unfinished">Altitude for landing point on ground.</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToGCS].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Distance to GCS</source>
+      <translation type="unfinished">Distance to GCS</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[missionItemIndex].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Mission Item Index</source>
+      <translation type="unfinished">Mission Item Index</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[headingToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP Heading</source>
+      <translation type="unfinished">Next WP Heading</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/VTOLLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[distanceToNextWP].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Next WP distance</source>
+      <translation type="unfinished">Next WP distance</translation>
     </message>
-  </context>
-  <context>
-    <name>CorridorScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Altitude for the bottom layer of the structure scan.</source>
-      <translation type="unfinished">Altitude for the bottom layer of the structure scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[flightTime].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Flight Time</source>
+      <translation type="unfinished">Flight Time</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[hobbs].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Hobbs Meter</source>
+      <translation type="unfinished">Hobbs Meter</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[throttlePct].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Throttle %</source>
+      <translation type="unfinished">Throttle %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CorridorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Corridor width. Specify 0 width for a single pass scan.</source>
-      <translation type="unfinished">Corridor width. Specify 0 width for a single pass scan.</translation>
+      <extracomment>.QGC.MetaData.Facts[imuTemp].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/VehicleFact.json"/>
+      <source>Imu temperature</source>
+      <translation type="unfinished">Imu temperature</translation>
     </message>
+  </context>
+  <context>
+    <name>EstimatorStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Trigger distance].shortDesc, </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">Distance between each triggering of the camera. 0 specifies not camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodAttitudeEsimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Attitude Esimate</source>
+      <translation type="unfinished">Good Attitude Esimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridSpacing].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CorridorScan.SettingsGroup.json"/>
-      <source>Amount of spacing in between parallel grid lines.</source>
-      <translation type="unfinished">Amount of spacing in between parallel grid lines.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Vel Estimate</source>
+      <translation type="unfinished">Good Horiz Vel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[TurnaroundDistance].shortDesc, </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">Amount of additional distance to add outside the survey area for vehicle turnaround.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertVelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Vel Estimate</source>
+      <translation type="unfinished">Good Vert Vel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>StructureScan.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Rel Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[EntranceAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Vehicle will fly to/from the structure at this altitude.</source>
-      <translation type="unfinished">Vehicle will fly to/from the structure at this altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Horiz Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ScanBottomAlt].shortDesc, </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">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.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos Abs Estimate</source>
+      <translation type="unfinished">Good Vert Pos Abs Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Layers].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Number of scan layers.</source>
-      <translation type="unfinished">Number of scan layers.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodVertPosAGLEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Vert Pos AGL Estimate</source>
+      <translation type="unfinished">Good Vert Pos AGL Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StructureHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Height of structure being scanned.</source>
-      <translation type="unfinished">Height of structure being scanned.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodConstPosModeEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Const Pos Mode Estimate</source>
+      <translation type="unfinished">Good Const Pos Mode Estimate</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StartFromTop].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/StructureScan.SettingsGroup.json"/>
-      <source>Start scanning from top of structure.</source>
-      <translation type="unfinished">Start scanning from top of structure.</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosRelEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Rel Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Rel Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MavCmdInfoMultiRotor.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoMultiRotor.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[goodPredHorizPosAbsEstimate].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Good Pred Horiz Pos Abs Estimate</source>
+      <translation type="unfinished">Good Pred Horiz Pos Abs Estimate</translation>
     </message>
-  </context>
-  <context>
-    <name>MissionSettings.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[PlannedHomePositionAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/MissionSettings.FactMetaData.json"/>
-      <source>Launch position altitude</source>
-      <translation type="unfinished">Launch position altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[gpsGlitch].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Gps Glitch</source>
+      <translation type="unfinished">Gps Glitch</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSpec.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Name].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[accelError].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Accel Error</source>
+      <translation type="unfinished">Accel Error</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Width of camera image sensor.</source>
-      <translation type="unfinished">Width of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[velRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vel Ratio</source>
+      <translation type="unfinished">Vel Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SensorHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Height of camera image sensor.</source>
-      <translation type="unfinished">Height of camera image sensor.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Ratio</source>
+      <translation type="unfinished">Horiz Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageWidth].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution width.</source>
-      <translation type="unfinished">Camera image resolution width.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Ratio</source>
+      <translation type="unfinished">Vert Pos Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageHeight].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera image resolution height.</source>
-      <translation type="unfinished">Camera image resolution height.</translation>
+      <extracomment>.QGC.MetaData.Facts[magRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Mag Ratio</source>
+      <translation type="unfinished">Mag Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FocalLength].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Focal length of camera lens.</source>
-      <translation type="unfinished">Focal length of camera lens.</translation>
+      <extracomment>.QGC.MetaData.Facts[haglRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>HAGL Ratio</source>
+      <translation type="unfinished">HAGL Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Landscape].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera on vehicle is in landscape orientation.</source>
-      <translation type="unfinished">Camera on vehicle is in landscape orientation.</translation>
+      <extracomment>.QGC.MetaData.Facts[tasRatio].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>TAS Ratio</source>
+      <translation type="unfinished">TAS Ratio</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FixedOrientation].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Camera orientation ix fixed and cannot be changed.</source>
-      <translation type="unfinished">Camera orientation ix fixed and cannot be changed.</translation>
+      <extracomment>.QGC.MetaData.Facts[horizPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Horiz Pos Accuracy</source>
+      <translation type="unfinished">Horiz Pos Accuracy</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[MinTriggerInterval].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSpec.FactMetaData.json"/>
-      <source>Minimum amount of time between each camera trigger.</source>
-      <translation type="unfinished">Minimum amount of time between each camera trigger.</translation>
+      <extracomment>.QGC.MetaData.Facts[vertPosAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EstimatorStatusFactGroup.json"/>
+      <source>Vert Pos Accuracy</source>
+      <translation type="unfinished">Vert Pos Accuracy</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoFixedWing.json</name>
+    <name>BatteryFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoFixedWing.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[id].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Id</source>
+      <translation type="unfinished">Battery Id</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraCalc.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraName].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Camera name.</source>
-      <translation type="unfinished">Camera name.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Function</source>
+      <translation type="unfinished">Battery Function</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Value specified is distance to surface.</source>
-      <translation type="unfinished">Value specified is distance to surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryFunction].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,All Flight Systems,Propulsion,Avionics,Payload</source>
+      <translation type="unfinished">n/a,All Flight Systems,Propulsion,Avionics,Payload</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[DistanceToSurface].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Distance vehicle is away from surface.</source>
-      <translation type="unfinished">Distance vehicle is away from surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Battery Type</source>
+      <translation type="unfinished">Battery Type</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ImageDensity].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Image desity at surface.</source>
-      <translation type="unfinished">Image desity at surface.</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,LIPO,LIFE,LION,NIMH</source>
+      <translation type="unfinished">n/a,LIPO,LIFE,LION,NIMH</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FrontalOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the forward facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the forward facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[voltage].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SideOverlap].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraCalc.FactMetaData.json"/>
-      <source>Amount of overlap between images in the side facing direction.</source>
-      <translation type="unfinished">Amount of overlap between images in the side facing direction.</translation>
+      <extracomment>.QGC.MetaData.Facts[percentRemaining].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Percent</source>
+      <translation type="unfinished">Percent</translation>
     </message>
-  </context>
-  <context>
-    <name>SpeedSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlightSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/SpeedSection.FactMetaData.json"/>
-      <source>Set the current flight speed</source>
-      <translation type="unfinished">Set the current flight speed</translation>
+      <extracomment>.QGC.MetaData.Facts[mahConsumed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Consumed</source>
+      <translation type="unfinished">Consumed</translation>
     </message>
-  </context>
-  <context>
-    <name>FWLandingPattern.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Distance between approach and land points.</source>
-      <translation type="unfinished">Distance between approach and land points.</translation>
+      <extracomment>.QGC.MetaData.Facts[current].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingHeading].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Heading from approach to land point.</source>
-      <translation type="unfinished">Heading from approach to land point.</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude to begin landing approach from.</source>
-      <translation type="unfinished">Altitude to begin landing approach from.</translation>
+      <extracomment>.QGC.MetaData.Facts[instantPower].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Watts</source>
+      <translation type="unfinished">Watts</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseDoChangeSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Command a specific speed for the approach, useful for reducing energy before the glide slope.</source>
-      <translation type="unfinished">Command a specific speed for the approach, useful for reducing energy before the glide slope.</translation>
+      <extracomment>.QGC.MetaData.Facts[timeRemaining].shortDesc, .QGC.MetaData.Facts[timeRemainingStr].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Time Remaining</source>
+      <translation type="unfinished">Time Remaining</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FinalApproachSpeed].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Speed to perform the approach at.</source>
-      <translation type="unfinished">Speed to perform the approach at.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>Charge State</source>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterRadius].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter radius.</source>
-      <translation type="unfinished">Loiter radius.</translation>
+      <extracomment>.QGC.MetaData.Facts[chargeState].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Vehicle/FactGroups/BatteryFact.json"/>
+      <source>n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</source>
+      <translation type="unfinished">n/a,Ok,Low,Critical,Emergency,Failed,Unhealthy,Charging</translation>
     </message>
+  </context>
+  <context>
+    <name>WindFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LoiterClockwise].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Loiter clockwise around the final approach point.</source>
-      <translation type="unfinished">Loiter clockwise around the final approach point.</translation>
+      <extracomment>.QGC.MetaData.Facts[direction].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Direction</source>
+      <translation type="unfinished">Wind Direction</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[LandingAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Altitude for landing point.</source>
-      <translation type="unfinished">Altitude for landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[speed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd</source>
+      <translation type="unfinished">Wind Spd</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GlideSlope].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>The glide slope between the loiter and landing point.</source>
-      <translation type="unfinished">The glide slope between the loiter and landing point.</translation>
+      <extracomment>.QGC.MetaData.Facts[verticalSpeed].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/WindFact.json"/>
+      <source>Wind Spd (vert)</source>
+      <translation type="unfinished">Wind Spd (vert)</translation>
     </message>
+  </context>
+  <context>
+    <name>EscStatusFactGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[ValueSetIsDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Value controller approach point is distance</source>
-      <translation type="unfinished">Value controller approach point is distance</translation>
+      <extracomment>.QGC.MetaData.Facts[index].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Index Of The First ESC In This Message</source>
+      <translation type="unfinished">Index Of The First ESC In This Message</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[UseLoiterToAlt].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</source>
-      <translation type="unfinished">Use a loiter to altitude item for final appoach. Otherwise use a regular waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpmFirst].shortDesc, .QGC.MetaData.Facts[rpmSecond].shortDesc, .QGC.MetaData.Facts[rpmThird].shortDesc, .QGC.MetaData.Facts[rpmFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Rotation Per Minute</source>
+      <translation type="unfinished">Rotation Per Minute</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingPhotos].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking photos</source>
-      <translation type="unfinished">Stop taking photos</translation>
+      <extracomment>.QGC.MetaData.Facts[currentFirst].shortDesc, .QGC.MetaData.Facts[currentSecond].shortDesc, .QGC.MetaData.Facts[currentThird].shortDesc, .QGC.MetaData.Facts[currentFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Current</source>
+      <translation type="unfinished">Current</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[StopTakingVideo].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/FWLandingPattern.FactMetaData.json"/>
-      <source>Stop taking video</source>
-      <translation type="unfinished">Stop taking video</translation>
+      <extracomment>.QGC.MetaData.Facts[voltageFirst].shortDesc, .QGC.MetaData.Facts[voltageSecond].shortDesc, .QGC.MetaData.Facts[voltageThird].shortDesc, .QGC.MetaData.Facts[voltageFourth].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/EscStatusFactGroup.json"/>
+      <source>Voltage</source>
+      <translation type="unfinished">Voltage</translation>
     </message>
   </context>
   <context>
-    <name>RallyPoint.FactMetaData.json</name>
+    <name>TemperatureFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Latitude of rally point position</source>
-      <translation type="unfinished">Latitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (1)</source>
+      <translation type="unfinished">Temperature (1)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Longitude of rally point position</source>
-      <translation type="unfinished">Longitude of rally point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (2)</source>
+      <translation type="unfinished">Temperature (2)</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[RelativeAltitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/RallyPoint.FactMetaData.json"/>
-      <source>Altitude of rally point position (home relative)</source>
-      <translation type="unfinished">Altitude of rally point position (home relative)</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/TemperatureFact.json"/>
+      <source>Temperature (3)</source>
+      <translation type="unfinished">Temperature (3)</translation>
     </message>
   </context>
   <context>
-    <name>BreachReturn.FactMetaData.json</name>
+    <name>HygrometerFact.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Latitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Latitude of breach return point position</source>
-      <translation type="unfinished">Latitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[temperature].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Temperature</source>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Longitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Longitude of breach return point position</source>
-      <translation type="unfinished">Longitude of breach return point position</translation>
+      <extracomment>.QGC.MetaData.Facts[humidity].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>Humidity %</source>
+      <translation type="unfinished">Humidity %</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[Altitude].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/BreachReturn.FactMetaData.json"/>
-      <source>Altitude of breach return point position (Rel)</source>
-      <translation type="unfinished">Altitude of breach return point position (Rel)</translation>
+      <extracomment>.QGC.MetaData.Facts[hygrometerid].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/HygrometerFact.json"/>
+      <source>ID</source>
+      <translation type="unfinished">ID</translation>
     </message>
   </context>
   <context>
-    <name>MavCmdInfoCommon.json</name>
-    <message>
-      <extracomment>.mavCmdInfo[HomeRaw].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Home Position</source>
-      <translation type="unfinished">Home Position</translation>
-    </message>
+    <name>DistanceSensorFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Planned home position for mission.</source>
-      <translation type="unfinished">Planned home position for mission.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationNone].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward</source>
+      <translation type="unfinished">Forward</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">Basic</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw45].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Right</source>
+      <translation type="unfinished">Forward/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Right</source>
+      <translation type="unfinished">Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[HomeRaw].param6.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw135].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Right</source>
+      <translation type="unfinished">Rear/Right</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw180].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear</source>
+      <translation type="unfinished">Rear</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">Travel to a position in 3D space.</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw225].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Rear/Left</source>
+      <translation type="unfinished">Rear/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_SPLINE_WAYPOINT].param1.label, .mavCmdInfo[MAV_CMD_NAV_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Left</source>
+      <translation type="unfinished">Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Acceptance</source>
-      <translation type="unfinished">Acceptance</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationYaw315].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Forward/Left</source>
+      <translation type="unfinished">Forward/Left</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pass Radius</source>
-      <translation type="unfinished">Pass Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch90].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Up</source>
+      <translation type="unfinished">Up</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_WAYPOINT].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_UNLIM].param4.label, .mavCmdInfo[MAV_CMD_NAV_LAND].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param4.label, .mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param4.label, .mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[rotationPitch270].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Down</source>
+      <translation type="unfinished">Down</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">Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[minDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Minimum distance sensor can detect</source>
+      <translation type="unfinished">Minimum distance sensor can detect</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 position indefinitely.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position indefinitely.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxDistance].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/DistanceSensorFact.json"/>
+      <source>Maximum distance sensor can detect</source>
+      <translation type="unfinished">Maximum distance sensor can detect</translation>
     </message>
+  </context>
+  <context>
+    <name>LocalPositionFact.json</name>
     <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">Radius</translation>
+      <extracomment>.QGC.MetaData.Facts[x].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>X</source>
+      <translation type="unfinished">X</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">Loiter (turns)</translation>
+      <extracomment>.QGC.MetaData.Facts[y].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Y</source>
+      <translation type="unfinished">Y</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 position for a number of turns.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for a number of turns.</translation>
+      <extracomment>.QGC.MetaData.Facts[z].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Z</source>
+      <translation type="unfinished">Z</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">Turns</translation>
+      <extracomment>.QGC.MetaData.Facts[vx].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>VX</source>
+      <translation type="unfinished">VX</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Leave Loiter</source>
-      <translation type="unfinished">Leave Loiter</translation>
+      <extracomment>.QGC.MetaData.Facts[vy].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vy</source>
+      <translation type="unfinished">Vy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param2.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Any direction</source>
-      <translation type="unfinished">Direction of next waypoint,Any direction</translation>
+      <extracomment>.QGC.MetaData.Facts[vz].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/LocalPositionFact.json"/>
+      <source>Vz</source>
+      <translation type="unfinished">Vz</translation>
     </message>
+  </context>
+  <context>
+    <name>RPMFact.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.label, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exit loiter from</source>
-      <translation type="unfinished">Exit loiter from</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm1].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 1</source>
+      <translation type="unfinished">RPM 1</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TURNS].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param4.enumStrings, .mavCmdInfo[MAV_CMD_NAV_LOITER_TO_ALT].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Center,Tangent</source>
-      <translation type="unfinished">Center,Tangent</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm2].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 2</source>
+      <translation type="unfinished">RPM 2</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">Loiter (time)</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm3].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 3</source>
+      <translation type="unfinished">RPM 3</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 position for an amount of time.</source>
-      <translation type="unfinished">Travel to a position and Loiter around the specified position for an amount of time.</translation>
+      <extracomment>.QGC.MetaData.Facts[rpm4].shortDesc, </extracomment>
+      <location filename="../src/Vehicle/FactGroups/RPMFact.json"/>
+      <source>RPM 4</source>
+      <translation type="unfinished">RPM 4</translation>
     </message>
+  </context>
+  <context>
+    <name>APMMavlinkStreamRate.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
+      <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">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</translation>
     </message>
+  </context>
+  <context>
+    <name>RemoteID.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LOITER_TIME].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Direction of next waypoint,Current direction</source>
-      <translation type="unfinished">Direction of next waypoint,Current direction</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID</source>
+      <translation type="unfinished">Operator ID</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">Return To Launch</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID. Maximum 20 characters.</source>
+      <translation type="unfinished">Operator ID. Maximum 20 characters.</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">Send the vehicle back to the launch position.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID is valid</source>
+      <translation type="unfinished">Operator ID is valid</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDValid].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID has been checked using checksum.</source>
+      <translation type="unfinished">Operator ID has been checked using checksum.</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">Land vehicle at the specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator ID type</source>
+      <translation type="unfinished">Operator ID type</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">Abort Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[operatorIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>CAA</source>
+      <translation type="unfinished">CAA</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Operator ID</source>
+      <translation type="unfinished">Send Operator ID</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_LAND].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disabled,Opportunistic,Required</source>
-      <translation type="unfinished">Disabled,Opportunistic,Required</translation>
+      <extracomment>.QGC.MetaData.Facts[sendOperatorID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends operator ID message</source>
+      <translation type="unfinished">When enabled, sends operator ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_TAKEOFF].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose</source>
+      <translation type="unfinished">Flight Purpose</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">Launch from the ground and travel towards the specified takeoff position.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDFree].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Free Text). Maximum 23 characters.</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">Land local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Emergency Text</source>
+      <translation type="unfinished">Emergency Text</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">Takeoff local</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDEmergency].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Emergency Text). Maximum 23 characters.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Nav follow</source>
-      <translation type="unfinished">Nav follow</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Extended Status</source>
+      <translation type="unfinished">Extended Status</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">Change Altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDExtended].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</source>
+      <translation type="unfinished">Optional plain text for operator to specify operations data (Extended Text). Maximum 23 characters.</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">Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command.</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Self ID type</source>
+      <translation type="unfinished">Self ID type</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">Flight control</translation>
+      <extracomment>.QGC.MetaData.Facts[selfIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Flight Purpose,Emergency,Extended Status</source>
+      <translation type="unfinished">Flight Purpose,Emergency,Extended Status</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Self ID</source>
+      <translation type="unfinished">Send Self ID</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">Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[sendSelfID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends self ID message</source>
+      <translation type="unfinished">When enabled, sends self ID message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Climb,Neutral,Descend</source>
-      <translation type="unfinished">Climb,Neutral,Descend</translation>
+      <extracomment>.QGC.MetaData.Facts[basicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID</source>
+      <translation type="unfinished">Basic ID</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">Loiter (altitude)</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Basic ID Type</source>
+      <translation type="unfinished">Basic ID Type</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">Loiter at specified position until altitude reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</source>
+      <translation type="unfinished">None,SerialNumber (ANSI/CTA-2063),CAA,UTM (RFC4122),Specific</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FOLLOW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>UA type</source>
+      <translation type="unfinished">UA type</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">Vehicle reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[basicIDUaType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</source>
+      <translation type="unfinished">Undefined,Airplane/FixedWing,Helicopter/Multirrotor,Gyroplane,VTOL,Ornithopter,Glider,Kite,Free Ballon,Captive Ballon,Airship,Parachute,Rocket,Tethered powered aircraft,Ground Obstacle,Other</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Path planning</source>
-      <translation type="unfinished">Path planning</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Send Basic ID</source>
+      <translation type="unfinished">Send Basic ID</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">Control autonomous path planning.</translation>
+      <extracomment>.QGC.MetaData.Facts[sendBasicID].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>When enabled, sends basic ID message</source>
+      <translation type="unfinished">When enabled, sends basic ID message</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_GIMBAL_MANAGER_PITCHYAW].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">Advanced</translation>
+      <extracomment>.QGC.MetaData.Facts[region].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Region of operation</source>
+      <translation type="unfinished">Region of operation</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">Local planning</translation>
+      <extracomment>.QGC.MetaData.Facts[region].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>The region of operation the mission will take place in</source>
+      <translation type="unfinished">The region of operation the mission will take place in</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[region].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>FAA,EU</source>
+      <translation type="unfinished">FAA,EU</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">Full planning</translation>
+      <extracomment>.QGC.MetaData.Facts[locationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Location Type</source>
+      <translation type="unfinished">Location Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_PATHPLANNING].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[locationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Operator location Type</source>
+      <translation type="unfinished">Operator location Type</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[locationType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Enable+reset,Enable+reset route only</source>
-      <translation type="unfinished">Disable,Enable,Enable+reset,Enable+reset route only</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</source>
+      <translation type="unfinished">Takeoff(Not Supported),Live GNNS, Fixed (not for FAA)</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">Heading goal</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Latitude Fixed</source>
+      <translation type="unfinished">Latitude Fixed</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">Spline waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[latitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed latitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed latitude to send on SYSTEM message</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">Travel to a position in 3D space using spline path.</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Longitude Fixed</source>
+      <translation type="unfinished">Longitude Fixed</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">Altitude wait</translation>
+      <extracomment>.QGC.MetaData.Facts[longitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Longitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Longitude to send on SYSTEM message</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">VTOL takeoff</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Altitude Fixed</source>
+      <translation type="unfinished">Altitude Fixed</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">Hover straight up to specified altitude, transition to fixed-wing and fly to the specified takeoff location.</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeFixed].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Fixed Altitude to send on SYSTEM message</source>
+      <translation type="unfinished">Fixed Altitude to send on SYSTEM message</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Transition Heading</source>
-      <translation type="unfinished">Transition Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type</source>
+      <translation type="unfinished">Classification Type</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_TAKEOFF].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Default,Next waypoint,Takeoff,Specified,Any</source>
-      <translation type="unfinished">Default,Next waypoint,Takeoff,Specified,Any</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Classification Type of UAS</source>
+      <translation type="unfinished">Classification Type of UAS</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">VTOL land</translation>
+      <extracomment>.QGC.MetaData.Facts[classificationType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,EU</source>
+      <translation type="unfinished">Undeclared,EU</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">Fly to specified location at current altitude, transition to multi-rotor and land.</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category</source>
+      <translation type="unfinished">Category</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_VTOL_LAND].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Approach Alt</source>
-      <translation type="unfinished">Approach Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Category of the UAS in the EU region</source>
+      <translation type="unfinished">Category of the UAS in the EU region</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">Guided enable</translation>
+      <extracomment>.QGC.MetaData.Facts[categoryEU].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Open,Specific,Certified</source>
+      <translation type="unfinished">Undeclared,Open,Specific,Certified</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">Enable/Disabled guided mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].shortDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class</source>
+      <translation type="unfinished">Class</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].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable</source>
-      <translation type="unfinished">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[classEU].longDesc, </extracomment>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Class of the UAS in the EU region</source>
+      <translation type="unfinished">Class of the UAS in the EU region</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_GUIDED_ENABLE].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[classEU].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <location filename="../src/Settings/RemoteID.SettingsGroup.json"/>
+      <source>Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</source>
+      <translation type="unfinished">Undeclared,Class 0,Class 1,Class 2,Class 3,Class 4,Class 5,Class 6</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMap.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until</source>
-      <translation type="unfinished">Delay until</translation>
+      <extracomment>.QGC.MetaData.Facts[mapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map provider for flight maps</source>
+      <translation type="unfinished">Currently selected map provider for flight maps</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay until the specified time is reached.</source>
-      <translation type="unfinished">Delay until the specified time is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected map type for flight maps</source>
+      <translation type="unfinished">Currently selected map type for flight maps</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">Hour (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[elevationMapProvider].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMap.SettingsGroup.json"/>
+      <source>Currently selected elevation map provider</source>
+      <translation type="unfinished">Currently selected elevation map provider</translation>
     </message>
+  </context>
+  <context>
+    <name>RTK.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_NAV_DELAY].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Min (utc)</source>
-      <translation type="unfinished">Min (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Survey in accuracy (U-blox only)</source>
+      <translation type="unfinished">Survey in accuracy (U-blox only)</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">Sec (utc)</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInAccuracyLimit].longDesc, </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">The minimum accuracy value that Survey-In must achieve before it can complete.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_DELAY].friendlyName, .mavCmdInfo[MAV_CMD_CONDITION_DELAY].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay</source>
-      <translation type="unfinished">Delay</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Min observation time</source>
+      <translation type="unfinished">Min observation time</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">Delay the mission for the number of seconds.</translation>
+      <extracomment>.QGC.MetaData.Facts[surveyInMinObservationDuration].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the minimum amount of observation time for the position calculation.</source>
+      <translation type="unfinished">Defines the minimum amount of observation time for the position calculation.</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">Wait for altitude</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Use specified base position</source>
+      <translation type="unfinished">Use specified base position</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">Delay the mission until the specified altitide is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[useFixedBasePosition].longDesc, </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">Specify the values for the RTK base position without having to do a survey in.</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">Conditionals</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Latitude</source>
+      <translation type="unfinished">Base Position Latitude</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">Rate</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLatitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the latitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the latitude of the fixed RTK base position.</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">Wait for distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Longitude</source>
+      <translation type="unfinished">Base Position Longitude</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">Delay the mission until within the specified distance of the next waypoint.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionLongitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the longitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the longitude of the fixed RTK base position.</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">Distance</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Alt (WGS84)</source>
+      <translation type="unfinished">Base Position Alt (WGS84)</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">Wait for Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAltitude].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the altitude of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the altitude of the fixed RTK base position.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Delay the mission until the specified heading is reached.</source>
-      <translation type="unfinished">Delay the mission until the specified heading is reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].shortDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Base Position Accuracy</source>
+      <translation type="unfinished">Base Position Accuracy</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
+      <extracomment>.QGC.MetaData.Facts[fixedBasePositionAccuracy].longDesc, </extracomment>
+      <location filename="../src/Settings/RTK.SettingsGroup.json"/>
+      <source>Defines the accuracy of the fixed RTK base position.</source>
+      <translation type="unfinished">Defines the accuracy of the fixed RTK base position.</translation>
     </message>
+  </context>
+  <context>
+    <name>OfflineMaps.SettingsGroup.json</name>
     <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">Direction</translation>
+      <extracomment>.QGC.MetaData.Facts[minZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Minimum zoom level for downloads.</source>
+      <translation type="unfinished">Minimum zoom level for downloads.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Clockwise,Shortest,Counter-Clockwise</source>
-      <translation type="unfinished">Clockwise,Shortest,Counter-Clockwise</translation>
+      <extracomment>.QGC.MetaData.Facts[maxZoomLevelDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum zoom level for downloads.</source>
+      <translation type="unfinished">Maximum zoom level for downloads.</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">Offset</translation>
+      <extracomment>.QGC.MetaData.Facts[maxTilesForDownload].shortDesc, </extracomment>
+      <location filename="../src/Settings/OfflineMaps.SettingsGroup.json"/>
+      <source>Maximum number of tiles for download.</source>
+      <translation type="unfinished">Maximum number of tiles for download.</translation>
     </message>
+  </context>
+  <context>
+    <name>Mavlink.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_YAW].param4.enumStrings, .mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Relative,Absolute</source>
-      <translation type="unfinished">Relative,Absolute</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry Log after each flight</source>
+      <translation type="unfinished">Save telemetry Log after each flight</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">Set mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySave].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemetry will be saved after each flight completes.</source>
+      <translation type="unfinished">If this option is enabled a telemetry will be saved after each flight completes.</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">Set flight mode</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save telemetry log even if vehicle was not armed</source>
+      <translation type="unfinished">Save telemetry log even if vehicle was not armed</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">Set flight mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[telemetrySaveNotArmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>If this option is enabled a telemtry log will be saved even if vehicle was never armed.</source>
+      <translation type="unfinished">If this option is enabled a telemtry log will be saved even if vehicle was never armed.</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">Custom Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[apmStartMavlinkStreams].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Request start of MAVLink telemetry streams (ArduPilot only)</source>
+      <translation type="unfinished">Request start of MAVLink telemetry streams (ArduPilot only)</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">Sub Mode</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Save CSV Telementry Logs</source>
+      <translation type="unfinished">Save CSV Telementry Logs</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">Jump to item</translation>
+      <extracomment>.QGC.MetaData.Facts[saveCsvTelemetry].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.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">If this option is enabled, all Facts will be written to a CSV file with a 1 Hertz frequency.</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">Mission will continue at the specified item.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlink].shortDesc, .QGC.MetaData.Facts[forwardMavlink].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Enable mavlink forwarding</source>
+      <translation type="unfinished">Enable mavlink forwarding</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Item #</source>
-      <translation type="unfinished">Item #</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name</source>
+      <translation type="unfinished">Host name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_JUMP].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Host name to forward mavlink to. i.e: localhost:14445</source>
+      <translation type="unfinished">Host name to forward mavlink to. i.e: localhost:14445</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">Change speed</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support Host name</source>
+      <translation type="unfinished">Ardupilot Support Host name</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">Change speed and/or throttle set points.</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardMavlinkAPMSupportHostName].longDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</source>
+      <translation type="unfinished">Ardupilot Support server to forward mavlink to. i.e: support.ardupilot.org:xxxx</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">Type</translation>
+      <extracomment>.QGC.MetaData.Facts[mavlink2SigningKey].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>MAVLink 2.0 signing key</source>
+      <translation type="unfinished">MAVLink 2.0 signing key</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Airspeed,Ground Speed,Ascend Speed,Descend Speed</source>
-      <translation type="unfinished">Airspeed,Ground Speed,Ascend Speed,Descend Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[sendGCSHeartbeat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>Send GCS Heartbeat</source>
+      <translation type="unfinished">Send GCS Heartbeat</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">Speed</translation>
+      <extracomment>.QGC.MetaData.Facts[gcsMavlinkSystemID].shortDesc, </extracomment>
+      <location filename="../src/Settings/Mavlink.SettingsGroup.json"/>
+      <source>GCS MAVLink System ID</source>
+      <translation type="unfinished">GCS MAVLink System ID</translation>
     </message>
+  </context>
+  <context>
+    <name>MavlinkActions.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_CHANGE_SPEED].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <extracomment>.QGC.MetaData.Facts[flyViewActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Fly View</source>
+      <translation type="unfinished">Name of JSON custom actions file for Fly View</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">Set launch location</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickActionsFile].shortDesc, </extracomment>
+      <location filename="../src/Settings/MavlinkActions.SettingsGroup.json"/>
+      <source>Name of JSON custom actions file for Joysticks</source>
+      <translation type="unfinished">Name of JSON custom actions file for Joysticks</translation>
     </message>
+  </context>
+  <context>
+    <name>Maps.SettingsGroup.json</name>
     <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">Changes the launch location either to the current location or a specified location.</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheDiskSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max disk cache</source>
+      <translation type="unfinished">Max disk cache</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_HOME].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Vehicle position,Specified position</source>
-      <translation type="unfinished">Vehicle position,Specified position</translation>
+      <extracomment>.QGC.MetaData.Facts[maxCacheMemorySize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Maps.SettingsGroup.json"/>
+      <source>Max memory cache</source>
+      <translation type="unfinished">Max memory cache</translation>
     </message>
+  </context>
+  <context>
+    <name>FirmwareUpgrade.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_PARAMETER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set Parameter</source>
-      <translation type="unfinished">Set Parameter</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultFirmwareType].shortDesc, </extracomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Default firmware type for flashing</source>
+      <translation type="unfinished">Default firmware type for flashing</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">Set relay</translation>
+      <extracomment>.QGC.MetaData.Facts[apmChibiOS].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>ChibiOS,NuttX</source>
+      <translation type="unfinished">ChibiOS,NuttX</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">Set relay to a condition.</translation>
+      <extracomment>.QGC.MetaData.Facts[apmVehicleType].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FirmwareUpgrade.SettingsGroup.json"/>
+      <source>Multi-Rotor,Helicopter,Plane,Rover,Sub</source>
+      <translation type="unfinished">Multi-Rotor,Helicopter,Plane,Rover,Sub</translation>
     </message>
+  </context>
+  <context>
+    <name>FlyView.SettingsGroup.json</name>
     <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">Relay #</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMinimumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Minimum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Minimum altitude for guided actions altitude slider.</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">Value</translation>
+      <extracomment>.QGC.MetaData.Facts[guidedMaximumAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum altitude for guided actions altitude slider.</source>
+      <translation type="unfinished">Maximum altitude for guided actions altitude slider.</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">Cycle relay</translation>
+      <extracomment>.QGC.MetaData.Facts[showLogReplayStatusBar].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show/Hide Log Replay status bar</source>
+      <translation type="unfinished">Show/Hide Log Replay status bar</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">Cycle relay on/off for desired cycles/time.</translation>
+      <extracomment>.QGC.MetaData.Facts[showAdditionalIndicatorsCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show additional heading indicators on Compass</source>
+      <translation type="unfinished">Show additional heading indicators on Compass</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">Cycles</translation>
+      <extracomment>.QGC.MetaData.Facts[lockNoseUpCompass].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Lock Compass Nose-Up</source>
+      <translation type="unfinished">Lock Compass Nose-Up</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">Time</translation>
+      <extracomment>.QGC.MetaData.Facts[keepMapCenteredOnVehicle].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Keep map centered on vehicle</source>
+      <translation type="unfinished">Keep map centered on vehicle</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">Set servo</translation>
+      <extracomment>.QGC.MetaData.Facts[showSimpleCameraControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</source>
+      <translation type="unfinished">Show controls for camera triggering using MAV_CMD_DO_DIGICAM_CONTROL.</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">Set servo to specified PWM value.</translation>
+      <extracomment>.QGC.MetaData.Facts[showObstacleDistanceOverlay].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Show obstacle distance overlay on map and video.</source>
+      <translation type="unfinished">Show obstacle distance overlay on map and video.</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">Servo</translation>
+      <extracomment>.QGC.MetaData.Facts[maxGoToLocationDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Maximum distance allowed for Go To Location.</source>
+      <translation type="unfinished">Maximum distance allowed for Go To Location.</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">PWM</translation>
+      <extracomment>.QGC.MetaData.Facts[forwardFlightGoToLocationLoiterRad].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</source>
+      <translation type="unfinished">Loiter radius for orbiting the Go To Location during forward flight. This only applies if the firmware supports a radius in MAV_CMD_DO_REPOSITION commands.</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">Cycle servo</translation>
+      <extracomment>.QGC.MetaData.Facts[goToLocationRequiresConfirmInGuided].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</source>
+      <translation type="unfinished">Require slide confirmation for Go To Location when the vehicle is already in Guided mode.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator</source>
-      <translation type="unfinished">Set actuator</translation>
+      <extracomment>.QGC.MetaData.Facts[updateHomePosition].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Send updated GCS&apos; home position to autopilot in case of change of the home position</source>
+      <translation type="unfinished">Send updated GCS&apos; home position to autopilot in case of change of the home position</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Set actuator to specified output value (range [-1, 1]).</source>
-      <translation type="unfinished">Set actuator to specified output value (range [-1, 1]).</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Qml file for instrument panel</source>
+      <translation type="unfinished">Qml file for instrument panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 1</source>
-      <translation type="unfinished">Actuator 1</translation>
+      <extracomment>.QGC.MetaData.Facts[instrumentQmlFile2].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</source>
+      <translation type="unfinished">Integrated Compass &amp; Attitude,Horizontal Compass &amp; Attitude,Large Vertical</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 2</source>
-      <translation type="unfinished">Actuator 2</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlAllowTakeover].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</source>
+      <translation type="unfinished">When requesting vehicle control, allow other GCS to override control automatically, or require this GCS to accept the request first.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 3</source>
-      <translation type="unfinished">Actuator 3</translation>
+      <extracomment>.QGC.MetaData.Facts[requestControlTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlyView.SettingsGroup.json"/>
+      <source>Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</source>
+      <translation type="unfinished">Timeout in seconds before a request to a GCS to allow takeover is assumed to be rejected. This is used to display the timeout graphically on requestor and GCS in control.</translation>
     </message>
+  </context>
+  <context>
+    <name>FlightMode.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ACTUATOR].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Actuator 4</source>
-      <translation type="unfinished">Actuator 4</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModes].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FLIGHTTERMINATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Flight termination</source>
-      <translation type="unfinished">Flight termination</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesMultiRotor].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesMultiRotor].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for MultiRotor</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for MultiRotor</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">Land start</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesFixedWing].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesFixedWing].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for FixedWing</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for FixedWing</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">Marker to indicate start of landing sequence.</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesVTOL].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesVTOL].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for VTOL</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for VTOL</translation>
+    </message>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesRoverBoat].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesRoverBoat].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for RoverBoat</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for RoverBoat</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">Rally land</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesSub].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesSub].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Sub</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Sub</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">Go around</translation>
+      <extracomment>.QGC.MetaData.Facts[px4HiddenFlightModesAirship].shortDesc, .QGC.MetaData.Facts[apmHiddenFlightModesAirship].shortDesc, </extracomment>
+      <location filename="../src/Settings/FlightMode.SettingsGroup.json"/>
+      <source>Comma separated list of hidden flight modes for Airship</source>
+      <translation type="unfinished">Comma separated list of hidden flight modes for Airship</translation>
     </message>
+  </context>
+  <context>
+    <name>AutoConnect.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_REPOSITION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Reposition</source>
-      <translation type="unfinished">Reposition</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection over UDP</source>
+      <translation type="unfinished">Automatically open a connection over UDP</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">Pause/Continue</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectUDP].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a UDP communication link.</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">Set moving direction</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a Pixhawk board</source>
+      <translation type="unfinished">Automatically connect to a Pixhawk board</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">Set moving direction to forward or reverse.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectPixhawk].longDesc, </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">If this option is enabled GroundControl will automatically connect to a Pixhawk board which is connected via USB.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_REVERSE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Forward,Reverse</source>
-      <translation type="unfinished">Forward,Reverse</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a SiK Radio</source>
+      <translation type="unfinished">Automatically connect to a SiK Radio</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">Region of interest (ROI)</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectSiKRadio].longDesc, </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">If this option is enabled GroundControl will automatically connect to a vehicle which is detected on a SiK Radio communication link.</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">Sets the region of interest for cameras.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to an RTK GPS</source>
+      <translation type="unfinished">Automatically connect to an RTK GPS</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">Camera</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectRTKGPS].longDesc, </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">If this option is enabled GroundControl will automatically connect to an RTK GPS which is connected via USB.</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">ROI to next waypoint</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically connect to a LibrePilot</source>
+      <translation type="unfinished">Automatically connect to a LibrePilot</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">Sets the region of interest to point towards the next waypoint with optional offsets.</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectLibrePilot].longDesc, </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">If this option is enabled GroundControl will automatically connect to a LibrePilot board which is connected via USB.</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">Pitch offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaPort].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaPort].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS device for GCS position</source>
+      <translation type="unfinished">NMEA GPS device for GCS position</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">Roll offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectNmeaBaud].shortDesc, .QGC.MetaData.Facts[autoConnectNmeaBaud].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>NMEA GPS Baudrate</source>
+      <translation type="unfinished">NMEA GPS Baudrate</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">Yaw offset</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Automatically open a connection with Zero-Conf</source>
+      <translation type="unfinished">Automatically open a connection with Zero-Conf</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">Cancel ROI</translation>
+      <extracomment>.QGC.MetaData.Facts[autoConnectZeroConf].longDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</source>
+      <translation type="unfinished">If this option is enabled GroundControl will automatically connect to a vehicle which is detected over Zero-Conf.</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">Cancels the region of interest.</translation>
+      <extracomment>.QGC.MetaData.Facts[udpListenPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP port for autoconnect</source>
+      <translation type="unfinished">UDP port for autoconnect</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">Control video</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostIP].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host IP for autoconnect</source>
+      <translation type="unfinished">UDP target host IP for autoconnect</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">Region of interest</translation>
+      <extracomment>.QGC.MetaData.Facts[udpTargetHostPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>UDP target host port for autoconnect</source>
+      <translation type="unfinished">UDP target host port for autoconnect</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>None,Next waypoint,Mission item,Location,ROI item</source>
-      <translation type="unfinished">None,Next waypoint,Mission item,Location,ROI item</translation>
+      <extracomment>.QGC.MetaData.Facts[nmeaUdpPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/AutoConnect.SettingsGroup.json"/>
+      <source>Udp port to receive NMEA streams</source>
+      <translation type="unfinished">Udp port to receive NMEA streams</translation>
     </message>
+  </context>
+  <context>
+    <name>PlanView.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_ROI].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission Index</source>
-      <translation type="unfinished">Mission Index</translation>
+      <extracomment>.QGC.MetaData.Facts[displayPresetsTabFirst].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Display the presets tab at start</source>
+      <translation type="unfinished">Display the presets tab at start</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">ROI Index</translation>
+      <extracomment>.QGC.MetaData.Facts[showMissionItemStatus].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show/Hide the mission item status display</source>
+      <translation type="unfinished">Show/Hide the mission item status display</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">Camera config</translation>
+      <extracomment>.QGC.MetaData.Facts[takeoffItemNotRequired].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow missions to not require a takeoff item</source>
+      <translation type="unfinished">Allow missions to not require a takeoff item</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">Configure onboard camera controller.</translation>
+      <extracomment>.QGC.MetaData.Facts[allowMultipleLandingPatterns].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</source>
+      <translation type="unfinished">Allow configuring multiple landing sequences if the firmware supports it. The first one will be used for the mission, but in the event of an RTL, the one that is closest will be used instead.</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">Shutter spd</translation>
+      <extracomment>.QGC.MetaData.Facts[useConditionGate].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
+      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</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">Aperture</translation>
+      <extracomment>.QGC.MetaData.Facts[showGimbalOnlyWhenSet].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Show gimbal yaw visual only when set explicitly for the waypoint</source>
+      <translation type="unfinished">Show gimbal yaw visual only when set explicitly for the waypoint</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">ISO</translation>
+      <extracomment>.QGC.MetaData.Facts[vtolTransitionDistance].shortDesc, </extracomment>
+      <location filename="../src/Settings/PlanView.SettingsGroup.json"/>
+      <source>Amount of distance required for vehicle to complete a transition</source>
+      <translation type="unfinished">Amount of distance required for vehicle to complete a transition</translation>
     </message>
+  </context>
+  <context>
+    <name>ADSBVehicleManager.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Exposure</source>
-      <translation type="unfinished">Exposure</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS server</source>
+      <translation type="unfinished">Connect to ADSB SBS server</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">Command</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerConnectEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Connect to ADSB SBS-1 server using specified address/port</source>
+      <translation type="unfinished">Connect to ADSB SBS-1 server using specified address/port</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONFIGURE].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Cut off</source>
-      <translation type="unfinished">Cut off</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerHostAddress].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Host address</source>
+      <translation type="unfinished">Host address</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">Camera control</translation>
+      <extracomment>.QGC.MetaData.Facts[adsbServerPort].shortDesc, </extracomment>
+      <location filename="../src/Settings/ADSBVehicleManager.SettingsGroup.json"/>
+      <source>Server port</source>
+      <translation type="unfinished">Server port</translation>
     </message>
+  </context>
+  <context>
+    <name>Video.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_DIGICAM_CONTROL].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control onboard camera.</source>
-      <translation type="unfinished">Control onboard camera.</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video source</source>
+      <translation type="unfinished">Video source</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">Session</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSource].longDesc, </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">Source for video. UDP, TCP, RTSP and UVC Cameras may be supported depending on Vehicle and ground station version.</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">Zoom</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video UDP Url</source>
+      <translation type="unfinished">Video UDP Url</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">Step</translation>
+      <extracomment>.QGC.MetaData.Facts[udpUrl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</source>
+      <translation type="unfinished">UDP url address and port to bind to for video stream. Example: 0.0.0.0:5600</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">Focus lock</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video RTSP Url</source>
+      <translation type="unfinished">Video RTSP Url</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">Id</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspUrl].longDesc, </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">RTSP url address and port to bind to for video stream. Example: rtsp://192.168.42.1:554/live</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">Configure Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video TCP Url</source>
+      <translation type="unfinished">Video TCP Url</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">Configure the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[tcpUrl].longDesc, </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">TCP url address and port to bind to for video stream. Example: 192.168.143.200:3001</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param1.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONTROL].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</source>
-      <translation type="unfinished">Retract,Neutral,Mavlink Targeting,RC Targeting,GPS Point</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video save directory</source>
+      <translation type="unfinished">Video save directory</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">Stabilize Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoSavePath].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Directory to save videos to.</source>
+      <translation type="unfinished">Directory to save videos to.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param2.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param3.enumStrings, .mavCmdInfo[MAV_CMD_DO_MOUNT_CONFIGURE].param4.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No,Yes</source>
-      <translation type="unfinished">No,Yes</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio</source>
+      <translation type="unfinished">Video Aspect Ratio</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">Stabilize Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[aspectRatio].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Aspect Ratio (width / height). Use 0.0 to ignore it.</source>
+      <translation type="unfinished">Video Aspect Ratio (width / height). Use 0.0 to ignore it.</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">Stabilize Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Grid Lines</source>
+      <translation type="unfinished">Video Grid Lines</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">Control Mount</translation>
+      <extracomment>.QGC.MetaData.Facts[gridLines].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Displays a grid overlaid over the video view.</source>
+      <translation type="unfinished">Displays a grid overlaid over the video view.</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">Control the vehicle mount (e.g. gimbal).</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Display Fit</source>
+      <translation type="unfinished">Video Display Fit</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">Lat/Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Handle Video Aspect Ratio.</source>
+      <translation type="unfinished">Handle Video Aspect Ratio.</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">Lon/Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[videoFit].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Fit Width,Fit Height,Fill,No Crop</source>
+      <translation type="unfinished">Fit Width,Fit Height,Fill,No Crop</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">Alt/Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show Video Record Control</source>
+      <translation type="unfinished">Show Video Record Control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal Manager PitchYaw</source>
-      <translation type="unfinished">Gimbal Manager PitchYaw</translation>
+      <extracomment>.QGC.MetaData.Facts[showRecControl].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Show recording control in the UI.</source>
+      <translation type="unfinished">Show recording control in the UI.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control the gimbal during the mission</source>
-      <translation type="unfinished">Control the gimbal during the mission</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Recording Format</source>
+      <translation type="unfinished">Video Recording Format</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param1.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video recording file format.</source>
+      <translation type="unfinished">Video recording file format.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Pitch rate</source>
-      <translation type="unfinished">Pitch rate</translation>
+      <extracomment>.QGC.MetaData.Facts[recordingFormat].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>mkv,mov,mp4</source>
+      <translation type="unfinished">mkv,mov,mp4</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param4.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Yaw rate</source>
-      <translation type="unfinished">Yaw rate</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Max Video Storage Usage</source>
+      <translation type="unfinished">Max Video Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw</source>
-      <translation type="unfinished">Follow yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[maxVideoSize].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Maximum amount of disk space used by video recording.</source>
+      <translation type="unfinished">Maximum amount of disk space used by video recording.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param5.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Follow yaw, Lock yaw</source>
-      <translation type="unfinished">Follow yaw, Lock yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Enable/Disable Limits on Storage Usage</source>
+      <translation type="unfinished">Enable/Disable Limits on Storage Usage</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[enableStorageLimit].longDesc, </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">When enabled, old video files will be auto-deleted when the total size of QGC-recorded video exceeds the maximum video storage usage.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GIMBAL_MANAGER_PITCHYAW].param7.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Primary,first gimbal,second gimbal</source>
-      <translation type="unfinished">Primary,first gimbal,second gimbal</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>RTSP Video Timeout</source>
+      <translation type="unfinished">RTSP Video Timeout</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">Camera trigger distance</translation>
+      <extracomment>.QGC.MetaData.Facts[rtspTimeout].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>How long to wait before assuming RTSP link is gone.</source>
+      <translation type="unfinished">How long to wait before assuming RTSP link is gone.</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">Set camera trigger distance.</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Enabled</source>
+      <translation type="unfinished">Video Stream Enabled</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">Shutter</translation>
+      <extracomment>.QGC.MetaData.Facts[streamEnabled].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Start/Stop Video Stream.</source>
+      <translation type="unfinished">Start/Stop Video Stream.</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">Trigger</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Video Stream Disnabled When Armed</source>
+      <translation type="unfinished">Video Stream Disnabled When Armed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_CAM_TRIGG_DIST].param3.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>No Trigger,Once Immediately</source>
-      <translation type="unfinished">No Trigger,Once Immediately</translation>
+      <extracomment>.QGC.MetaData.Facts[disableWhenDisarmed].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Disable Video Stream when disarmed.</source>
+      <translation type="unfinished">Disable Video Stream when disarmed.</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">Enable geofence</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Tweaks video for lower latency</source>
+      <translation type="unfinished">Tweaks video for lower latency</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable geofence.</source>
-      <translation type="unfinished">Enable/Disable geofence.</translation>
+      <extracomment>.QGC.MetaData.Facts[lowLatencyMode].longDesc, </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">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.</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">Safety</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].shortDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force specific category of video decode</source>
+      <translation type="unfinished">Force specific category of video decode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Disable floor only,Enable</source>
-      <translation type="unfinished">Disable,Disable floor only,Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].longDesc, </extracomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</source>
+      <translation type="unfinished">Force the change of prioritization between video decode methods, allowing the user to force some video hardware decode plugins if necessary.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Trigger parachute</source>
-      <translation type="unfinished">Trigger parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[forceVideoDecoder].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/Video.SettingsGroup.json"/>
+      <source>Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</source>
+      <translation type="unfinished">Default,Force software decoder,Force NVIDIA decoder,Force VA-API decoder,Force DirectX3D 11 decoder,Force VideoToolbox decoder,Force Intel decoder,Force Vulkan decoder</translation>
     </message>
+  </context>
+  <context>
+    <name>Viewer3D.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable/Disable auto-release or Release a parachute</source>
-      <translation type="unfinished">Enable/Disable auto-release or Release a parachute</translation>
+      <extracomment>.QGC.MetaData.Facts[enabled].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Enable the 3D viewer</source>
+      <translation type="unfinished">Enable the 3D viewer</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_PARACHUTE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Disable,Enable,Release</source>
-      <translation type="unfinished">Disable,Enable,Release</translation>
+      <extracomment>.QGC.MetaData.Facts[osmFilePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Path to the OSM file for the 3D viewer.</source>
+      <translation type="unfinished">Path to the OSM file for the 3D viewer.</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">Motor test</translation>
+      <extracomment>.QGC.MetaData.Facts[buildingLevelHeight].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Average Height for each level of the buildings</source>
+      <translation type="unfinished">Average Height for each level of the buildings</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">Inverted flight</translation>
+      <extracomment>.QGC.MetaData.Facts[altitudeBias].shortDesc, </extracomment>
+      <location filename="../src/Settings/Viewer3D.SettingsGroup.json"/>
+      <source>Altitude bias for vehicles in the 3D View</source>
+      <translation type="unfinished">Altitude bias for vehicles in the 3D View</translation>
     </message>
+  </context>
+  <context>
+    <name>GimbalController.SettingsGroup.json</name>
     <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">Change to/from inverted flight.</translation>
+      <extracomment>.QGC.MetaData.Facts[EnableOnScreenControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Enable on Screen Camera Control</source>
+      <translation type="unfinished">Enable on Screen Camera Control</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">Inverted</translation>
+      <extracomment>.QGC.MetaData.Facts[ControlType].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Type of on-screen control</source>
+      <translation type="unfinished">Type of on-screen control</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_INVERTED_FLIGHT].param1.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[ControlType].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Normal,Inverted</source>
-      <translation type="unfinished">Normal,Inverted</translation>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Click to point, click and drag</source>
+      <translation type="unfinished">Click to point, click and drag</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Gripper Mechanism</source>
-      <translation type="unfinished">Gripper Mechanism</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraVFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Vertical camera field of view</source>
+      <translation type="unfinished">Vertical camera field of view</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].description, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control a gripper mechanism.</source>
-      <translation type="unfinished">Control a gripper mechanism.</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraHFov].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Horizontal camera field of view</source>
+      <translation type="unfinished">Horizontal camera field of view</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">Gripper id</translation>
+      <extracomment>.QGC.MetaData.Facts[CameraSlideSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Maximum gimbal speed on click and drag (deg/sec)</source>
+      <translation type="unfinished">Maximum gimbal speed on click and drag (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
+      <extracomment>.QGC.MetaData.Facts[showAzimuthIndicatorOnMap].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show gimbal Azimuth indicator over vehicle icon in map</source>
+      <translation type="unfinished">Show gimbal Azimuth indicator over vehicle icon in map</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GRIPPER].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Release,Grab</source>
-      <translation type="unfinished">Release,Grab</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAzimuth].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth instead of local yaw on top toolbar gimbal indicator</source>
+      <translation type="unfinished">Show Azimuth instead of local yaw on top toolbar gimbal indicator</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">AutoTune Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[toolbarIndicatorShowAcquireReleaseControl].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Show Azimuth Acquire/release buttons in the gimbal buttons panel</source>
+      <translation type="unfinished">Show Azimuth Acquire/release buttons in the gimbal buttons panel</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">AutoTune Enable.</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>Rate used for joystick button control (deg/sec)</source>
+      <translation type="unfinished">Rate used for joystick button control (deg/sec)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_AUTOTUNE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[joystickButtonsSpeed].longDesc, </extracomment>
+      <location filename="../src/Settings/GimbalController.SettingsGroup.json"/>
+      <source>When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</source>
+      <translation type="unfinished">When a joystick button is set to gimbal left/right/up/down, it will send this rate when pressed, and it will stop moving when button is released</translation>
     </message>
+  </context>
+  <context>
+    <name>BatteryIndicator.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Guided limits</source>
-      <translation type="unfinished">Guided limits</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Select values to display in indicator</source>
+      <translation type="unfinished">Select values to display in indicator</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">Set limits for external control</translation>
+      <extracomment>.QGC.MetaData.Facts[valueDisplay].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Percentage,Voltage,Percentage and Voltage</source>
+      <translation type="unfinished">Percentage,Voltage,Percentage and Voltage</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">Timeout</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold1].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 1</source>
+      <translation type="unfinished">Battery level threshold 1</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">Min Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[threshold2].shortDesc, </extracomment>
+      <location filename="../src/Settings/BatteryIndicator.SettingsGroup.json"/>
+      <source>Battery level threshold 2</source>
+      <translation type="unfinished">Battery level threshold 2</translation>
     </message>
+  </context>
+  <context>
+    <name>BrandImage.SettingsGroup.json</name>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_GUIDED_LIMITS].param3.label, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Max Alt</source>
-      <translation type="unfinished">Max Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].shortDesc, .QGC.MetaData.Facts[userBrandImageOutdoor].shortDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>User-selected brand image</source>
+      <translation type="unfinished">User-selected brand image</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">H Limit</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageIndoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (indoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (indoor)</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_CALIBRATION].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
+      <extracomment>.QGC.MetaData.Facts[userBrandImageOutdoor].longDesc, </extracomment>
+      <location filename="../src/Settings/BrandImage.SettingsGroup.json"/>
+      <source>Location in file system of user-selected brand image (outdoor)</source>
+      <translation type="unfinished">Location in file system of user-selected brand image (outdoor)</translation>
+    </message>
+  </context>
+  <context>
+    <name>App.SettingsGroup.json</name>
+    <message>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing firmware class</source>
+      <translation type="unfinished">Offline editing firmware class</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">Set sensor offsets</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingFirmwareClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>ArduPilot,PX4 Pro,Mavlink Generic</source>
+      <translation type="unfinished">ArduPilot,PX4 Pro,Mavlink Generic</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_UAVCAN].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>UAVCAN configure</source>
-      <translation type="unfinished">UAVCAN configure</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing vehicle class</source>
+      <translation type="unfinished">Offline editing vehicle class</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PREFLIGHT_STORAGE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Store parameters</source>
-      <translation type="unfinished">Store parameters</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingVehicleClass].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</source>
+      <translation type="unfinished">Fixed Wing,Multi-Rotor,VTOL,Rover,Sub,Mavlink Generic</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">Reboot/Shutdown vehicle</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing cruise speed</source>
+      <translation type="unfinished">Offline editing cruise speed</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_OVERRIDE_GOTO].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Override goto</source>
-      <translation type="unfinished">Override goto</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingCruiseSpeed].longDesc, </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">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.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_MISSION_START].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Mission start</source>
-      <translation type="unfinished">Mission start</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing hover speed</source>
+      <translation type="unfinished">Offline editing hover speed</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">Arm/Disarm</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingHoverSpeed].longDesc, </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">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.</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">Get launch position</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing ascent speed</source>
+      <translation type="unfinished">Offline editing ascent speed</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">Bind Spektrum receiver</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingAscentSpeed].longDesc, </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">This value defines the ascent speed for multi-rotor vehicles for use in calculating mission duration.</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">Get message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Offline editing descent speed</source>
+      <translation type="unfinished">Offline editing descent speed</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">Set message interval</translation>
+      <extracomment>.QGC.MetaData.Facts[offlineEditingDescentSpeed].longDesc, </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">This value defines the cruising speed for multi-rotor vehicles for use in calculating mission duration.</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">Get capabilities</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Announce battery remaining percent</source>
+      <translation type="unfinished">Announce battery remaining percent</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">Set camera modes</translation>
+      <extracomment>.QGC.MetaData.Facts[batteryPercentRemainingAnnounce].longDesc, </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">Announce the remaining battery percent when it falls below the specified percentage.</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">Set camera photo, video modes.</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Default value for altitude</source>
+      <translation type="unfinished">Default value for altitude</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_SET_CAMERA_MODE].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Take photos,Record video,Survey photo mode</source>
-      <translation type="unfinished">Take photos,Record video,Survey photo mode</translation>
+      <extracomment>.QGC.MetaData.Facts[defaultMissionItemAltitude].longDesc, </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">This value specifies the default altitude for new items added to a mission.</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">Start image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Mute audio output</source>
+      <translation type="unfinished">Mute audio output</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">Start taking one or more photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[audioMuted].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled all audio output will be muted.</source>
+      <translation type="unfinished">If this option is enabled all audio output will be muted.</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">Interval</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Show virtual joystick</source>
+      <translation type="unfinished">Show virtual joystick</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">Photo count</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystick].longDesc, </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">If this option is enabled the virtual joystick will be shown on the Fly view.</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">Stop image capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Auto-Center Throttle</source>
+      <translation type="unfinished">Auto-Center Throttle</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">Stop taking photos.</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickAutoCenterThrottle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If enabled the throttle stick will snap back to center when released.</source>
+      <translation type="unfinished">If enabled the throttle stick will snap back to center when released.</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">Trigger control</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Left Handed Mode</source>
+      <translation type="unfinished">Left Handed Mode</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">Start video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[virtualJoystickLeftHandedMode].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the virtual joystick layout will be reversed</source>
+      <translation type="unfinished">If this option is enabled the virtual joystick layout will be reversed</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">Start video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Video streaming debug</source>
+      <translation type="unfinished">Video streaming debug</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">Status Frequency</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].longDesc, </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">Sets the environment variable GST_DEBUG for all pipeline elements on boot.</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">Stop video capture</translation>
+      <extracomment>.QGC.MetaData.Facts[gstDebugLevel].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</source>
+      <translation type="unfinished">Disabled,Error,Warning,FixMe,Info,Debug,Log,Trace</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">Stop video capture.</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Use preflight checklist</source>
+      <translation type="unfinished">Use preflight checklist</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONTROL_HIGH_LATENCY].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Control high latency link</source>
-      <translation type="unfinished">Control high latency link</translation>
+      <extracomment>.QGC.MetaData.Facts[useChecklist].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is enabled the preflight checklist will be used.</source>
+      <translation type="unfinished">If this option is enabled the preflight checklist will be used.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_PANORAMA_CREATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Create panorama</source>
-      <translation type="unfinished">Create panorama</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Preflight checklist must pass before arming</source>
+      <translation type="unfinished">Preflight checklist must pass before arming</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">VTOL Transition</translation>
+      <extracomment>.QGC.MetaData.Facts[enforceChecklist].longDesc, </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">If this option is enabled the preflight checklist must pass before arming.</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">Perform flight mode transition.</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].category, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[enableMultiVehiclePanel].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Enable Multi-Vehicle Panel when multiple vehicles are connected.</source>
+      <translation type="unfinished">Enable Multi-Vehicle Panel when multiple vehicles are connected.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_VTOL_TRANSITION].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Multi Rotor,Fixed Wing</source>
-      <translation type="unfinished">Multi Rotor,Fixed Wing</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application font size</source>
+      <translation type="unfinished">Application font size</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].friendlyName, </extracomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>Condition Gate</source>
-      <translation type="unfinished">Condition Gate</translation>
+      <extracomment>.QGC.MetaData.Facts[appFontPointSize].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The point size for the default font used.</source>
+      <translation type="unfinished">The point size for the default font used.</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">Delay mission state machine until gate has been reached.</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application color scheme</source>
+      <translation type="unfinished">Application color scheme</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">Ignore Alt</translation>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>The color scheme for the user interface.</source>
+      <translation type="unfinished">The color scheme for the user interface.</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_CONDITION_GATE].param2.enumStrings, </extracomment>
+      <extracomment>.QGC.MetaData.Facts[indoorPalette].enumStrings, </extracomment>
       <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/MavCmdInfoCommon.json"/>
-      <source>False,True</source>
-      <translation type="unfinished">False,True</translation>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Indoor,Outdoor</source>
+      <translation type="unfinished">Indoor,Outdoor</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">Payload prepare deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application save directory</source>
+      <translation type="unfinished">Application save directory</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">Payload control deploy</translation>
+      <extracomment>.QGC.MetaData.Facts[savePath].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Directory to which all data files are saved/loaded from</source>
+      <translation type="unfinished">Directory to which all data files are saved/loaded from</translation>
     </message>
-  </context>
-  <context>
-    <name>CameraSection.FactMetaData.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify whether the camera should take photos or video</source>
-      <translation type="unfinished">Specify whether the camera should take photos or video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Save to SD card</source>
+      <translation type="unfinished">Save to SD card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraAction].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <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">No change,Take photo,Take photos (time),Take photos (distance),Stop taking photos,Start recording video,Stop recording video</translation>
+      <extracomment>.QGC.MetaData.Facts[androidSaveToSDCard].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Application data is saved to the sd card</source>
+      <translation type="unfinished">Application data is saved to the sd card</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalDistance].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the distance between each photo</source>
-      <translation type="unfinished">Specify the distance between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Mapbox maps</source>
+      <translation type="unfinished">Access token to Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraPhotoIntervalTime].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Specify the time between each photo</source>
-      <translation type="unfinished">Specify the time between each photo</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Mapbox maps</source>
+      <translation type="unfinished">Your personal access token for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalPitch].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal pitch rotation.</source>
-      <translation type="unfinished">Gimbal pitch rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Account name for Mapbox maps</source>
+      <translation type="unfinished">Account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GimbalYaw].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Gimbal yaw rotation.</source>
-      <translation type="unfinished">Gimbal yaw rotation.</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxAccount].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal account name for Mapbox maps</source>
+      <translation type="unfinished">Your personal account name for Mapbox maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].shortDesc, </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">Specify whether the camera should switch to Photo, Video or Survey mode</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map style ID</source>
+      <translation type="unfinished">Map style ID</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[CameraMode].enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/MissionManager/CameraSection.FactMetaData.json"/>
-      <source>Photo,Video,Survey</source>
-      <translation type="unfinished">Photo,Video,Survey</translation>
+      <extracomment>.QGC.MetaData.Facts[mapboxStyle].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Map design style ID for Mapbox maps</source>
+      <translation type="unfinished">Map design style ID for Mapbox maps</translation>
     </message>
-  </context>
-  <context>
-    <name>Survey.SettingsGroup.json</name>
     <message>
-      <extracomment>.QGC.MetaData.Facts[GridAngle].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Angle for parallel lines of grid.</source>
-      <translation type="unfinished">Angle for parallel lines of grid.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Access token to Esri maps</source>
+      <translation type="unfinished">Access token to Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[FlyAlternateTransects].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Fly every other transect in each pass.</source>
-      <translation type="unfinished">Fly every other transect in each pass.</translation>
+      <extracomment>.QGC.MetaData.Facts[esriToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for Esri maps</source>
+      <translation type="unfinished">Your personal access token for Esri maps</translation>
     </message>
     <message>
-      <extracomment>.QGC.MetaData.Facts[SplitConcavePolygons].shortDesc, </extracomment>
-      <location filename="../src/MissionManager/Survey.SettingsGroup.json"/>
-      <source>Split mission concave polygons into separate regular, convex polygons.</source>
-      <translation type="unfinished">Split mission concave polygons into separate regular, convex polygons.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Custom Map URL</source>
+      <translation type="unfinished">Custom Map URL</translation>
     </message>
-  </context>
-  <context>
-    <name>APM-MavCmdInfoCommon.json</name>
     <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">Take off from the ground and ascend to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[customURL].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</source>
+      <translation type="unfinished">URL for X Y Z map with {x} {y} {z} or {zoom} substitutions. Eg: https://basemaps.linz.govt.nz/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.png?api=d01ev80nqcjxddfvc6amyvkk1ka</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">Takeoff to specified altitude.</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>VWorld Token</source>
+      <translation type="unfinished">VWorld Token</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">VTOL</translation>
+      <extracomment>.QGC.MetaData.Facts[vworldToken].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Your personal access token for VWorld maps</source>
+      <translation type="unfinished">Your personal access token for VWorld maps</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">Land using VTOL mode.</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Stream GCS&apos; coordinates to Autopilot</source>
+      <translation type="unfinished">Stream GCS&apos; coordinates to Autopilot</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">Setting</translation>
+      <extracomment>.QGC.MetaData.Facts[followTarget].enumStrings, </extracomment>
+      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Never,Always,When in Follow Me Flight Mode</source>
+      <translation type="unfinished">Never,Always,When in Follow Me Flight Mode</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_SET_RELAY].param2.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>On,Off</source>
-      <translation type="unfinished">On,Off</translation>
+      <extracomment>.QGC.MetaData.Facts[qLocaleLanguage].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Language</source>
+      <translation type="unfinished">Language</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">Pitch</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>Disable all data persistence</source>
+      <translation type="unfinished">Disable all data persistence</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">Roll</translation>
+      <extracomment>.QGC.MetaData.Facts[disableAllPersistence].longDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>If this option is set, nothing will be saved to disk.</source>
+      <translation type="unfinished">If this option is set, nothing will be saved to disk.</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">Yaw</translation>
+      <extracomment>.QGC.MetaData.Facts[firstRunPromptIdsShown].shortDesc, </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">Comma separated list of first run prompt ids which have already been shown.</translation>
     </message>
     <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">Enable</translation>
+      <extracomment>.QGC.MetaData.Facts[loginAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink User Name</source>
+      <translation type="unfinished">AirLink User Name</translation>
     </message>
     <message>
-      <extracomment>.mavCmdInfo[MAV_CMD_DO_FENCE_ENABLE].param1.enumStrings, </extracomment>
-      <translatorcomment>Only use english comma &apos;,&apos; to separate strings</translatorcomment>
-      <location filename="../src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json"/>
-      <source>Enable,Disable</source>
-      <translation type="unfinished">Enable,Disable</translation>
+      <extracomment>.QGC.MetaData.Facts[passAirLink].shortDesc, </extracomment>
+      <location filename="../src/Settings/App.SettingsGroup.json"/>
+      <source>AirLink Password</source>
+      <translation type="unfinished">AirLink Password</translation>
     </message>
   </context>
 </TS>
diff --git a/translations/qgc_ko_KR.ts b/translations/qgc_ko_KR.ts
deleted file mode 100644
index 13ad83edd62d..000000000000
--- a/translations/qgc_ko_KR.ts
+++ /dev/null
@@ -1,18078 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ko" sourcelanguage="en">
-  <context>
-    <name>ADSBVehicleManager</name>
-    <message>
-      <location filename="../src/ADSB/ADSBVehicleManager.cc" line="70"/>
-      <source>ADSB Server Error: %1</source>
-      <translation type="unfinished">ADSB Server Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <source>Airframe is currently not set.</source>
-      <translation type="unfinished">Airframe is currently not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <source> and frame type &apos;%2&apos;</source>
-      <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="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="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
-      <source> To change this configuration, select the desired frame class below.</source>
-      <translation type="unfinished"> To change this configuration, select the desired frame class below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
-      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="19"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="40"/>
-      <source>Frame Setup is used to select the airframe which matches your vehicle.</source>
-      <translation type="unfinished">Frame Setup is used to select the airframe which matches your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="251"/>
-      <source>Param file github json download failed: %1</source>
-      <translation type="unfinished">Param file github json download failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="261"/>
-      <source>Param file download failed: %1</source>
-      <translation type="unfinished">Param file download failed: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <source>Frame Class</source>
-      <translation type="unfinished">Frame Class</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="226"/>
-      <source>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</source>
-      <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <source>Input channel:</source>
-      <translation type="unfinished">Input channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="20"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="31"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <source>Gimbal type</source>
-      <translation type="unfinished">Gimbal type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <source>Tilt input channel</source>
-      <translation type="unfinished">Tilt input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <source>Pan input channel</source>
-      <translation type="unfinished">Pan input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <source>Roll input channel</source>
-      <translation type="unfinished">Roll input channel</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraSubComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="648"/>
-      <source>Error during Solo video link setup: %1</source>
-      <translation type="unfinished">Error during Solo video link setup: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="770"/>
-      <source>Unable to change altitude, vehicle altitude not known.</source>
-      <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="775"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="838"/>
-      <source>Vehicle does not support guided takeoff</source>
-      <translation type="unfinished">Vehicle does not support guided takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="844"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="854"/>
-      <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="859"/>
-      <source>Unable to takeoff: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="877"/>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="897"/>
-      <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="885"/>
-      <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="890"/>
-      <source>Unable to start mission: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="975"/>
-      <source>Follow failed: Home position not set.</source>
-      <translation type="unfinished">Follow failed: Home position not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="985"/>
-      <source>Follow failed: Ground station cannot provide required position information.</source>
-      <translation type="unfinished">Follow failed: Ground station cannot provide required position information.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source> (Channel 5)</source>
-      <translation type="unfinished"> (Channel 5)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <source>Flight mode channel:</source>
-      <translation type="unfinished">Flight mode channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Not assigned</source>
-      <translation type="unfinished">Not assigned</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 1</source>
-      <translation type="unfinished">Channel 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 2</source>
-      <translation type="unfinished">Channel 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 3</source>
-      <translation type="unfinished">Channel 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 4</source>
-      <translation type="unfinished">Channel 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <source>Flight Mode </source>
-      <translation type="unfinished">Flight Mode </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <source>Simple Mode</source>
-      <translation type="unfinished">Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <source>Switch Options</source>
-      <translation type="unfinished">Switch Options</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <source>Channel option %1 :</source>
-      <translation type="unfinished">Channel option %1 :</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="18"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="29"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <source>Flight Mode 1</source>
-      <translation type="unfinished">Flight Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <source>Flight Mode 2</source>
-      <translation type="unfinished">Flight Mode 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <source>Flight Mode 3</source>
-      <translation type="unfinished">Flight Mode 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <source>Flight Mode 4</source>
-      <translation type="unfinished">Flight Mode 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <source>Flight Mode 5</source>
-      <translation type="unfinished">Flight Mode 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <source>Flight Mode 6</source>
-      <translation type="unfinished">Flight Mode 6</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <source>Enable Follow Me</source>
-      <translation type="unfinished">Enable Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <source>Waiting for Vehicle to update</source>
-      <translation type="unfinished">Waiting for Vehicle to update</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <source>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</source>
-      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <source>Reset To Supported Settings</source>
-      <translation type="unfinished">Reset To Supported Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <source>Vehicle Position</source>
-      <translation type="unfinished">Vehicle Position</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Maintain Current Offsets</source>
-      <translation type="unfinished">Maintain Current Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Specify Offsets</source>
-      <translation type="unfinished">Specify Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <source>Point Vehicle</source>
-      <translation type="unfinished">Point Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Maintain current vehicle orientation</source>
-      <translation type="unfinished">Maintain current vehicle orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Point at ground station location</source>
-      <translation type="unfinished">Point at ground station location</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Same direction as ground station movement</source>
-      <translation type="unfinished">Same direction as ground station movement</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <source>Vehicle Offsets</source>
-      <translation type="unfinished">Vehicle Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <source>Click in the graphic to change angle</source>
-      <translation type="unfinished">Click in the graphic to change angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="28"/>
-      <source>Follow Me Setup is used to configure support for the vehicle following the ground station location.</source>
-      <translation type="unfinished">Follow Me Setup is used to configure support for the vehicle following the ground station location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMHeliComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <source>Servo Setup</source>
-      <translation type="unfinished">Servo Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <source>Servo</source>
-      <translation type="unfinished">Servo</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <source>Min</source>
-      <translation type="unfinished">Min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <source>Max</source>
-      <translation type="unfinished">Max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <source>Trim</source>
-      <translation type="unfinished">Trim</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <source>Reversed</source>
-      <translation type="unfinished">Reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <source>2</source>
-      <translation type="unfinished">2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <source>3</source>
-      <translation type="unfinished">3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <source>4</source>
-      <translation type="unfinished">4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <source>5</source>
-      <translation type="unfinished">5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <source>6</source>
-      <translation type="unfinished">6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <source>7</source>
-      <translation type="unfinished">7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <source>8</source>
-      <translation type="unfinished">8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <source>Swashplate Setup</source>
-      <translation type="unfinished">Swashplate Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <source>Throttle Settings</source>
-      <translation type="unfinished">Throttle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <source>Governor Settings</source>
-      <translation type="unfinished">Governor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <source>Miscellaneous Settings</source>
-      <translation type="unfinished">Miscellaneous Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <source>* Stabilize Collective Curve *</source>
-      <translation type="unfinished">* Stabilize Collective Curve *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <source>* Tail &amp; Gyros *</source>
-      <translation type="unfinished">* Tail &amp; Gyros *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="15"/>
-      <source>Heli</source>
-      <translation type="unfinished">Heli</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="26"/>
-      <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
-      <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <source>Light Output Channels</source>
-      <translation type="unfinished">Light Output Channels</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <source>Lights 1:</source>
-      <translation type="unfinished">Lights 1:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <source>Lights 2:</source>
-      <translation type="unfinished">Lights 2:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <source>Brightness Steps:</source>
-      <translation type="unfinished">Brightness Steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="21"/>
-      <source>Lights</source>
-      <translation type="unfinished">Lights</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="32"/>
-      <source>Lights setup is used to adjust light output channels.</source>
-      <translation type="unfinished">Lights setup is used to adjust light output channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <source>Lights Output 1</source>
-      <translation type="unfinished">Lights Output 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <source>Lights Output 2</source>
-      <translation type="unfinished">Lights Output 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="15"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMNotSupported</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <source>Not supported</source>
-      <translation type="unfinished">Not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <source>Battery 1</source>
-      <translation type="unfinished">Battery 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <source>Battery1 monitor:</source>
-      <translation type="unfinished">Battery1 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <source>Battery 2</source>
-      <translation type="unfinished">Battery 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <source>Battery2 monitor:</source>
-      <translation type="unfinished">Battery2 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <source>WARNING: Remove props prior to calibration!</source>
-      <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Now perform these steps:</source>
-      <translation type="unfinished">Now perform these steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Click Calibrate to start, then:</source>
-      <translation type="unfinished">Click Calibrate to start, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <source>- Disconnect USB and battery so flight controller powers down</source>
-      <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <source>- Connect the battery</source>
-      <translation type="unfinished">- Connect the battery</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <source>- If using a flight controller with a safety button press it until it displays solid red</source>
-      <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <source>- You will hear a musical tone then two beeps</source>
-      <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
-      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
-      <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <source>- Disconnect the battery and power up again normally</source>
-      <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <source>Power Module 90A</source>
-      <translation type="unfinished">Power Module 90A</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <source>Power Module HV</source>
-      <translation type="unfinished">Power Module HV</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <source>3DR Iris</source>
-      <translation type="unfinished">3DR Iris</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <source>Blue Robotics Power Sense Module R2</source>
-      <translation type="unfinished">Blue Robotics Power Sense Module R2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <source>Battery monitor:</source>
-      <translation type="unfinished">Battery monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <source>Battery capacity:</source>
-      <translation type="unfinished">Battery capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <source>Minimum arming voltage:</source>
-      <translation type="unfinished">Minimum arming voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <source>Power sensor:</source>
-      <translation type="unfinished">Power sensor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <source>Current pin:</source>
-      <translation type="unfinished">Current pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <source>Voltage pin:</source>
-      <translation type="unfinished">Voltage pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <source>Voltage multiplier:</source>
-      <translation type="unfinished">Voltage multiplier:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <source>Calculate Voltage Multiplier</source>
-      <translation type="unfinished">Calculate Voltage Multiplier</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <source>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <source>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <source>Amps Offset:</source>
-      <translation type="unfinished">Amps Offset:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <source>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</source>
-      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <source>Calculate And Set</source>
-      <translation type="unfinished">Calculate And Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="18"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="29"/>
-      <source>The Power Component is used to setup battery parameters.</source>
-      <translation type="unfinished">The Power Component is used to setup battery parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="18"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="37"/>
-      <source>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</source>
-      <translation type="unfinished">The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Channel %1</source>
-      <translation type="unfinished">Channel %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <source>Low action:</source>
-      <translation type="unfinished">Low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <source>Critical action:</source>
-      <translation type="unfinished">Critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <source>Low voltage threshold:</source>
-      <translation type="unfinished">Low voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <source>Critical voltage threshold:</source>
-      <translation type="unfinished">Critical voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <source>Low mAh threshold:</source>
-      <translation type="unfinished">Low mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <source>Critical mAh threshold:</source>
-      <translation type="unfinished">Critical mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <source>Final land stage altitude:</source>
-      <translation type="unfinished">Final land stage altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <source>Final land stage descent speed:</source>
-      <translation type="unfinished">Final land stage descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="20"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="33"/>
-      <source>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</source>
-      <translation type="unfinished">Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="44"/>
-      <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="85"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="178"/>
-      <source>Battery low action:</source>
-      <translation type="unfinished">Battery low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="186"/>
-      <source>Battery critical action:</source>
-      <translation type="unfinished">Battery critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="195"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="206"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="155"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="224"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="245"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="252"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="262"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="278"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="293"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="318"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="343"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="355"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="366"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="382"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="402"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="438"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="450"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="472"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="491"/>
-      <source>Land with descent speed:</source>
-      <translation type="unfinished">Land with descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="512"/>
-      <source>Final loiter altitude:</source>
-      <translation type="unfinished">Final loiter altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="534"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="565"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="67"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="88"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="109"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="130"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="142"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="156"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="168"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="68"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="87"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="105"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="122"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="143"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="174"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <source>Failsafe Actions</source>
-      <translation type="unfinished">Failsafe Actions</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <source>GCS Heartbeat:</source>
-      <translation type="unfinished">GCS Heartbeat:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <source>Leak:</source>
-      <translation type="unfinished">Leak:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <source>Detector Pin:</source>
-      <translation type="unfinished">Detector Pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <source>Logic when Dry:</source>
-      <translation type="unfinished">Logic when Dry:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <source>Battery:</source>
-      <translation type="unfinished">Battery:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <source>Voltage:</source>
-      <translation type="unfinished">Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <source>Remaining Capacity:</source>
-      <translation type="unfinished">Remaining Capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <source>EKF:</source>
-      <translation type="unfinished">EKF:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <source>Pilot Input:</source>
-      <translation type="unfinished">Pilot Input:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <source>Timeout:</source>
-      <translation type="unfinished">Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <source>Internal Temperature:</source>
-      <translation type="unfinished">Internal Temperature:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <source>Internal Pressure:</source>
-      <translation type="unfinished">Internal Pressure:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="41"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="46"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="51"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="84"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="77"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="79"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="86"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="92"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="93"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="27"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="38"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="32"/>
-      <source>Voltage failsafe:</source>
-      <translation type="unfinished">Voltage failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="37"/>
-      <source>mAh failsafe:</source>
-      <translation type="unfinished">mAh failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="42"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="43"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="93"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="57"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="60"/>
-      <source>Always Hold</source>
-      <translation type="unfinished">Always Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="73"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="76"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="87"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="92"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="97"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="102"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummarySub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <source>GCS failsafe:</source>
-      <translation type="unfinished">GCS failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <source>Leak failsafe:</source>
-      <translation type="unfinished">Leak failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <source>Battery failsafe:</source>
-      <translation type="unfinished">Battery failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <source>EKF failsafe:</source>
-      <translation type="unfinished">EKF failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <source>Pilot Input failsafe:</source>
-      <translation type="unfinished">Pilot Input failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <source>Int. Temperature failsafe:</source>
-      <translation type="unfinished">Int. Temperature failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <source>Int. Pressure failsafe:</source>
-      <translation type="unfinished">Int. Pressure failsafe:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <source>If mounted in the direction of flight, select None.</source>
-      <translation type="unfinished">If mounted in the direction of flight, select None.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <source>Before calibrating make sure rotation settings are correct. </source>
-      <translation type="unfinished">Before calibrating make sure rotation settings are correct. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <source>If the compass or GPS module is mounted in flight direction, leave the default value (None)</source>
-      <translation type="unfinished">If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <source>The calibration for Compass %1 appears to be poor. </source>
-      <translation type="unfinished">The calibration for Compass %1 appears to be poor. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation type="unfinished">Check the compass position within your vehicle and re-do the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <source>Sensor Settings</source>
-      <translation type="unfinished">Sensor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <source>Accelerometer calibration complete</source>
-      <translation type="unfinished">Accelerometer calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <source>Compass calibration complete</source>
-      <translation type="unfinished">Compass calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(primary</source>
-      <translation type="unfinished">(primary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(secondary</source>
-      <translation type="unfinished">(secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <source>Use Compass</source>
-      <translation type="unfinished">Use Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <source>Shown in the indicator bars is the quality of the calibration for each compass.
-
-</source>
-      <translation type="unfinished">Shown in the indicator bars is the quality of the calibration for each compass.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <source>Compass %1 </source>
-      <translation type="unfinished">Compass %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <source>, </source>
-      <translation type="unfinished">, </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>external</source>
-      <translation type="unfinished">external</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>internal</source>
-      <translation type="unfinished">internal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <source>- Green indicates a well functioning compass.
-</source>
-      <translation type="unfinished">- Green indicates a well functioning compass.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <source>- Yellow indicates a questionable compass or calibration.
-</source>
-      <translation type="unfinished">- Yellow indicates a questionable compass or calibration.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <source>- Red indicates a compass which should not be used.
-
-</source>
-      <translation type="unfinished">- Red indicates a compass which should not be used.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 1</source>
-      <translation type="unfinished">Priority 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 2</source>
-      <translation type="unfinished">Priority 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 3</source>
-      <translation type="unfinished">Priority 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Not Set</source>
-      <translation type="unfinished">Not Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <source>Orientation:</source>
-      <translation type="unfinished">Orientation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <source>Autopilot Rotation:</source>
-      <translation type="unfinished">Autopilot Rotation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <source>Magnetic Declination</source>
-      <translation type="unfinished">Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <source>Manual Magnetic Declination</source>
-      <translation type="unfinished">Manual Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation type="unfinished">This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <source>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </source>
-      <translation type="unfinished">CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <source>It is technically possible to set-up CompassMot using throttle but this is not recommended.</source>
-      <translation type="unfinished">It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <source>Disconnect your props, flip them over and rotate them one position around the frame. </source>
-      <translation type="unfinished">Disconnect your props, flip them over and rotate them one position around the frame. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <source>In this configuration they should push the copter down into the ground when the throttle is raised.</source>
-      <translation type="unfinished">In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <source>Secure the copter (perhaps with tape) so that it does not move.</source>
-      <translation type="unfinished">Secure the copter (perhaps with tape) so that it does not move.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <source>Turn on your transmitter and keep throttle at zero.</source>
-      <translation type="unfinished">Turn on your transmitter and keep throttle at zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <source>Click Ok to start CompassMot calibration.</source>
-      <translation type="unfinished">Click Ok to start CompassMot calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>depth</source>
-      <translation type="unfinished">depth</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>altitude</source>
-      <translation type="unfinished">altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <source>Pressure calibration will set the %1 to zero at the current pressure reading. %2</source>
-      <translation type="unfinished">Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <source>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Accelerometer must be calibrated prior to Compass.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Compass.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Level Horizon.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Baro/Airspeed</source>
-      <translation type="unfinished">Baro/Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Pressure</source>
-      <translation type="unfinished">Pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <source>CompassMot</source>
-      <translation type="unfinished">CompassMot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <source>CompassMot - Compass Motor Interference Calibration</source>
-      <translation type="unfinished">CompassMot - Compass Motor Interference Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="21"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="33"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="186"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="203"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="267"/>
-      <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation type="unfinished">Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="347"/>
-      <source>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</source>
-      <translation type="unfinished">Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="348"/>
-      <source>Quickly bring the throttle back down to zero</source>
-      <translation type="unfinished">Quickly bring the throttle back down to zero</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
-      <source>Press the Next button to complete the calibration</source>
-      <translation type="unfinished">Press the Next button to complete the calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="358"/>
-      <source>Hold the vehicle in its level flight position.</source>
-      <translation type="unfinished">Hold the vehicle in its level flight position.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="367"/>
-      <source>Requesting pressure calibration...</source>
-      <translation type="unfinished">Requesting pressure calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="376"/>
-      <source>Requesting gyro calibration...</source>
-      <translation type="unfinished">Requesting gyro calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="506"/>
-      <source>Successfully completed</source>
-      <translation type="unfinished">Successfully completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="510"/>
-      <source>Failed</source>
-      <translation type="unfinished">Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="302"/>
-      <source>Hold still in the current orientation and press Next when ready</source>
-      <translation type="unfinished">Hold still in the current orientation and press Next when ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="558"/>
-      <source>Compass %1 calibration complete</source>
-      <translation type="unfinished">Compass %1 calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="560"/>
-      <source>Compass %1 calibration below quality threshold</source>
-      <translation type="unfinished">Compass %1 calibration below quality threshold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="579"/>
-      <source>All compasses calibrated successfully</source>
-      <translation type="unfinished">All compasses calibrated successfully</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="580"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="583"/>
-      <source>Compass calibration failed</source>
-      <translation type="unfinished">Compass calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="584"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="588"/>
-      <source>Continue rotating...</source>
-      <translation type="unfinished">Continue rotating...</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <source>Compass </source>
-      <translation type="unfinished">Compass </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <source>Not installed</source>
-      <translation type="unfinished">Not installed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <source>Accelerometer(s)</source>
-      <translation type="unfinished">Accelerometer(s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="21"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="32"/>
-      <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <source>Frame selection</source>
-      <translation type="unfinished">Frame selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <source>Would you like to load the default parameters for the frame ?</source>
-      <translation type="unfinished">Would you like to load the default parameters for the frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <source>Would you like to set the desired frame ?</source>
-      <translation type="unfinished">Would you like to set the desired frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <source>Yes, Load default parameter set for %1</source>
-      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <source>No, set frame only</source>
-      <translation type="unfinished">No, set frame only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <source>Confirm frame %1</source>
-      <translation type="unfinished">Confirm frame %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <source>Git Revision</source>
-      <translation type="unfinished">Git Revision</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <source>Reverse Motor Direction</source>
-      <translation type="unfinished">Reverse Motor Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="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">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.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <source>A 10 second coooldown is required before testing again, please stand by...</source>
-      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
-      <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <source>Automatic Motor Direction Detection</source>
-      <translation type="unfinished">Automatic Motor Direction Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <source>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</source>
-      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="18"/>
-      <source>Tuning</source>
-      <translation type="unfinished">Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="29"/>
-      <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <source>Basic Tuning</source>
-      <translation type="unfinished">Basic Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <source>Roll/Pitch Sensitivity</source>
-      <translation type="unfinished">Roll/Pitch Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
-      <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <source>Climb Sensitivity</source>
-      <translation type="unfinished">Climb Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
-      <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <source>RC Roll/Pitch Feel</source>
-      <translation type="unfinished">RC Roll/Pitch Feel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <source>Slide to the left for soft control, slide to the right for crisp control</source>
-      <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <source>Spin While Armed</source>
-      <translation type="unfinished">Spin While Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <source>Adjust the amount the motors spin to indicate armed</source>
-      <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <source>Minimum Thrust</source>
-      <translation type="unfinished">Minimum Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
-      <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
-      <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <source>AutoTune</source>
-      <translation type="unfinished">AutoTune</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <source>Axes to AutoTune:</source>
-      <translation type="unfinished">Axes to AutoTune:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <source>Channel for AutoTune switch:</source>
-      <translation type="unfinished">Channel for AutoTune switch:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <source>In Flight Tuning</source>
-      <translation type="unfinished">In Flight Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <source>RC Channel 6 Option (Tuning):</source>
-      <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <source>Min:</source>
-      <translation type="unfinished">Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <source>Max:</source>
-      <translation type="unfinished">Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <source>Attitude Controller Parameters</source>
-      <translation type="unfinished">Attitude Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <source>Position Controller Parameters</source>
-      <translation type="unfinished">Position Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <source>Waypoint navigation parameters</source>
-      <translation type="unfinished">Waypoint navigation parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirMapManager</name>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="178"/>
-      <source>AirMap Enabled</source>
-      <translation type="unfinished">AirMap Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="186"/>
-      <source>Failed to create airmap::services::Client instance</source>
-      <translation type="unfinished">Failed to create airmap::services::Client instance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="198"/>
-      <source>No API key for AirMap</source>
-      <translation type="unfinished">No API key for AirMap</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="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">This configuration can only be modified through the Parameter Editor.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
-      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <source>Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
-      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
-      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <source>You&apos;ve connected a %1.</source>
-      <translation type="unfinished">You&apos;ve connected a %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <source>Airframe is not set.</source>
-      <translation type="unfinished">Airframe is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="19"/>
-      <source>Airframe</source>
-      <translation type="unfinished">Airframe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="31"/>
-      <source>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
-      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="85"/>
-      <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation type="unfinished">You cannot change airframe configuration while connected to multiple vehicles.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <source>System ID</source>
-      <translation type="unfinished">System ID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <source>Airframe type</source>
-      <translation type="unfinished">Airframe type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <source>Custom Fw. Ver.</source>
-      <translation type="unfinished">Custom Fw. Ver.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirmapSettings</name>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="67"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="84"/>
-      <source>Enable AirMap Services</source>
-      <translation type="unfinished">Enable AirMap Services</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="89"/>
-      <source>Enable Telemetry</source>
-      <translation type="unfinished">Enable Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="96"/>
-      <source>Show Airspace on Map (Experimental)</source>
-      <translation type="unfinished">Show Airspace on Map (Experimental)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="104"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="113"/>
-      <source>Clear Saved Answers</source>
-      <translation type="unfinished">Clear Saved Answers</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="114"/>
-      <source>All saved ruleset answers will be cleared. Is this really what you want?</source>
-      <translation type="unfinished">All saved ruleset answers will be cleared. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="136"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="205"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="176"/>
-      <source>Login / Registration</source>
-      <translation type="unfinished">Login / Registration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="192"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="292"/>
-      <source>User Name:</source>
-      <translation type="unfinished">User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="208"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="210"/>
-      <source>Anonymous</source>
-      <translation type="unfinished">Anonymous</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="212"/>
-      <source>Authenticated</source>
-      <translation type="unfinished">Authenticated</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="214"/>
-      <source>Authentication Error</source>
-      <translation type="unfinished">Authentication Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="220"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="241"/>
-      <source>Forgot Your AirMap Password?</source>
-      <translation type="unfinished">Forgot Your AirMap Password?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="251"/>
-      <source>Register for an AirMap Account</source>
-      <translation type="unfinished">Register for an AirMap Account</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="272"/>
-      <source>Pilot Profile (WIP)</source>
-      <translation type="unfinished">Pilot Profile (WIP)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="290"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="291"/>
-      <source>John Doe</source>
-      <translation type="unfinished">John Doe</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="293"/>
-      <source>joe36</source>
-      <translation type="unfinished">joe36</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="294"/>
-      <source>Email:</source>
-      <translation type="unfinished">Email:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="295"/>
-      <source>jonh@doe.com</source>
-      <translation type="unfinished">jonh@doe.com</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="296"/>
-      <source>Phone:</source>
-      <translation type="unfinished">Phone:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="297"/>
-      <source>+1 212 555 1212</source>
-      <translation type="unfinished">+1 212 555 1212</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="310"/>
-      <source>License</source>
-      <translation type="unfinished">License</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="329"/>
-      <source>Personal API Key</source>
-      <translation type="unfinished">Personal API Key</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="339"/>
-      <source>API Key:</source>
-      <translation type="unfinished">API Key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="341"/>
-      <source>Client ID:</source>
-      <translation type="unfinished">Client ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="355"/>
-      <source>Flight List Management</source>
-      <translation type="unfinished">Flight List Management</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="367"/>
-      <source>Show Flight List</source>
-      <translation type="unfinished">Show Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="421"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="433"/>
-      <source>Created</source>
-      <translation type="unfinished">Created</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="448"/>
-      <source>Flight Start</source>
-      <translation type="unfinished">Flight Start</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="463"/>
-      <source>Flight End</source>
-      <translation type="unfinished">Flight End</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="478"/>
-      <source>State</source>
-      <translation type="unfinished">State</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Active</source>
-      <translation type="unfinished">Active</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="499"/>
-      <source>Loading Flight List</source>
-      <translation type="unfinished">Loading Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="531"/>
-      <source>Flight List</source>
-      <translation type="unfinished">Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="546"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="555"/>
-      <source>From</source>
-      <translation type="unfinished">From</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="576"/>
-      <source>To</source>
-      <translation type="unfinished">To</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="593"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="609"/>
-      <source>End Selected</source>
-      <translation type="unfinished">End Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="627"/>
-      <source>End Flight</source>
-      <translation type="unfinished">End Flight</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="628"/>
-      <source>Confirm ending active flight?</source>
-      <translation type="unfinished">Confirm ending active flight?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="642"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source> Flights Loaded</source>
-      <translation type="unfinished"> Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source>No Flights Loaded</source>
-      <translation type="unfinished">No Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="657"/>
-      <source>A maximum of 250 flights were loaded</source>
-      <translation type="unfinished">A maximum of 250 flights were loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="665"/>
-      <source>Flight Area </source>
-      <translation type="unfinished">Flight Area </translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceAdvisory</name>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="30"/>
-      <source>Airport</source>
-      <translation type="unfinished">Airport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="31"/>
-      <source>Controlled Airspace</source>
-      <translation type="unfinished">Controlled Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="32"/>
-      <source>Special Use Airspace</source>
-      <translation type="unfinished">Special Use Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="33"/>
-      <source>TFR</source>
-      <translation type="unfinished">TFR</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="34"/>
-      <source>Wild Fire</source>
-      <translation type="unfinished">Wild Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="35"/>
-      <source>Park</source>
-      <translation type="unfinished">Park</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="36"/>
-      <source>Power Plant</source>
-      <translation type="unfinished">Power Plant</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="37"/>
-      <source>Heliport</source>
-      <translation type="unfinished">Heliport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="38"/>
-      <source>Prison</source>
-      <translation type="unfinished">Prison</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="39"/>
-      <source>School</source>
-      <translation type="unfinished">School</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="40"/>
-      <source>Hospital</source>
-      <translation type="unfinished">Hospital</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="41"/>
-      <source>Fire</source>
-      <translation type="unfinished">Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="42"/>
-      <source>Emergency</source>
-      <translation type="unfinished">Emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="43"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="44"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceControl</name>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="109"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="200"/>
-      <source>Airspace</source>
-      <translation type="unfinished">Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="113"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="204"/>
-      <source> Advisories</source>
-      <translation type="unfinished"> Advisories</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="130"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="280"/>
-      <source>Airspace Regulations</source>
-      <translation type="unfinished">Airspace Regulations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="285"/>
-      <source>Advisories based on the selected rules.</source>
-      <translation type="unfinished">Advisories based on the selected rules.</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="326"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>File Flight Plan</source>
-      <translation type="unfinished">File Flight Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="384"/>
-      <source>Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</source>
-      <translation type="unfinished">Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="434"/>
-      <source>Airspace Regulation Options</source>
-      <translation type="unfinished">Airspace Regulation Options</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="456"/>
-      <source>PICK ONE REGULATION</source>
-      <translation type="unfinished">PICK ONE REGULATION</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="477"/>
-      <source>OPTIONAL</source>
-      <translation type="unfinished">OPTIONAL</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="497"/>
-      <source>REQUIRED</source>
-      <translation type="unfinished">REQUIRED</translation>
-    </message>
-  </context>
-  <context>
-    <name>AltModeDialog</name>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
-      <source>Select Altitude Mode</source>
-      <translation type="unfinished">Select Altitude Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="47"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="48"/>
-      <source>Specified altitudes are relative to launch position height.</source>
-      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="53"/>
-      <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
-      <source>Calculated Above Terrain</source>
-      <translation type="unfinished">Calculated Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="58"/>
-      <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="63"/>
-      <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="68"/>
-      <source>The altitude mode can differ for each individual item.</source>
-      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppLogModel</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.cc" line="108"/>
-      <source>Open console log output file failed %1 : %2</source>
-      <translation type="unfinished">Open console log output file failed %1 : %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppMessages</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
-      <source>GStreamer Debug Level</source>
-      <translation type="unfinished">GStreamer Debug Level</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
-      <source>Logging categories</source>
-      <translation type="unfinished">Logging categories</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="170"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="181"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="189"/>
-      <source>Clear All</source>
-      <translation type="unfinished">Clear All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>Log files (*.txt)</source>
-      <translation type="unfinished">Log files (*.txt)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
-      <source>Select log save file</source>
-      <translation type="unfinished">Select log save file</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
-      <source>Save App Log</source>
-      <translation type="unfinished">Save App Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
-      <source>Show Latest</source>
-      <translation type="unfinished">Show Latest</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
-      <source>Set Logging</source>
-      <translation type="unfinished">Set Logging</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppSettings</name>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="30"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="31"/>
-      <source>Telemetry</source>
-      <translation type="unfinished">Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="32"/>
-      <source>Missions</source>
-      <translation type="unfinished">Missions</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="33"/>
-      <source>Logs</source>
-      <translation type="unfinished">Logs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="34"/>
-      <source>Video</source>
-      <translation type="unfinished">Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="35"/>
-      <source>Photo</source>
-      <translation type="unfinished">Photo</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="36"/>
-      <source>CrashLogs</source>
-      <translation type="unfinished">CrashLogs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="182"/>
-      <source> (Partial)</source>
-      <translation type="unfinished"> (Partial)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="191"/>
-      <source> (Test only)</source>
-      <translation type="unfinished"> (Test only)</translation>
-    </message>
-  </context>
-  <context>
-    <name>ArmedIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-  </context>
-  <context>
-    <name>AudioOutput</name>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="155"/>
-      <source> negative </source>
-      <translation type="unfinished"> negative </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="166"/>
-      <source> point </source>
-      <translation type="unfinished"> point </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="177"/>
-      <source> meters</source>
-      <translation type="unfinished"> meters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
-      <source>One or more vehicle components require setup prior to flight.</source>
-      <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Autotune</name>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="37"/>
-      <source>Autotune: In progress</source>
-      <translation type="unfinished">Autotune: In progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="90"/>
-      <source>Autotune: initializing</source>
-      <translation type="unfinished">Autotune: initializing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="93"/>
-      <source>Autotune: roll</source>
-      <translation type="unfinished">Autotune: roll</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="96"/>
-      <source>Autotune: pitch</source>
-      <translation type="unfinished">Autotune: pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="99"/>
-      <source>Autotune: yaw</source>
-      <translation type="unfinished">Autotune: yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="102"/>
-      <source>Wait for disarm</source>
-      <translation type="unfinished">Wait for disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
-      <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="110"/>
-      <source>Autotune: in progress</source>
-      <translation type="unfinished">Autotune: in progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
-      <source>Autotune: Success</source>
-      <translation type="unfinished">Autotune: Success</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="119"/>
-      <source>Autotune successful.</source>
-      <translation type="unfinished">Autotune successful.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="122"/>
-      <source>Autotune: Unknown error</source>
-      <translation type="unfinished">Autotune: Unknown error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="134"/>
-      <source>Autotune: Failed</source>
-      <translation type="unfinished">Autotune: Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="144"/>
-      <source>Autotune: Ack error %1</source>
-      <translation type="unfinished">Autotune: Ack error %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.h" line="59"/>
-      <source>Autotune: Not performed</source>
-      <translation type="unfinished">Autotune: Not performed</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutotuneUI</name>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="27"/>
-      <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="37"/>
-      <source>WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</source>
-      <translation type="unfinished">WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>AxisMonitor</name>
-    <message>
-      <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-  </context>
-  <context>
-    <name>BatteryIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="82"/>
-      <source>100%</source>
-      <translation type="unfinished">100%</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="145"/>
-      <source>Battery Status</source>
-      <translation type="unfinished">Battery Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="168"/>
-      <source>Battery %1</source>
-      <translation type="unfinished">Battery %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="169"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="170"/>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="171"/>
-      <source>Remaining</source>
-      <translation type="unfinished">Remaining</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="172"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="173"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="174"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="175"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-  </context>
-  <context>
-    <name>BlankPlanCreator</name>
-    <message>
-      <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
-      <source>Blank</source>
-      <translation type="unfinished">Blank</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothConfiguration</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="222"/>
-      <source>Bluetooth Link Settings</source>
-      <translation type="unfinished">Bluetooth Link Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="224"/>
-      <source>Bluetooth Not Available</source>
-      <translation type="unfinished">Bluetooth Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothLink</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="185"/>
-      <source>Bluetooth Link Error</source>
-      <translation type="unfinished">Bluetooth Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="31"/>
-      <source>Device</source>
-      <translation type="unfinished">Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="37"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="44"/>
-      <source>Bluetooth Devices</source>
-      <translation type="unfinished">Bluetooth Devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="67"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="73"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-  </context>
-  <context>
-    <name>Bootloader</name>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="224"/>
-      <source>Write failed: %1</source>
-      <translation type="unfinished">Write failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="229"/>
-      <source>Incorrect number of bytes returned for write: actual(%1) expected(%2)</source>
-      <translation type="unfinished">Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="250"/>
-      <source>Timeout waiting for bytes to be available</source>
-      <translation type="unfinished">Timeout waiting for bytes to be available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="260"/>
-      <source>Read failed: error: %1</source>
-      <translation type="unfinished">Read failed: error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="274"/>
-      <source>Get Command Response: </source>
-      <translation type="unfinished">Get Command Response: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="280"/>
-      <source>Invalid sync response: 0x%1 0x%2</source>
-      <translation type="unfinished">Invalid sync response: 0x%1 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="283"/>
-      <source>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</source>
-      <translation type="unfinished">This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="286"/>
-      <source>Unknown response code</source>
-      <translation type="unfinished">Unknown response code</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="292"/>
-      <source>Command failed: 0x%1 (%2)</source>
-      <translation type="unfinished">Command failed: 0x%1 (%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="156"/>
-      <source>Get Board Info: </source>
-      <translation type="unfinished">Get Board Info: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="342"/>
-      <source>Send Command: </source>
-      <translation type="unfinished">Send Command: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="350"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="516"/>
-      <source>Unable to open firmware file %1: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="371"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="541"/>
-      <source>Firmware file read failed: %1</source>
-      <translation type="unfinished">Firmware file read failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="387"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="470"/>
-      <source>Flash failed: %1 at address 0x%2</source>
-      <translation type="unfinished">Flash failed: %1 at address 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="421"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="593"/>
-      <source>Unable to retrieve block from ihx: index %1</source>
-      <translation type="unfinished">Unable to retrieve block from ihx: index %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="441"/>
-      <source>Unable to set flash start address: 0x%2</source>
-      <translation type="unfinished">Unable to set flash start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="559"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="644"/>
-      <source>Read failed: %1 at address: 0x%2</source>
-      <translation type="unfinished">Read failed: %1 at address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="565"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="652"/>
-      <source>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</source>
-      <translation type="unfinished">Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="613"/>
-      <source>Unable to set read start address: 0x%2</source>
-      <translation type="unfinished">Unable to set read start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="689"/>
-      <source>CRC mismatch: board(0x%1) file(0x%2)</source>
-      <translation type="unfinished">CRC mismatch: board(0x%1) file(0x%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="40"/>
-      <source>Open failed on port %1: %2</source>
-      <translation type="unfinished">Open failed on port %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="92"/>
-      <source>Unable to put radio into command mode +++</source>
-      <translation type="unfinished">Unable to put radio into command mode +++</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="97"/>
-      <source>Radio did not respond to command mode</source>
-      <translation type="unfinished">Radio did not respond to command mode</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="105"/>
-      <source>Radio did not respond to ATI2 command</source>
-      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="112"/>
-      <source>Radio did not return board id</source>
-      <translation type="unfinished">Radio did not return board id</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="129"/>
-      <source>Found unsupported bootloader version: %1</source>
-      <translation type="unfinished">Found unsupported bootloader version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="165"/>
-      <source>Unable to reboot radio (ready read)</source>
-      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="181"/>
-      <source>Erase failed: %1</source>
-      <translation type="unfinished">Erase failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="319"/>
-      <source>Get Device: </source>
-      <translation type="unfinished">Get Device: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="747"/>
-      <source>Get Board Id: </source>
-      <translation type="unfinished">Get Board Id: </translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalc</name>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="238"/>
-      <source>CameraCalc section version %1 not supported</source>
-      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="310"/>
-      <source>Custom Camera</source>
-      <translation type="unfinished">Custom Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="315"/>
-      <source>Manual (no camera specs)</source>
-      <translation type="unfinished">Manual (no camera specs)</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcCamera</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="108"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="112"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="120"/>
-      <source>Sensor</source>
-      <translation type="unfinished">Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="135"/>
-      <source>Image</source>
-      <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="150"/>
-      <source>Focal length</source>
-      <translation type="unfinished">Focal length</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcGrid</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="47"/>
-      <source>Front Lap</source>
-      <translation type="unfinished">Front Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="51"/>
-      <source>Side Lap</source>
-      <translation type="unfinished">Side Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="59"/>
-      <source>Overlap</source>
-      <translation type="unfinished">Overlap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="72"/>
-      <source>Select one:</source>
-      <translation type="unfinished">Select one:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="102"/>
-      <source>Grnd Res</source>
-      <translation type="unfinished">Grnd Res</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <source>Vehicle must be restarted for changes to take effect.</source>
-      <translation type="unfinished">Vehicle must be restarted for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <source>Camera Trigger Settings</source>
-      <translation type="unfinished">Camera Trigger Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <source>Time Interval</source>
-      <translation type="unfinished">Time Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <source>Distance Interval</source>
-      <translation type="unfinished">Distance Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <source>Hardware Settings</source>
-      <translation type="unfinished">Hardware Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <source>AUX Pin Assignment</source>
-      <translation type="unfinished">AUX Pin Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <source>Trigger Pin Polarity</source>
-      <translation type="unfinished">Trigger Pin Polarity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <source>Trigger Period</source>
-      <translation type="unfinished">Trigger Period</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="21"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="32"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <source>Time interval</source>
-      <translation type="unfinished">Time interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <source>Distance interval</source>
-      <translation type="unfinished">Distance interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <source>AUX pins</source>
-      <translation type="unfinished">AUX pins</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <source>AUX pin polarity</source>
-      <translation type="unfinished">AUX pin polarity</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraSection</name>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="29"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="54"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="70"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="87"/>
-      <source>Mode</source>
-      <translation type="unfinished">Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="107"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="108"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropButton</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="162"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="165"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="177"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="212"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
-      <source>Follow Vehicle</source>
-      <translation type="unfinished">Follow Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropPanel</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="29"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="32"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="43"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="86"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-  </context>
-  <context>
-    <name>CompInfoParam</name>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="135"/>
-      <source>Component %1</source>
-      <translation type="unfinished">Component %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="262"/>
-      <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplexMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="57"/>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="63"/>
-      <source>This Pattern does not support Presets.</source>
-      <translation type="unfinished">This Pattern does not support Presets.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="69"/>
-      <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplianceRules</name>
-    <message>
-      <location filename="../src/Airmap/ComplianceRules.qml" line="102"/>
-      <source>Rule</source>
-      <translation type="unfinished">Rule</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="124"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="131"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
-      <source>Corridor Scan</source>
-      <translation type="unfinished">Corridor Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="54"/>
-      <source>C</source>
-      <translation type="unfinished">C</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanEditor</name>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="19"/>
-      <source>Corridor</source>
-      <translation type="unfinished">Corridor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="38"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="45"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="18"/>
-      <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="56"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-  </context>
-  <context>
-    <name>DebugWindow</name>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="38"/>
-      <source>Qt Platform:</source>
-      <translation type="unfinished">Qt Platform:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="48"/>
-      <source>Font Point Size 10</source>
-      <translation type="unfinished">Font Point Size 10</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="54"/>
-      <source>Default font width:</source>
-      <translation type="unfinished">Default font width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="64"/>
-      <source>Font Point Size 10.5</source>
-      <translation type="unfinished">Font Point Size 10.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="70"/>
-      <source>Default font height:</source>
-      <translation type="unfinished">Default font height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="80"/>
-      <source>Font Point Size 11</source>
-      <translation type="unfinished">Font Point Size 11</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="86"/>
-      <source>Default font pixel size:</source>
-      <translation type="unfinished">Default font pixel size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="96"/>
-      <source>Font Point Size 11.5</source>
-      <translation type="unfinished">Font Point Size 11.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="102"/>
-      <source>Default font point size:</source>
-      <translation type="unfinished">Default font point size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="112"/>
-      <source>Font Point Size 12</source>
-      <translation type="unfinished">Font Point Size 12</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="118"/>
-      <source>QML Screen Desktop:</source>
-      <translation type="unfinished">QML Screen Desktop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="128"/>
-      <source>Font Point Size 12.5</source>
-      <translation type="unfinished">Font Point Size 12.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="134"/>
-      <source>QML Screen Size:</source>
-      <translation type="unfinished">QML Screen Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="144"/>
-      <source>Font Point Size 13</source>
-      <translation type="unfinished">Font Point Size 13</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="150"/>
-      <source>QML Pixel Density:</source>
-      <translation type="unfinished">QML Pixel Density:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="160"/>
-      <source>Font Point Size 13.5</source>
-      <translation type="unfinished">Font Point Size 13.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="166"/>
-      <source>QML Pixel Ratio:</source>
-      <translation type="unfinished">QML Pixel Ratio:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="176"/>
-      <source>Font Point Size 14</source>
-      <translation type="unfinished">Font Point Size 14</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="182"/>
-      <source>Default Point:</source>
-      <translation type="unfinished">Default Point:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="192"/>
-      <source>Font Point Size 14.5</source>
-      <translation type="unfinished">Font Point Size 14.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="198"/>
-      <source>Computed Font Height:</source>
-      <translation type="unfinished">Computed Font Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="208"/>
-      <source>Font Point Size 15</source>
-      <translation type="unfinished">Font Point Size 15</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="214"/>
-      <source>Computed Screen Height:</source>
-      <translation type="unfinished">Computed Screen Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="224"/>
-      <source>Font Point Size 15.5</source>
-      <translation type="unfinished">Font Point Size 15.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="230"/>
-      <source>Computed Screen Width:</source>
-      <translation type="unfinished">Computed Screen Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="240"/>
-      <source>Font Point Size 16</source>
-      <translation type="unfinished">Font Point Size 16</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="246"/>
-      <source>Desktop Available Width:</source>
-      <translation type="unfinished">Desktop Available Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="256"/>
-      <source>Font Point Size 16.5</source>
-      <translation type="unfinished">Font Point Size 16.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="262"/>
-      <source>Desktop Available Height:</source>
-      <translation type="unfinished">Desktop Available Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="272"/>
-      <source>Font Point Size 17</source>
-      <translation type="unfinished">Font Point Size 17</translation>
-    </message>
-  </context>
-  <context>
-    <name>DefaultChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
-      <source>Generic Initial checks</source>
-      <translation type="unfinished">Generic Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266Component</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="33"/>
-      <source>controller WiFi Bridge</source>
-      <translation type="unfinished">controller WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="66"/>
-      <source>Error fetching WiFi Bridge Status: %1</source>
-      <translation type="unfinished">Error fetching WiFi Bridge Status: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="116"/>
-      <source>ESP WiFi Bridge Settings</source>
-      <translation type="unfinished">ESP WiFi Bridge Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="143"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="159"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="176"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="192"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="208"/>
-      <source>WiFi STA SSID</source>
-      <translation type="unfinished">WiFi STA SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="225"/>
-      <source>WiFi STA Password</source>
-      <translation type="unfinished">WiFi STA Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="242"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="258"/>
-      <source>QGC UDP Port</source>
-      <translation type="unfinished">QGC UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="277"/>
-      <source>ESP WiFi Bridge Status</source>
-      <translation type="unfinished">ESP WiFi Bridge Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
-      <source>Bridge/Vehicle Link</source>
-      <translation type="unfinished">Bridge/Vehicle Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
-      <source>Bridge/QGC Link</source>
-      <translation type="unfinished">Bridge/QGC Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="298"/>
-      <source>QGC/Bridge Link</source>
-      <translation type="unfinished">QGC/Bridge Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="304"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="319"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="333"/>
-      <source>Messages Received</source>
-      <translation type="unfinished">Messages Received</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="360"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="374"/>
-      <source>Messages Lost</source>
-      <translation type="unfinished">Messages Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="388"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="416"/>
-      <source>Messages Sent</source>
-      <translation type="unfinished">Messages Sent</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="433"/>
-      <source>Restore Defaults</source>
-      <translation type="unfinished">Restore Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="440"/>
-      <source>Restart WiFi Bridge</source>
-      <translation type="unfinished">Restart WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="451"/>
-      <source>Reboot WiFi Bridge</source>
-      <translation type="unfinished">Reboot WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="452"/>
-      <source>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</source>
-      <translation type="unfinished">This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="463"/>
-      <source>Reset Counters</source>
-      <translation type="unfinished">Reset Counters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="16"/>
-      <source>WiFi Bridge</source>
-      <translation type="unfinished">WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="28"/>
-      <source>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</source>
-      <translation type="unfinished">The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266ComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="29"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="33"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="37"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="42"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="46"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="60"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>EditPositionDialog</name>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="51"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="59"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="67"/>
-      <source>Set Geographic</source>
-      <translation type="unfinished">Set Geographic</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="79"/>
-      <source>Zone</source>
-      <translation type="unfinished">Zone</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="87"/>
-      <source>Hemisphere</source>
-      <translation type="unfinished">Hemisphere</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="96"/>
-      <source>Easting</source>
-      <translation type="unfinished">Easting</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="104"/>
-      <source>Northing</source>
-      <translation type="unfinished">Northing</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="112"/>
-      <source>Set UTM</source>
-      <translation type="unfinished">Set UTM</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
-      <source>MGRS</source>
-      <translation type="unfinished">MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
-      <source>Set MGRS</source>
-      <translation type="unfinished">Set MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
-      <source>Set From Vehicle Position</source>
-      <translation type="unfinished">Set From Vehicle Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>ExitWithErrorWindow</name>
-    <message>
-      <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FTPManager</name>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="234"/>
-      <source>Invalid Nak format</source>
-      <translation type="unfinished">Invalid Nak format</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="236"/>
-      <source>errno %1</source>
-      <translation type="unfinished">errno %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="131"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="258"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="280"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="293"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="297"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="402"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="411"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="449"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="484"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="530"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="539"/>
-      <source>Download failed</source>
-      <translation type="unfinished">Download failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="368"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="497"/>
-      <source>Download failed: Error saving file</source>
-      <translation type="unfinished">Download failed: Error saving file</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="166"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="322"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="326"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="201"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="152"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="239"/>
-      <source>* Approximate glide slope altitudes.</source>
-      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="248"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="257"/>
-      <source>* Avoid tailwind on landing.</source>
-      <translation type="unfinished">* Avoid tailwind on landing.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="283"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="290"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="332"/>
-      <source>Landing Area</source>
-      <translation type="unfinished">Landing Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="370"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-  </context>
-  <context>
-    <name>Fact</name>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="247"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>true</source>
-      <translation type="unfinished">true</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>false</source>
-      <translation type="unfinished">false</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="745"/>
-      <source>Change of parameter %1 requires a Vehicle reboot to take effect.</source>
-      <translation type="unfinished">Change of parameter %1 requires a Vehicle reboot to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="747"/>
-      <source>Change of &apos;%1&apos; value requires restart of %2 to take effect.</source>
-      <translation type="unfinished">Change of &apos;%1&apos; value requires restart of %2 to take effect.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactMetaData</name>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="39"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="40"/>
-      <source>Misc</source>
-      <translation type="unfinished">Misc</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="461"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="469"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="479"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="487"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="495"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="504"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="549"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="557"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="567"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="575"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="583"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="592"/>
-      <source>Value must be within %1 and %2</source>
-      <translation type="unfinished">Value must be within %1 and %2</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="523"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="611"/>
-      <source>Invalid number</source>
-      <translation type="unfinished">Invalid number</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactTextField</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="36"/>
-      <source>Invalid Value</source>
-      <translation type="unfinished">Invalid Value</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="40"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
-      <source>Default</source>
-      <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
-      <source>Small</source>
-      <translation type="unfinished">Small</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
-      <source>Large</source>
-      <translation type="unfinished">Large</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
-      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Load Settings</source>
-      <translation type="unfinished">Load Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueSlider</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactValueSlider.qml" line="100"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>Firmware Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="73"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="75"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="77"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareImage</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="143"/>
-      <source>Incorrectly formatted line in .ihx file, line too short</source>
-      <translation type="unfinished">Incorrectly formatted line in .ihx file, line too short</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="148"/>
-      <source>Unsupported record type in file: %1</source>
-      <translation type="unfinished">Unsupported record type in file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="218"/>
-      <source>Unable to open firmware file %1, error: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="227"/>
-      <source>Supplied file is not a valid JSON document</source>
-      <translation type="unfinished">Supplied file is not a valid JSON document</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="238"/>
-      <source>Firmware file missing required key: %1</source>
-      <translation type="unfinished">Firmware file missing required key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="248"/>
-      <source>Firmware file has invalid key: %1</source>
-      <translation type="unfinished">Firmware file has invalid key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="254"/>
-      <source>Downloaded firmware board id does not match hardware board id: %1 != %2</source>
-      <translation type="unfinished">Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="276"/>
-      <source>Write failed for parameter meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for parameter meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="283"/>
-      <source>Unable to open parameter meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open parameter meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="305"/>
-      <source>Write failed for airframe meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for airframe meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="312"/>
-      <source>Unable to open airframe meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open airframe meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="338"/>
-      <source>Unable to open decompressed file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open decompressed file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="344"/>
-      <source>Write failed for decompressed image file, error: %1</source>
-      <translation type="unfinished">Write failed for decompressed image file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="368"/>
-      <source>Firmware file has invalid decompressed size for %1</source>
-      <translation type="unfinished">Firmware file has invalid decompressed size for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="380"/>
-      <source>Could not find compressed bytes for %1 in Firmware file</source>
-      <translation type="unfinished">Could not find compressed bytes for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="385"/>
-      <source>Incorrectly formed compressed bytes section for %1 in Firmware file</source>
-      <translation type="unfinished">Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="401"/>
-      <source>Firmware file has 0 length %1</source>
-      <translation type="unfinished">Firmware file has 0 length %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="405"/>
-      <source>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</source>
-      <translation type="unfinished">Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="409"/>
-      <source>Successfully decompressed %1</source>
-      <translation type="unfinished">Successfully decompressed %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="437"/>
-      <source>Unabled to open firmware file %1, %2</source>
-      <translation type="unfinished">Unabled to open firmware file %1, %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="347"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="364"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="381"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="398"/>
-      <source>Canon</source>
-      <translation type="unfinished">Canon</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="348"/>
-      <source>S100 PowerShot</source>
-      <translation type="unfinished">S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="357"/>
-      <source>Canon S100 PowerShot</source>
-      <translation type="unfinished">Canon S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="365"/>
-      <source>EOS-M 22mm</source>
-      <translation type="unfinished">EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="374"/>
-      <source>Canon EOS-M 22mm</source>
-      <translation type="unfinished">Canon EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="382"/>
-      <source>G9 X PowerShot</source>
-      <translation type="unfinished">G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="391"/>
-      <source>Canon G9 X PowerShot</source>
-      <translation type="unfinished">Canon G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="399"/>
-      <source>SX260 HS PowerShot</source>
-      <translation type="unfinished">SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="408"/>
-      <source>Canon SX260 HS PowerShot</source>
-      <translation type="unfinished">Canon SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="414"/>
-      <source>GoPro</source>
-      <translation type="unfinished">GoPro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="415"/>
-      <source>Hero 4</source>
-      <translation type="unfinished">Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="424"/>
-      <source>GoPro Hero 4</source>
-      <translation type="unfinished">GoPro Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="430"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="446"/>
-      <source>Parrot</source>
-      <translation type="unfinished">Parrot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="431"/>
-      <source>Sequioa RGB</source>
-      <translation type="unfinished">Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="440"/>
-      <source>Parrot Sequioa RGB</source>
-      <translation type="unfinished">Parrot Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="447"/>
-      <source>Sequioa Monochrome</source>
-      <translation type="unfinished">Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="456"/>
-      <source>Parrot Sequioa Monochrome</source>
-      <translation type="unfinished">Parrot Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="462"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="463"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="472"/>
-      <source>RedEdge</source>
-      <translation type="unfinished">RedEdge</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="479"/>
-      <source>Ricoh</source>
-      <translation type="unfinished">Ricoh</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="480"/>
-      <source>GR II</source>
-      <translation type="unfinished">GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="489"/>
-      <source>Ricoh GR II</source>
-      <translation type="unfinished">Ricoh GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="495"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="511"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="527"/>
-      <source>Sentera</source>
-      <translation type="unfinished">Sentera</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="496"/>
-      <source>Double 4K Sensor</source>
-      <translation type="unfinished">Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="505"/>
-      <source>Sentera Double 4K Sensor</source>
-      <translation type="unfinished">Sentera Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="512"/>
-      <source>NDVI Single Sensor</source>
-      <translation type="unfinished">NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="521"/>
-      <source>Sentera NDVI Single Sensor</source>
-      <translation type="unfinished">Sentera NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="528"/>
-      <source>6X Sensor</source>
-      <translation type="unfinished">6X Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="545"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="561"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="577"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="593"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="609"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="625"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="641"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="657"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="673"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="689"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="705"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="724"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="742"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="759"/>
-      <source>Sony</source>
-      <translation type="unfinished">Sony</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="546"/>
-      <source>a6000 16mm</source>
-      <translation type="unfinished">a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="555"/>
-      <source>Sony a6000 16mm</source>
-      <translation type="unfinished">Sony a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="562"/>
-      <source>a6000 35mm</source>
-      <translation type="unfinished">a6000 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="578"/>
-      <source>a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="587"/>
-      <source>Sony a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="594"/>
-      <source>a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="603"/>
-      <source>Sony a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="610"/>
-      <source>a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="619"/>
-      <source>Sony a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="626"/>
-      <source>a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="635"/>
-      <source>Sony a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="642"/>
-      <source>a7r III 35mm</source>
-      <translation type="unfinished">a7r III 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="658"/>
-      <source>a7r IV 35mm</source>
-      <translation type="unfinished">a7r IV 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="674"/>
-      <source>DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="683"/>
-      <source>Sony DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">Sony DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="690"/>
-      <source>DSC-RX0</source>
-      <translation type="unfinished">DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="699"/>
-      <source>Sony DSC-RX0</source>
-      <translation type="unfinished">Sony DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="706"/>
-      <source>DSC-RX1R II 35mm</source>
-      <translation type="unfinished">DSC-RX1R II 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="725"/>
-      <source>ILCE-QX1</source>
-      <translation type="unfinished">ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="734"/>
-      <source>Sony ILCE-QX1</source>
-      <translation type="unfinished">Sony ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="743"/>
-      <source>NEX-5R 20mm</source>
-      <translation type="unfinished">NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="752"/>
-      <source>Sony NEX-5R 20mm</source>
-      <translation type="unfinished">Sony NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="760"/>
-      <source>RX100 II 28mm</source>
-      <translation type="unfinished">RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="769"/>
-      <source>Sony RX100 II 28mm</source>
-      <translation type="unfinished">Sony RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="775"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="791"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="807"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="823"/>
-      <source>Yuneec</source>
-      <translation type="unfinished">Yuneec</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="776"/>
-      <source>CGOET</source>
-      <translation type="unfinished">CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="785"/>
-      <source>Yuneec CGOET</source>
-      <translation type="unfinished">Yuneec CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="792"/>
-      <source>E10T</source>
-      <translation type="unfinished">E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="801"/>
-      <source>Yuneec E10T</source>
-      <translation type="unfinished">Yuneec E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="808"/>
-      <source>E50</source>
-      <translation type="unfinished">E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="817"/>
-      <source>Yuneec E50</source>
-      <translation type="unfinished">Yuneec E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="824"/>
-      <source>E90</source>
-      <translation type="unfinished">E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="833"/>
-      <source>Yuneec E90</source>
-      <translation type="unfinished">Yuneec E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="839"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="855"/>
-      <source>Flir</source>
-      <translation type="unfinished">Flir</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="840"/>
-      <source>Duo R</source>
-      <translation type="unfinished">Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="849"/>
-      <source>Flir Duo R</source>
-      <translation type="unfinished">Flir Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="856"/>
-      <source>Duo Pro R</source>
-      <translation type="unfinished">Duo Pro R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="871"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="887"/>
-      <source>Workswell</source>
-      <translation type="unfinished">Workswell</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="872"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="888"/>
-      <source>Wiris Security</source>
-      <translation type="unfinished">Wiris Security</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="1061"/>
-      <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
-      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="28"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="44"/>
-      <source>Firmware Setup</source>
-      <translation type="unfinished">Firmware Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="47"/>
-      <source>%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</source>
-      <translation type="unfinished">%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="48"/>
-      <source>Update the autopilot firmware to the latest version</source>
-      <translation type="unfinished">Update the autopilot firmware to the latest version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="52"/>
-      <source>All %1 connections to vehicles must be </source>
-      <translation type="unfinished">All %1 connections to vehicles must be </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="70"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="82"/>
-      <source>Select Firmware File</source>
-      <translation type="unfinished">Select Firmware File</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
-      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="127"/>
-      <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
-      <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="128"/>
-      <source>Detected [%1]: </source>
-      <translation type="unfinished">Detected [%1]: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="135"/>
-      <source>Found device</source>
-      <translation type="unfinished">Found device</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="177"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="331"/>
-      <source>PX4 Pro </source>
-      <translation type="unfinished">PX4 Pro </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="242"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="276"/>
-      <source>Standard Version (stable)</source>
-      <translation type="unfinished">Standard Version (stable)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="246"/>
-      <source>Beta Testing (beta)</source>
-      <translation type="unfinished">Beta Testing (beta)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="250"/>
-      <source>Developer Build (master)</source>
-      <translation type="unfinished">Developer Build (master)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="254"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="280"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="293"/>
-      <source>Custom firmware file...</source>
-      <translation type="unfinished">Custom firmware file...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="263"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="267"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="344"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="289"/>
-      <source>Standard Version</source>
-      <translation type="unfinished">Standard Version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="313"/>
-      <source>Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</source>
-      <translation type="unfinished">Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="314"/>
-      <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
-      <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="315"/>
-      <source>Press Ok to upgrade your vehicle.</source>
-      <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="318"/>
-      <source>Flight Stack</source>
-      <translation type="unfinished">Flight Stack</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="386"/>
-      <source>Downloading list of available firmwares...</source>
-      <translation type="unfinished">Downloading list of available firmwares...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="394"/>
-      <source>No Firmware Available</source>
-      <translation type="unfinished">No Firmware Available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="444"/>
-      <source>Select the standard version or one from the file system (previously downloaded):</source>
-      <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="445"/>
-      <source>Select which version of the firmware you would like to install:</source>
-      <translation type="unfinished">Select which version of the firmware you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="446"/>
-      <source>Select which version of the above flight stack you would like to install:</source>
-      <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="461"/>
-      <source>WARNING: BETA FIRMWARE. </source>
-      <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="462"/>
-      <source>This firmware version is ONLY intended for beta testers. </source>
-      <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="463"/>
-      <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
-      <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="464"/>
-      <source>Do NOT use for normal operation.</source>
-      <translation type="unfinished">Do NOT use for normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="467"/>
-      <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
-      <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="468"/>
-      <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
-      <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="469"/>
-      <source>It is only intended for DEVELOPERS. </source>
-      <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="470"/>
-      <source>Run bench tests without props first. </source>
-      <translation type="unfinished">Run bench tests without props first. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="471"/>
-      <source>Do NOT fly this without additional safety precautions. </source>
-      <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="472"/>
-      <source>Follow the forums actively when using it.</source>
-      <translation type="unfinished">Follow the forums actively when using it.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="512"/>
-      <source>Flash ChibiOS Bootloader</source>
-      <translation type="unfinished">Flash ChibiOS Bootloader</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgradeController</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="162"/>
-      <source>Connect not allowed during Firmware Upgrade.</source>
-      <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="280"/>
-      <source>Connected to bootloader:</source>
-      <translation type="unfinished">Connected to bootloader:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="281"/>
-      <source>  Version: %1</source>
-      <translation type="unfinished">  Version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="282"/>
-      <source>  Board ID: %1</source>
-      <translation type="unfinished">  Board ID: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="283"/>
-      <source>  Flash size: %1</source>
-      <translation type="unfinished">  Flash size: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="366"/>
-      <source>Custom firmware selected but no filename given.</source>
-      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="371"/>
-      <source>Unable to find specified firmware for board type</source>
-      <translation type="unfinished">Unable to find specified firmware for board type</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="377"/>
-      <source>No firmware file selected</source>
-      <translation type="unfinished">No firmware file selected</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="388"/>
-      <source>Downloading firmware...</source>
-      <translation type="unfinished">Downloading firmware...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="389"/>
-      <source> From: %1</source>
-      <translation type="unfinished"> From: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="410"/>
-      <source>Download complete</source>
-      <translation type="unfinished">Download complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="418"/>
-      <source>Image load failed</source>
-      <translation type="unfinished">Image load failed</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="424"/>
-      <source>Bootloader not found</source>
-      <translation type="unfinished">Bootloader not found</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="429"/>
-      <source>Image size of %1 is too large for board flash size %2</source>
-      <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="461"/>
-      <source>Upgrade complete</source>
-      <translation type="unfinished">Upgrade complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="519"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="595"/>
-      <source>Choose board type</source>
-      <translation type="unfinished">Choose board type</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
-      <source>Fixed Wing Initial Checks</source>
-      <translation type="unfinished">Fixed Wing Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
-      <source>Fixed Wing Landing</source>
-      <translation type="unfinished">Fixed Wing Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="98"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightBrief</name>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="32"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="51"/>
-      <source>Authorizations</source>
-      <translation type="unfinished">Authorizations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="96"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="128"/>
-      <source>Authorization Pending</source>
-      <translation type="unfinished">Authorization Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="98"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="130"/>
-      <source>Authorization Accepted</source>
-      <translation type="unfinished">Authorization Accepted</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="100"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="132"/>
-      <source>Authorization Rejected</source>
-      <translation type="unfinished">Authorization Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="101"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="135"/>
-      <source>Authorization Unknown</source>
-      <translation type="unfinished">Authorization Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="134"/>
-      <source>Authorization Not Required</source>
-      <translation type="unfinished">Authorization Not Required</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="144"/>
-      <source>Rules &amp; Compliance</source>
-      <translation type="unfinished">Rules &amp; Compliance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="149"/>
-      <source>Rules you may be violating</source>
-      <translation type="unfinished">Rules you may be violating</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="159"/>
-      <source>Rules needing more information</source>
-      <translation type="unfinished">Rules needing more information</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="169"/>
-      <source>Rules you should review</source>
-      <translation type="unfinished">Rules you should review</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="179"/>
-      <source>Rules you are following</source>
-      <translation type="unfinished">Rules you are following</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="198"/>
-      <source>Update Plan</source>
-      <translation type="unfinished">Update Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="210"/>
-      <source>Submit Plan</source>
-      <translation type="unfinished">Submit Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="223"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDetails</name>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="32"/>
-      <source>Flight Details</source>
-      <translation type="unfinished">Flight Details</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="51"/>
-      <source>Flight Date &amp; Time</source>
-      <translation type="unfinished">Flight Date &amp; Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="71"/>
-      <location filename="../src/Airmap/FlightDetails.qml" line="141"/>
-      <source>Now</source>
-      <translation type="unfinished">Now</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="82"/>
-      <source>Today</source>
-      <translation type="unfinished">Today</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="96"/>
-      <source>Flight Start Time</source>
-      <translation type="unfinished">Flight Start Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="146"/>
-      <source>Duration</source>
-      <translation type="unfinished">Duration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="186"/>
-      <source>Flight Context</source>
-      <translation type="unfinished">Flight Context</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDisplayViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>WAITING FOR VIDEO</source>
-      <translation type="unfinished">WAITING FOR VIDEO</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>VIDEO DISABLED</source>
-      <translation type="unfinished">VIDEO DISABLED</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightMap</name>
-    <message>
-      <location filename="../src/FlightMap/FlightMap.qml" line="69"/>
-      <source>Specify Position</source>
-      <translation type="unfinished">Specify Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeDropdown</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeDropdown.qml" line="22"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeMenu</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeMenu.qml" line="20"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="24"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="35"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <source>Mode switch</source>
-      <translation type="unfinished">Mode switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <source>Flight Mode %1 </source>
-      <translation type="unfinished">Flight Mode %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <source>Position Ctl switch</source>
-      <translation type="unfinished">Position Ctl switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <source>Loiter switch</source>
-      <translation type="unfinished">Loiter switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <source>Return switch</source>
-      <translation type="unfinished">Return switch</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewAirspaceIndicator</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
-      <source>Approval Pending</source>
-      <translation type="unfinished">Approval Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
-      <source>Flight Approved</source>
-      <translation type="unfinished">Flight Approved</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
-      <source>Flight Rejected</source>
-      <translation type="unfinished">Flight Rejected</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMap</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="346"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="371"/>
-      <source>Go here</source>
-      <comment>Go to location waypoint</comment>
-      <translation type="unfinished">Go here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="474"/>
-      <source>ROI here</source>
-      <comment>Make this a Region Of Interest</comment>
-      <translation type="unfinished">ROI here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="510"/>
-      <source>Orbit</source>
-      <comment>Orbit waypoint</comment>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="522"/>
-      <source>Go to location</source>
-      <translation type="unfinished">Go to location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="531"/>
-      <source>Orbit at location</source>
-      <translation type="unfinished">Orbit at location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="540"/>
-      <source>ROI at location</source>
-      <translation type="unfinished">ROI at location</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMissionCompleteDialog</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="44"/>
-      <source>Flight Plan complete</source>
-      <translation type="unfinished">Flight Plan complete</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="80"/>
-      <source>%1 Images Taken</source>
-      <translation type="unfinished">%1 Images Taken</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="87"/>
-      <source>Remove plan from vehicle</source>
-      <translation type="unfinished">Remove plan from vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="98"/>
-      <source>Leave plan on vehicle</source>
-      <translation type="unfinished">Leave plan on vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="116"/>
-      <source>Resume Mission From Waypoint %1</source>
-      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="127"/>
-      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
-      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="135"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewPreFlightChecklistPopup</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
-      <source>Pre-Flight Checklist</source>
-      <translation type="unfinished">Pre-Flight Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStrip</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStripActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStripActionList.qml" line="22"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="68"/>
-      <source>Double-click to exit full screen</source>
-      <translation type="unfinished">Double-click to exit full screen</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewWidgetLayer</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="89"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="95"/>
-      <source>Multi-Vehicle</source>
-      <translation type="unfinished">Multi-Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Status</source>
-      <translation type="unfinished">GPS Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Data Unavailable</source>
-      <translation type="unfinished">GPS Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
-      <source>GPS Count:</source>
-      <translation type="unfinished">GPS Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
-      <source>GPS Lock:</source>
-      <translation type="unfinished">GPS Lock:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
-      <source>HDOP:</source>
-      <translation type="unfinished">HDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="70"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="72"/>
-      <source>--.--</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">--.--</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
-      <source>VDOP:</source>
-      <translation type="unfinished">VDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="71"/>
-      <source>Course Over Ground:</source>
-      <translation type="unfinished">Course Over Ground:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSRTKIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>Survey-in Active</source>
-      <translation type="unfinished">Survey-in Active</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>RTK Streaming</source>
-      <translation type="unfinished">RTK Streaming</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="61"/>
-      <source>Duration:</source>
-      <translation type="unfinished">Duration:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Accuracy:</source>
-      <translation type="unfinished">Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Current Accuracy:</source>
-      <translation type="unfinished">Current Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="77"/>
-      <source>Satellites:</source>
-      <translation type="unfinished">Satellites:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeneralSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="407"/>
-      <source>Units</source>
-      <translation type="unfinished">Units</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="444"/>
-      <source>Miscellaneous</source>
-      <translation type="unfinished">Miscellaneous</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="468"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="479"/>
-      <source>Color Scheme</source>
-      <translation type="unfinished">Color Scheme</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="490"/>
-      <source>Map Provider</source>
-      <translation type="unfinished">Map Provider</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="510"/>
-      <source>Map Type</source>
-      <translation type="unfinished">Map Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="529"/>
-      <source>Stream GCS Position</source>
-      <translation type="unfinished">Stream GCS Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="611"/>
-      <source>Mute all audio output</source>
-      <translation type="unfinished">Mute all audio output</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="626"/>
-      <source>Clear all settings on next start</source>
-      <translation type="unfinished">Clear all settings on next start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="636"/>
-      <source>Clear Settings</source>
-      <translation type="unfinished">Clear Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="637"/>
-      <source>All saved settings will be reset the next time you start %1. Is this really what you want?</source>
-      <translation type="unfinished">All saved settings will be reset the next time you start %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="661"/>
-      <source>Application Load/Save Path</source>
-      <translation type="unfinished">Application Load/Save Path</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="665"/>
-      <source>&lt;not set&gt;</source>
-      <translation type="unfinished">&lt;not set&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="668"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1072"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1094"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="672"/>
-      <source>Choose the location to save/load files</source>
-      <translation type="unfinished">Choose the location to save/load files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="685"/>
-      <source>Telemetry Logs from Vehicle</source>
-      <translation type="unfinished">Telemetry Logs from Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="703"/>
-      <source>Save log after each flight</source>
-      <translation type="unfinished">Save log after each flight</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="711"/>
-      <source>Save logs even if vehicle was not armed</source>
-      <translation type="unfinished">Save logs even if vehicle was not armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="84"/>
-      <source>Fly View</source>
-      <translation type="unfinished">Fly View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="145"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="177"/>
-      <source>Show simple camera controls (DIGICAM_CONTROL)</source>
-      <translation type="unfinished">Show simple camera controls (DIGICAM_CONTROL)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="188"/>
-      <source>Guided Command Settings</source>
-      <translation type="unfinished">Guided Command Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="194"/>
-      <source>Minimum Altitude</source>
-      <translation type="unfinished">Minimum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="205"/>
-      <source>Maximum Altitude</source>
-      <translation type="unfinished">Maximum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
-      <source>UI Scaling</source>
-      <translation type="unfinished">UI Scaling</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="604"/>
-      <source>Use Vehicle Pairing</source>
-      <translation type="unfinished">Use Vehicle Pairing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="618"/>
-      <source>Check for Internet connection</source>
-      <translation type="unfinished">Check for Internet connection</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="719"/>
-      <source>Save CSV log of telemetry data</source>
-      <translation type="unfinished">Save CSV log of telemetry data</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="103"/>
-      <source>Use Preflight Checklist</source>
-      <translation type="unfinished">Use Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="111"/>
-      <source>Enforce Preflight Checklist</source>
-      <translation type="unfinished">Enforce Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="120"/>
-      <source>Keep Map Centered On Vehicle</source>
-      <translation type="unfinished">Keep Map Centered On Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="128"/>
-      <source>Show Telemetry Log Replay Status Bar</source>
-      <translation type="unfinished">Show Telemetry Log Replay Status Bar</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="139"/>
-      <source>Virtual Joystick</source>
-      <translation type="unfinished">Virtual Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="153"/>
-      <source>Use Vertical Instrument Panel</source>
-      <translation type="unfinished">Use Vertical Instrument Panel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="161"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="169"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="216"/>
-      <source>Go To Location Max Distance</source>
-      <translation type="unfinished">Go To Location Max Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="233"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="240"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="296"/>
-      <source>File Format</source>
-      <translation type="unfinished">File Format</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="318"/>
-      <source>Video decode priority</source>
-      <translation type="unfinished">Video decode priority</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="345"/>
-      <source>Auto-Delete Saved Recordings</source>
-      <translation type="unfinished">Auto-Delete Saved Recordings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="356"/>
-      <source>Plan View</source>
-      <translation type="unfinished">Plan View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="378"/>
-      <source>Default Mission Altitude</source>
-      <translation type="unfinished">Default Mission Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="384"/>
-      <source>VTOL TransitionDistance</source>
-      <translation type="unfinished">VTOL TransitionDistance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="392"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="397"/>
-      <source>Missions Do Not Require Takeoff Item</source>
-      <translation type="unfinished">Missions Do Not Require Takeoff Item</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="731"/>
-      <source>AutoConnect to the following devices</source>
-      <translation type="unfinished">AutoConnect to the following devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>LibrePilot</source>
-      <translation type="unfinished">LibrePilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="847"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Zero-Conf</source>
-      <translation type="unfinished">Zero-Conf</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="781"/>
-      <source>NMEA GPS Device</source>
-      <translation type="unfinished">NMEA GPS Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="812"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="832"/>
-      <source>NMEA stream UDP port</source>
-      <translation type="unfinished">NMEA stream UDP port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="870"/>
-      <source>Perform Survey-In</source>
-      <translation type="unfinished">Perform Survey-In</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="904"/>
-      <source>Use Specified Base Position</source>
-      <translation type="unfinished">Use Specified Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="965"/>
-      <source>Save Current Base Position</source>
-      <translation type="unfinished">Save Current Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="981"/>
-      <source>ADSB Server</source>
-      <translation type="unfinished">ADSB Server</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="999"/>
-      <source>Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</source>
-      <translation type="unfinished">Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="253"/>
-      <source>UDP Port</source>
-      <translation type="unfinished">UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="264"/>
-      <source>RTSP URL</source>
-      <translation type="unfinished">RTSP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="275"/>
-      <source>TCP URL</source>
-      <translation type="unfinished">TCP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="285"/>
-      <source>Aspect Ratio</source>
-      <translation type="unfinished">Aspect Ratio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="331"/>
-      <source>Disable When Disarmed</source>
-      <translation type="unfinished">Disable When Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="338"/>
-      <source>Low Latency Mode</source>
-      <translation type="unfinished">Low Latency Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="307"/>
-      <source>Max Storage Usage</source>
-      <translation type="unfinished">Max Storage Usage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1044"/>
-      <source>Brand Image</source>
-      <translation type="unfinished">Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1063"/>
-      <source>Indoor Image</source>
-      <translation type="unfinished">Indoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1076"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1098"/>
-      <source>Choose custom brand image file</source>
-      <translation type="unfinished">Choose custom brand image file</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1085"/>
-      <source>Outdoor Image</source>
-      <translation type="unfinished">Outdoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1106"/>
-      <source>Reset Default Brand Image</source>
-      <translation type="unfinished">Reset Default Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1119"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceController</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="151"/>
-      <source>GeoFence supports version %1</source>
-      <translation type="unfinished">GeoFence supports version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="158"/>
-      <source>GeoFence polygon not stored as object</source>
-      <translation type="unfinished">GeoFence polygon not stored as object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="172"/>
-      <source>GeoFence circle not stored as object</source>
-      <translation type="unfinished">GeoFence circle not stored as object</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceEditor</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="37"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="65"/>
-      <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
-      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="66"/>
-      <source>This vehicle does not support GeoFence.</source>
-      <translation type="unfinished">This vehicle does not support GeoFence.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="116"/>
-      <source>Insert GeoFence</source>
-      <translation type="unfinished">Insert GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="121"/>
-      <source>Polygon Fence</source>
-      <translation type="unfinished">Polygon Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="133"/>
-      <source>Circular Fence</source>
-      <translation type="unfinished">Circular Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
-      <source>Polygon Fences</source>
-      <translation type="unfinished">Polygon Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="151"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="226"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="162"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="238"/>
-      <source>Inclusion</source>
-      <translation type="unfinished">Inclusion</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="178"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="254"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="202"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="294"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="211"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="303"/>
-      <source>Del</source>
-      <translation type="unfinished">Del</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="222"/>
-      <source>Circular Fences</source>
-      <translation type="unfinished">Circular Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="278"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="314"/>
-      <source>Breach Return Point</source>
-      <translation type="unfinished">Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="318"/>
-      <source>Add Breach Return Point</source>
-      <translation type="unfinished">Add Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="327"/>
-      <source>Remove Breach Return Point</source>
-      <translation type="unfinished">Remove Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="342"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceManager</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="161"/>
-      <source>GeoFence load: Vertex count change mid-polygon - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="165"/>
-      <source>GeoFence load: Polygon type changed before last load complete - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="178"/>
-      <source>GeoFence load: Incomplete polygon loaded</source>
-      <translation type="unfinished">GeoFence load: Incomplete polygon loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="186"/>
-      <source>GeoFence load: Unsupported command %1</source>
-      <translation type="unfinished">GeoFence load: Unsupported command %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="170"/>
-      <source>B</source>
-      <comment>Breach Return Point item indicator</comment>
-      <translation type="unfinished">B</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagController</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="58"/>
-      <source>Images have alreay been tagged. Existing images will be removed.</source>
-      <translation type="unfinished">Images have alreay been tagged. Existing images will be removed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="81"/>
-      <source>The save folder already contains images.</source>
-      <translation type="unfinished">The save folder already contains images.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="95"/>
-      <source>Cannot find the image directory.</source>
-      <translation type="unfinished">Cannot find the image directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="103"/>
-      <source>Couldn&apos;t replace the previously tagged images</source>
-      <translation type="unfinished">Couldn&apos;t replace the previously tagged images</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="110"/>
-      <source>Cannot find the save directory.</source>
-      <translation type="unfinished">Cannot find the save directory.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="26"/>
-      <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="67"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="75"/>
-      <source>Select log file</source>
-      <translation type="unfinished">Select log file</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>ULog file (*.ulg)</source>
-      <translation type="unfinished">ULog file (*.ulg)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>PX4 log file (*.px4log)</source>
-      <translation type="unfinished">PX4 log file (*.px4log)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="95"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="103"/>
-      <source>Select image directory</source>
-      <translation type="unfinished">Select image directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="122"/>
-      <source>(Optionally) Select save directory</source>
-      <translation type="unfinished">(Optionally) Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="130"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Cancel Tagging</source>
-      <translation type="unfinished">Cancel Tagging</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Start Tagging</source>
-      <translation type="unfinished">Start Tagging</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagWorker</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="158"/>
-      <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
-      <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="169"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="257"/>
-      <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="181"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="213"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="228"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="242"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="284"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="291"/>
-      <source>Tagging cancelled</source>
-      <translation type="unfinished">Tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="190"/>
-      <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>%1 - tagging cancelled</source>
-      <translation type="unfinished">%1 - tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>Log parsing failed</source>
-      <translation type="unfinished">Log parsing failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="235"/>
-      <source>Geotagging failed in trigger filtering</source>
-      <translation type="unfinished">Geotagging failed in trigger filtering</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
-      <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="264"/>
-      <source>Geotagging failed. Couldn&apos;t write to image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="274"/>
-      <source>Geotagging failed. Couldn&apos;t write to an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to an image.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionConfirm</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="104"/>
-      <source>Slide to confirm</source>
-      <translation type="unfinished">Slide to confirm</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="81"/>
-      <source>Select Action</source>
-      <translation type="unfinished">Select Action</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionsController</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="36"/>
-      <source>EMERGENCY STOP</source>
-      <translation type="unfinished">EMERGENCY STOP</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="42"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
-      <source>Start Mission</source>
-      <translation type="unfinished">Start Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="44"/>
-      <source>Start Mission (MV)</source>
-      <translation type="unfinished">Start Mission (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="45"/>
-      <source>Continue Mission</source>
-      <translation type="unfinished">Continue Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="46"/>
-      <source>Resume FAILED</source>
-      <translation type="unfinished">Resume FAILED</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="47"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="48"/>
-      <source>Pause (MV)</source>
-      <translation type="unfinished">Pause (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="49"/>
-      <source>Change Altitude</source>
-      <translation type="unfinished">Change Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="50"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="51"/>
-      <source>Land Abort</source>
-      <translation type="unfinished">Land Abort</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
-      <source>Set Waypoint</source>
-      <translation type="unfinished">Set Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
-      <source>Go To Location</source>
-      <translation type="unfinished">Go To Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
-      <source>Return to the launch position of the vehicle.</source>
-      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
-      <source>VTOL Transition</source>
-      <translation type="unfinished">VTOL Transition</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
-      <source>Arm the vehicle.</source>
-      <translation type="unfinished">Arm the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
-      <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
-      <source>Disarm the vehicle</source>
-      <translation type="unfinished">Disarm the vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
-      <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
-      <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
-      <source>Takeoff from ground and hold position.</source>
-      <translation type="unfinished">Takeoff from ground and hold position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-      <source>Takeoff from ground and start the current mission.</source>
-      <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
-      <source>Continue the mission from the current waypoint.</source>
-      <translation type="unfinished">Continue the mission from the current waypoint.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
-      <source>Upload of resume mission failed. Confirm to retry upload</source>
-      <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
-      <source>Land the vehicle at the current position.</source>
-      <translation type="unfinished">Land the vehicle at the current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
-      <source>Change the altitude of the vehicle up or down.</source>
-      <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
-      <source>Move the vehicle to the specified location.</source>
-      <translation type="unfinished">Move the vehicle to the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
-      <source>Adjust current waypoint to %1.</source>
-      <translation type="unfinished">Adjust current waypoint to %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
-      <source>Orbit the vehicle around the specified location.</source>
-      <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
-      <source>Abort the landing sequence.</source>
-      <translation type="unfinished">Abort the landing sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
-      <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
-      <source>Pause all vehicles at their current position.</source>
-      <translation type="unfinished">Pause all vehicles at their current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
-      <source>Transition VTOL to fixed wing flight.</source>
-      <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
-      <source>Transition VTOL to multi-rotor flight.</source>
-      <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="77"/>
-      <source>Make the specified location a Region Of Interest.</source>
-      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="163"/>
-      <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="392"/>
-      <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="536"/>
-      <source>Internal error: unknown actionCode</source>
-      <translation type="unfinished">Internal error: unknown actionCode</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedAltitudeSlider</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="65"/>
-      <source>New Alt(rel)</source>
-      <translation type="unfinished">New Alt(rel)</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="37"/>
-      <source>QGroundControl User Guide</source>
-      <translation type="unfinished">QGroundControl User Guide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="44"/>
-      <source>PX4 Users Discussion Forum</source>
-      <translation type="unfinished">PX4 Users Discussion Forum</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="51"/>
-      <source>ArduPilot Users Discussion Forum</source>
-      <translation type="unfinished">ArduPilot Users Discussion Forum</translation>
-    </message>
-  </context>
-  <context>
-    <name>HorizontalFactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="128"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="153"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="136"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="160"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
-      <source>Color</source>
-      <translation type="unfinished">Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
-      <source>Opacity</source>
-      <translation type="unfinished">Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueArea</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="85"/>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="109"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <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/QmlControls/InstrumentValueArea.qml" line="127"/>
-      <source>Reset To Defaults</source>
-      <translation type="unfinished">Reset To Defaults</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueEditDialog</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
-      <source>Value Display</source>
-      <translation type="unfinished">Value Display</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
-      <source>Valuec requires a connected vehicle for setup.</source>
-      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="89"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="129"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="133"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="146"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="159"/>
-      <source>Show Units</source>
-      <translation type="unfinished">Show Units</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="164"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="246"/>
-      <source>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</source>
-      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="264"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="371"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="470"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="321"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="420"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="505"/>
-      <source>Add Row</source>
-      <translation type="unfinished">Add Row</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="353"/>
-      <source>Specify the icon you want to display based on value ranges.</source>
-      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="452"/>
-      <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="520"/>
-      <source>Select Icon</source>
-      <translation type="unfinished">Select Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueValue.qml" line="47"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>Joystick</name>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="44"/>
-      <source>No Action</source>
-      <translation type="unfinished">No Action</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="45"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="46"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="47"/>
-      <source>Toggle Arm</source>
-      <translation type="unfinished">Toggle Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="48"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="49"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="50"/>
-      <source>Continuous Zoom In</source>
-      <translation type="unfinished">Continuous Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="51"/>
-      <source>Continuous Zoom Out</source>
-      <translation type="unfinished">Continuous Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="52"/>
-      <source>Step Zoom In</source>
-      <translation type="unfinished">Step Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="53"/>
-      <source>Step Zoom Out</source>
-      <translation type="unfinished">Step Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="58"/>
-      <source>Trigger Camera</source>
-      <translation type="unfinished">Trigger Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="59"/>
-      <source>Start Recording Video</source>
-      <translation type="unfinished">Start Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="60"/>
-      <source>Stop Recording Video</source>
-      <translation type="unfinished">Stop Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="61"/>
-      <source>Toggle Recording Video</source>
-      <translation type="unfinished">Toggle Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="62"/>
-      <source>Gimbal Down</source>
-      <translation type="unfinished">Gimbal Down</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="63"/>
-      <source>Gimbal Up</source>
-      <translation type="unfinished">Gimbal Up</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="64"/>
-      <source>Gimbal Left</source>
-      <translation type="unfinished">Gimbal Left</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="65"/>
-      <source>Gimbal Right</source>
-      <translation type="unfinished">Gimbal Right</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="66"/>
-      <source>Gimbal Center</source>
-      <translation type="unfinished">Gimbal Center</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="67"/>
-      <source>Emergency Stop</source>
-      <translation type="unfinished">Emergency Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="54"/>
-      <source>Next Video Stream</source>
-      <translation type="unfinished">Next Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="55"/>
-      <source>Previous Video Stream</source>
-      <translation type="unfinished">Previous Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="56"/>
-      <source>Next Camera</source>
-      <translation type="unfinished">Next Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="57"/>
-      <source>Previous Camera</source>
-      <translation type="unfinished">Previous Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfig</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigAdvanced</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
-      <source>Full down stick is zero throttle</source>
-      <translation type="unfinished">Full down stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
-      <source>Center stick is zero throttle</source>
-      <translation type="unfinished">Center stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
-      <source>Spring loaded throttle smoothing</source>
-      <translation type="unfinished">Spring loaded throttle smoothing</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
-      <source>Allow negative Thrust</source>
-      <translation type="unfinished">Allow negative Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
-      <source>Exponential:</source>
-      <translation type="unfinished">Exponential:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
-      <source>Enable further advanced settings (careful!)</source>
-      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
-      <source>Axis frequency (Hz):</source>
-      <translation type="unfinished">Axis frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="127"/>
-      <source>Button repeat frequency (Hz):</source>
-      <translation type="unfinished">Button repeat frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="145"/>
-      <source>Enable circle correction</source>
-      <translation type="unfinished">Enable circle correction</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="163"/>
-      <source>Deadbands</source>
-      <translation type="unfinished">Deadbands</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="180"/>
-      <source>Deadband can be set during the first </source>
-      <translation type="unfinished">Deadband can be set during the first </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="181"/>
-      <source>step of calibration by gently wiggling each axis. </source>
-      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="182"/>
-      <source>Deadband can also be adjusted by clicking and </source>
-      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="183"/>
-      <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigButtons</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
-      <source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
-      <translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="124"/>
-      <source>#</source>
-      <translation type="unfinished">#</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="128"/>
-      <source>Function: </source>
-      <translation type="unfinished">Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="132"/>
-      <source>Shift Function: </source>
-      <translation type="unfinished">Shift Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="185"/>
-      <source>No firmware support</source>
-      <translation type="unfinished">No firmware support</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigCalibration</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="169"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="175"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigController</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="197"/>
-      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigGeneral</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable joystick input</source>
-      <translation type="unfinished">Enable joystick input</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable not allowed (Calibrate First)</source>
-      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
-      <source>Active joystick:</source>
-      <translation type="unfinished">Active joystick:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
-      <source>Active joystick name not in combo</source>
-      <translation type="unfinished">Active joystick name not in combo</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
-      <source>RC Mode:</source>
-      <translation type="unfinished">RC Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Lateral</source>
-      <translation type="unfinished">Lateral</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-      <source>Joystick Status</source>
-      <translation type="unfinished">Joystick Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-      <source>Connected:</source>
-      <translation type="unfinished">Connected:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-      <source>Enabled:</source>
-      <translation type="unfinished">Enabled:</translation>
-    </message>
-  </context>
-  <context>
-    <name>JsonHelper</name>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="181"/>
-      <source>File open failed: file:error %1 %2</source>
-      <translation type="unfinished">File open failed: file:error %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="334"/>
-      <source>Unable to open file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="343"/>
-      <source>Unable to parse json file: %1 error: %2 offset: %3</source>
-      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="348"/>
-      <source>Root of json file is not object: %1</source>
-      <translation type="unfinished">Root of json file is not object: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="355"/>
-      <source>Json file: &apos;%1&apos;. %2</source>
-      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLHelper</name>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="15"/>
-      <source>KML file load failed. %1</source>
-      <translation type="unfinished">KML file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="24"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="29"/>
-      <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="37"/>
-      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="61"/>
-      <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="77"/>
-      <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="83"/>
-      <location filename="../src/KMLHelper.cc" line="144"/>
-      <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="138"/>
-      <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLOrSHPFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>LandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="635"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="655"/>
-      <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkManager</name>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="235"/>
-      <source>Connect not allowed: %1</source>
-      <translation type="unfinished">Connect not allowed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="607"/>
-      <location filename="../src/comm/LinkManager.cc" line="613"/>
-      <location filename="../src/comm/LinkManager.cc" line="618"/>
-      <location filename="../src/comm/LinkManager.cc" line="623"/>
-      <source>%1 on %2 (AutoConnect)</source>
-      <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="667"/>
-      <source>Shutdown</source>
-      <translation type="unfinished">Shutdown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="683"/>
-      <source>Serial</source>
-      <translation type="unfinished">Serial</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="685"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="686"/>
-      <source>TCP</source>
-      <translation type="unfinished">TCP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="691"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="694"/>
-      <location filename="../src/comm/LinkManager.cc" line="884"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="95"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="104"/>
-      <source>Remove Link Configuration</source>
-      <translation type="unfinished">Remove Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="105"/>
-      <source>Remove %1. Is this really what you want?</source>
-      <translation type="unfinished">Remove %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="116"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="121"/>
-      <source>Add</source>
-      <translation type="unfinished">Add</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="125"/>
-      <source>Connect</source>
-      <translation type="unfinished">Connect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="130"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="135"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Edit Link Configuration Settings</source>
-      <translation type="unfinished">Edit Link Configuration Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Create New Link Configuration</source>
-      <translation type="unfinished">Create New Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="183"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="189"/>
-      <source>Enter name</source>
-      <translation type="unfinished">Enter name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="194"/>
-      <source>Automatically Connect on Start</source>
-      <translation type="unfinished">Automatically Connect on Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="201"/>
-      <source>High Latency</source>
-      <translation type="unfinished">High Latency</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="206"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="240"/>
-      <source>OK</source>
-      <translation type="unfinished">OK</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="260"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogCompressor</name>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="50"/>
-      <source>Log Compressor: Cannot start/compress log file, since input file %1 is not readable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since input file %1 is not readable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="67"/>
-      <source>Log Compressor: Cannot start/compress log file, since output file %1 is not writable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since output file %1 is not writable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="105"/>
-      <source>Log compressor: Dataset contains dimensions: </source>
-      <translation type="unfinished">Log compressor: Dataset contains dimensions: </translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="213"/>
-      <source>Log Compressor</source>
-      <translation type="unfinished">Log Compressor</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadController</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="180"/>
-      <source>Available</source>
-      <translation type="unfinished">Available</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="227"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="705"/>
-      <source>Canceled</source>
-      <translation type="unfinished">Canceled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="274"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="385"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="646"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="366"/>
-      <source>Downloaded</source>
-      <translation type="unfinished">Downloaded</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="436"/>
-      <source>Timed Out</source>
-      <translation type="unfinished">Timed Out</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="556"/>
-      <source>Waiting</source>
-      <translation type="unfinished">Waiting</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="601"/>
-      <source>UnknownDate</source>
-      <translation type="unfinished">UnknownDate</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="24"/>
-      <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation type="unfinished">Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="59"/>
-      <source>Id</source>
-      <translation type="unfinished">Id</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="72"/>
-      <source>Date</source>
-      <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="83"/>
-      <source>Date Unknown</source>
-      <translation type="unfinished">Date Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="94"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="107"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="124"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>Log Refresh</source>
-      <translation type="unfinished">Log Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation type="unfinished">You must be connected to a vehicle in order to download logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="136"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="153"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="170"/>
-      <source>Erase All</source>
-      <translation type="unfinished">Erase All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="174"/>
-      <source>Delete All Log Files</source>
-      <translation type="unfinished">Delete All Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="180"/>
-      <source>All log files will be erased permanently. Is this really what you want?</source>
-      <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="189"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLink</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="83"/>
-      <source>Log Replay Error</source>
-      <translation type="unfinished">Log Replay Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="104"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="269"/>
-      <source>Attempt to load new log while log being played</source>
-      <translation type="unfinished">Attempt to load new log while log being played</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="275"/>
-      <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="285"/>
-      <source>The log file &apos;%1&apos; is corrupt or empty.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="358"/>
-      <source>Connect not allowed during Flight Data replay.</source>
-      <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="425"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="445"/>
-      <source>Unable to seek to new position</source>
-      <translation type="unfinished">Unable to seek to new position</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkConfiguration</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.h" line="40"/>
-      <source>Log Replay Link Settings</source>
-      <translation type="unfinished">Log Replay Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkController</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="593"/>
-      <source>%2m:%3s</source>
-      <translation type="unfinished">%2m:%3s</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="595"/>
-      <source>%1h:%2m:%3s</source>
-      <translation type="unfinished">%1h:%2m:%3s</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplaySettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="26"/>
-      <source>Log File</source>
-      <translation type="unfinished">Log File</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="35"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="41"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayStatusBar</name>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Play</source>
-      <translation type="unfinished">Play</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="104"/>
-      <source>Load Telemetry Log</source>
-      <translation type="unfinished">Load Telemetry Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="110"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="195"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="196"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="197"/>
-      <source>Magnetometer</source>
-      <translation type="unfinished">Magnetometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="198"/>
-      <source>Absolute pressure</source>
-      <translation type="unfinished">Absolute pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="199"/>
-      <source>Differential pressure</source>
-      <translation type="unfinished">Differential pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="200"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="201"/>
-      <source>Optical flow</source>
-      <translation type="unfinished">Optical flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="202"/>
-      <source>Computer vision position</source>
-      <translation type="unfinished">Computer vision position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="203"/>
-      <source>Laser based position</source>
-      <translation type="unfinished">Laser based position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="204"/>
-      <source>External ground truth</source>
-      <translation type="unfinished">External ground truth</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="205"/>
-      <source>Angular rate control</source>
-      <translation type="unfinished">Angular rate control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="206"/>
-      <source>Attitude stabilization</source>
-      <translation type="unfinished">Attitude stabilization</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="207"/>
-      <source>Yaw position</source>
-      <translation type="unfinished">Yaw position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="208"/>
-      <source>Z/altitude control</source>
-      <translation type="unfinished">Z/altitude control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="209"/>
-      <source>X/Y position control</source>
-      <translation type="unfinished">X/Y position control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="210"/>
-      <source>Motor outputs / control</source>
-      <translation type="unfinished">Motor outputs / control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="211"/>
-      <source>RC receiver</source>
-      <translation type="unfinished">RC receiver</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="212"/>
-      <source>Gyro 2</source>
-      <translation type="unfinished">Gyro 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="213"/>
-      <source>Accelerometer 2</source>
-      <translation type="unfinished">Accelerometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="214"/>
-      <source>Magnetometer 2</source>
-      <translation type="unfinished">Magnetometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="215"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="216"/>
-      <source>AHRS</source>
-      <translation type="unfinished">AHRS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="217"/>
-      <source>Terrain</source>
-      <translation type="unfinished">Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="218"/>
-      <source>Motors reversed</source>
-      <translation type="unfinished">Motors reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="219"/>
-      <source>Logging</source>
-      <translation type="unfinished">Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="220"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="221"/>
-      <source>Proximity</source>
-      <translation type="unfinished">Proximity</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="222"/>
-      <source>Satellite Communication</source>
-      <translation type="unfinished">Satellite Communication</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="223"/>
-      <source>Pre-Arm Check</source>
-      <translation type="unfinished">Pre-Arm Check</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="224"/>
-      <source>Avoidance/collision prevention</source>
-      <translation type="unfinished">Avoidance/collision prevention</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink unknown SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="236"/>
-      <source>Unknown sensor</source>
-      <translation type="unfinished">Unknown sensor</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkChart</name>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
-      <source>Scale:</source>
-      <translation type="unfinished">Scale:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
-      <source>Range:</source>
-      <translation type="unfinished">Range:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorController</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
-      <source>5 Sec</source>
-      <translation type="unfinished">5 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
-      <source>10 Sec</source>
-      <translation type="unfinished">10 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
-      <source>30 Sec</source>
-      <translation type="unfinished">30 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
-      <source>60 Sec</source>
-      <translation type="unfinished">60 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="744"/>
-      <source>10,000</source>
-      <translation type="unfinished">10,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="745"/>
-      <source>1,000</source>
-      <translation type="unfinished">1,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="746"/>
-      <source>100</source>
-      <translation type="unfinished">100</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="747"/>
-      <source>10</source>
-      <translation type="unfinished">10</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="748"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="749"/>
-      <source>0.1</source>
-      <translation type="unfinished">0.1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="750"/>
-      <source>0.01</source>
-      <translation type="unfinished">0.01</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="751"/>
-      <source>0.001</source>
-      <translation type="unfinished">0.001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="752"/>
-      <source>0.0001</source>
-      <translation type="unfinished">0.0001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="846"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="859"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="874"/>
-      <source>System %1</source>
-      <translation type="unfinished">System %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="45"/>
-      <source>Inspect real time MAVLink messages.</source>
-      <translation type="unfinished">Inspect real time MAVLink messages.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="142"/>
-      <source>Message:</source>
-      <translation type="unfinished">Message:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="150"/>
-      <source>Component:</source>
-      <translation type="unfinished">Component:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="156"/>
-      <source>Count:</source>
-      <translation type="unfinished">Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="171"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="174"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="177"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="180"/>
-      <source>Plot 1</source>
-      <translation type="unfinished">Plot 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="183"/>
-      <source>Plot 2</source>
-      <translation type="unfinished">Plot 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkProtocol</name>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>MAVLink Protocol</source>
-      <translation type="unfinished">MAVLink Protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
-      <translation type="unfinished">MAVLink Logging failed. Could not write to file %1, logging disabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
-      <translation type="unfinished">Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="383"/>
-      <source>MAVLink protocol</source>
-      <translation type="unfinished">MAVLink protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
-      <translation type="unfinished">Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainRootWindow</name>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="270"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="287"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="306"/>
-      <source>%1 close</source>
-      <translation type="unfinished">%1 close</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="307"/>
-      <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
-      <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="271"/>
-      <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="156"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="385"/>
-      <source>Analyze Tools</source>
-      <translation type="unfinished">Analyze Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="160"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="370"/>
-      <source>Vehicle Setup</source>
-      <translation type="unfinished">Vehicle Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="164"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="401"/>
-      <source>Application Settings</source>
-      <translation type="unfinished">Application Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="288"/>
-      <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="351"/>
-      <source>Select Tool</source>
-      <translation type="unfinished">Select Tool</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="419"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="452"/>
-      <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="520"/>
-      <source>Back</source>
-      <translation type="unfinished">Back</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainStatusIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="35"/>
-      <source>Communication Lost</source>
-      <translation type="unfinished">Communication Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="36"/>
-      <source>Ready To Fly</source>
-      <translation type="unfinished">Ready To Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="37"/>
-      <source>Not Ready</source>
-      <translation type="unfinished">Not Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="38"/>
-      <source>Disconnected</source>
-      <translation type="unfinished">Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="39"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="40"/>
-      <source>Flying</source>
-      <translation type="unfinished">Flying</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="41"/>
-      <source>Landing</source>
-      <translation type="unfinished">Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>FW(vtol)</source>
-      <translation type="unfinished">FW(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>MR(vtol)</source>
-      <translation type="unfinished">MR(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="196"/>
-      <source>Sensor Status</source>
-      <translation type="unfinished">Sensor Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Multi-Rotor</source>
-      <translation type="unfinished">Transition to Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Fixed Wing</source>
-      <translation type="unfinished">Transition to Fixed Wing</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainToolBar</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="201"/>
-      <source>Downloading</source>
-      <translation type="unfinished">Downloading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="209"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="82"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-  </context>
-  <context>
-    <name>MapScale</name>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="46"/>
-      <source> km</source>
-      <translation type="unfinished"> km</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="48"/>
-      <source> m</source>
-      <translation type="unfinished"> m</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="59"/>
-      <source> mile</source>
-      <translation type="unfinished"> mile</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="61"/>
-      <source> miles</source>
-      <translation type="unfinished"> miles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="64"/>
-      <source> ft</source>
-      <translation type="unfinished"> ft</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="193"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="206"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="219"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkConsolePage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
-      <source>Provides a connection to the vehicle&apos;s system shell.</source>
-      <translation type="unfinished">Provides a connection to the vehicle&apos;s system shell.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="140"/>
-      <source>Copy</source>
-      <translation type="unfinished">Copy</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="146"/>
-      <source>Paste</source>
-      <translation type="unfinished">Paste</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="290"/>
-      <source>Send</source>
-      <translation type="unfinished">Send</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
-      <source>MAVLink Logging</source>
-      <translation type="unfinished">MAVLink Logging</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">Please enter an email address before uploading MAVLink log files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
-      <source>Ground Station</source>
-      <translation type="unfinished">Ground Station</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
-      <source>MAVLink System ID:</source>
-      <translation type="unfinished">MAVLink System ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
-      <source>Emit heartbeat</source>
-      <translation type="unfinished">Emit heartbeat</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
-      <source>Only accept MAVs with same protocol version</source>
-      <translation type="unfinished">Only accept MAVs with same protocol version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="159"/>
-      <source>Enable MAVLink forwarding</source>
-      <translation type="unfinished">Enable MAVLink forwarding</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="170"/>
-      <source>Host name:</source>
-      <translation type="unfinished">Host name:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="183"/>
-      <source>&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</source>
-      <translation type="unfinished">&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="199"/>
-      <source>Telemetry Stream Rates (ArduPilot Only)</source>
-      <translation type="unfinished">Telemetry Stream Rates (ArduPilot Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="219"/>
-      <source>All Streams Controlled By Vehicle Settings</source>
-      <translation type="unfinished">All Streams Controlled By Vehicle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="228"/>
-      <source>Raw Sensors</source>
-      <translation type="unfinished">Raw Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="235"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="242"/>
-      <source>RC Channel</source>
-      <translation type="unfinished">RC Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="249"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="256"/>
-      <source>Extra 1</source>
-      <translation type="unfinished">Extra 1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="263"/>
-      <source>Extra 2</source>
-      <translation type="unfinished">Extra 2</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="270"/>
-      <source>Extra 3</source>
-      <translation type="unfinished">Extra 3</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="288"/>
-      <source>MAVLink Link Status (Current Vehicle)</source>
-      <translation type="unfinished">MAVLink Link Status (Current Vehicle)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="309"/>
-      <source>Total messages sent (computed):</source>
-      <translation type="unfinished">Total messages sent (computed):</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="314"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="329"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="344"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="359"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="324"/>
-      <source>Total messages received:</source>
-      <translation type="unfinished">Total messages received:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="339"/>
-      <source>Total message loss:</source>
-      <translation type="unfinished">Total message loss:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="354"/>
-      <source>Loss rate:</source>
-      <translation type="unfinished">Loss rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="375"/>
-      <source>MAVLink 2.0 Logging (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Logging (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="398"/>
-      <source>Manual Start/Stop:</source>
-      <translation type="unfinished">Manual Start/Stop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="402"/>
-      <source>Start Logging</source>
-      <translation type="unfinished">Start Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="409"/>
-      <source>Stop Logging</source>
-      <translation type="unfinished">Stop Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="419"/>
-      <source>Enable automatic logging</source>
-      <translation type="unfinished">Enable automatic logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="438"/>
-      <source>MAVLink 2.0 Log Uploads (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Log Uploads (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="460"/>
-      <source>Email address for Log Upload:</source>
-      <translation type="unfinished">Email address for Log Upload:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="481"/>
-      <source>Default Description:</source>
-      <translation type="unfinished">Default Description:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="501"/>
-      <source>Default Upload URL</source>
-      <translation type="unfinished">Default Upload URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="522"/>
-      <source>Video URL:</source>
-      <translation type="unfinished">Video URL:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="540"/>
-      <source>Wind Speed:</source>
-      <translation type="unfinished">Wind Speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="578"/>
-      <source>Flight Rating:</source>
-      <translation type="unfinished">Flight Rating:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="616"/>
-      <source>Additional Feedback:</source>
-      <translation type="unfinished">Additional Feedback:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="635"/>
-      <source>Make this log publicly available</source>
-      <translation type="unfinished">Make this log publicly available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="646"/>
-      <source>Enable automatic log uploads</source>
-      <translation type="unfinished">Enable automatic log uploads</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="658"/>
-      <source>Delete log file after uploading</source>
-      <translation type="unfinished">Delete log file after uploading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="677"/>
-      <source>Saved Log Files</source>
-      <translation type="unfinished">Saved Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="740"/>
-      <source>Uploaded</source>
-      <translation type="unfinished">Uploaded</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="763"/>
-      <source>Check All</source>
-      <translation type="unfinished">Check All</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="773"/>
-      <source>Check None</source>
-      <translation type="unfinished">Check None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="783"/>
-      <source>Delete Selected</source>
-      <translation type="unfinished">Delete Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="791"/>
-      <source>Delete Selected Log Files</source>
-      <translation type="unfinished">Delete Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="792"/>
-      <source>Confirm deleting selected log files?</source>
-      <translation type="unfinished">Confirm deleting selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="799"/>
-      <source>Upload Selected</source>
-      <translation type="unfinished">Upload Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="814"/>
-      <source>Upload Selected Log Files</source>
-      <translation type="unfinished">Upload Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="815"/>
-      <source>Confirm uploading selected log files?</source>
-      <translation type="unfinished">Confirm uploading selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="822"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="831"/>
-      <source>Cancel Upload</source>
-      <translation type="unfinished">Cancel Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="832"/>
-      <source>Confirm canceling the upload process?</source>
-      <translation type="unfinished">Confirm canceling the upload process?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MessageIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MessageIndicator.qml" line="112"/>
-      <source>No Messages</source>
-      <translation type="unfinished">No Messages</translation>
-    </message>
-  </context>
-  <context>
-    <name>MicrohardSettings</name>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="63"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="80"/>
-      <source>Enable Microhard</source>
-      <translation type="unfinished">Enable Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="98"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="120"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="126"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="128"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="144"/>
-      <source>Login Error</source>
-      <translation type="unfinished">Login Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="130"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="137"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="152"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="158"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="176"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="198"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="209"/>
-      <source>Remote IP Address:</source>
-      <translation type="unfinished">Remote IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="219"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
-      <source>Configuration User Name:</source>
-      <translation type="unfinished">Configuration User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
-      <source>Configuration Password:</source>
-      <translation type="unfinished">Configuration Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
-      <source>Encryption key:</source>
-      <translation type="unfinished">Encryption key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="282"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandDialog</name>
-    <message>
-      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="32"/>
-      <source>Category:</source>
-      <translation type="unfinished">Category:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandTree</name>
-    <message>
-      <location filename="../src/MissionManager/MissionCommandTree.cc" line="23"/>
-      <source>All commands</source>
-      <translation type="unfinished">All commands</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionController</name>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="788"/>
-      <source>Mission item %1 is not an object</source>
-      <translation type="unfinished">Mission item %1 is not an object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="874"/>
-      <source>Unsupported complex item type: %1</source>
-      <translation type="unfinished">Unsupported complex item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="877"/>
-      <source>Unknown item type: %1</source>
-      <translation type="unfinished">Unknown item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="900"/>
-      <source>Could not find doJumpId: %1</source>
-      <translation type="unfinished">Could not find doJumpId: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="973"/>
-      <source>The mission file is corrupted.</source>
-      <translation type="unfinished">The mission file is corrupted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="978"/>
-      <source>The mission file is not compatible with this version of %1.</source>
-      <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="1026"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1041"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1065"/>
-      <source>Mission: %1</source>
-      <translation type="unfinished">Mission: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="285"/>
-      <source>Type found: %1 must be: %2</source>
-      <translation type="unfinished">Type found: %1 must be: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="291"/>
-      <source>%1 key must contains 7 values</source>
-      <translation type="unfinished">%1 key must contains 7 values</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="297"/>
-      <source>Param %1 incorrect type %2, must be double or null</source>
-      <translation type="unfinished">Param %1 incorrect type %2, must be double or null</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="101"/>
-      <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="206"/>
-      <source>Move to vehicle position</source>
-      <translation type="unfinished">Move to vehicle position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="215"/>
-      <source>Move to previous item position</source>
-      <translation type="unfinished">Move to previous item position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="221"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="223"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="231"/>
-      <source>Show all values</source>
-      <translation type="unfinished">Show all values</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>Mission Edit</source>
-      <translation type="unfinished">Mission Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
-      <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="251"/>
-      <source>Item #%1</source>
-      <translation type="unfinished">Item #%1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="155"/>
-      <source>Select Mission Command</source>
-      <translation type="unfinished">Select Mission Command</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemStatus</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemStatus.qml" line="46"/>
-      <source>Terrain Altitude</source>
-      <translation type="unfinished">Terrain Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionManager</name>
-    <message>
-      <location filename="../src/MissionManager/MissionManager.cc" line="92"/>
-      <source>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</source>
-      <translation type="unfinished">Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="42"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="43"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="119"/>
-      <source>Flight speed</source>
-      <translation type="unfinished">Flight speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="146"/>
-      <source>Above camera commands will take affect immediately upon mission start.</source>
-      <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="239"/>
-      <source>Launch Position</source>
-      <translation type="unfinished">Launch Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="275"/>
-      <source>Set To Map Center</source>
-      <translation type="unfinished">Set To Map Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="157"/>
-      <source>Vehicle Info</source>
-      <translation type="unfinished">Vehicle Info</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="68"/>
-      <source>All Altitudes</source>
-      <translation type="unfinished">All Altitudes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="103"/>
-      <source>Initial Waypoint Alt</source>
-      <translation type="unfinished">Initial Waypoint Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="208"/>
-      <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="213"/>
-      <source>Cruise speed</source>
-      <translation type="unfinished">Cruise speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="224"/>
-      <source>Hover speed</source>
-      <translation type="unfinished">Hover speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="258"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="270"/>
-      <source>Actual position set by vehicle at flight time.</source>
-      <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockConfiguration</name>
-    <message>
-      <location filename="../src/comm/MockLink.h" line="78"/>
-      <source>Mock Link Settings</source>
-      <translation type="unfinished">Mock Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLink</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="46"/>
-      <source>PX4 Vehicle</source>
-      <translation type="unfinished">PX4 Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="51"/>
-      <source>APM ArduCopter Vehicle</source>
-      <translation type="unfinished">APM ArduCopter Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="57"/>
-      <source>APM ArduPlane Vehicle</source>
-      <translation type="unfinished">APM ArduPlane Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="63"/>
-      <source>APM ArduSub Vehicle</source>
-      <translation type="unfinished">APM ArduSub Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="69"/>
-      <source>APM ArduRover Vehicle</source>
-      <translation type="unfinished">APM ArduRover Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="75"/>
-      <source>Generic Vehicle</source>
-      <translation type="unfinished">Generic Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="43"/>
-      <source>Send status text + voice</source>
-      <translation type="unfinished">Send status text + voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="80"/>
-      <source>Stop One MockLink</source>
-      <translation type="unfinished">Stop One MockLink</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkOptionsDlg</name>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="23"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="33"/>
-      <source>Stop Heartbeats</source>
-      <translation type="unfinished">Stop Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="42"/>
-      <source>Start Heartbeats</source>
-      <translation type="unfinished">Start Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="51"/>
-      <source>Connection Removed</source>
-      <translation type="unfinished">Connection Removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="73"/>
-      <source>Send Status Text and Voice</source>
-      <translation type="unfinished">Send Status Text and Voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="80"/>
-      <source>Increment Vehicle Id</source>
-      <translation type="unfinished">Increment Vehicle Id</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="84"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>Generic MAVLink</source>
-      <translation type="unfinished">Generic MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="94"/>
-      <source>Vehicle Type</source>
-      <translation type="unfinished">Vehicle Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduCopter</source>
-      <translation type="unfinished">ArduCopter</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduPlane</source>
-      <translation type="unfinished">ArduPlane</translation>
-    </message>
-  </context>
-  <context>
-    <name>ModeSwitchDisplay</name>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="95"/>
-      <source>Monitor:</source>
-      <translation type="unfinished">Monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="135"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
-      <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiRotorChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
-      <source>Multirotor Initial Checks</source>
-      <translation type="unfinished">Multirotor Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
-      <source>Props mounted and secured?</source>
-      <translation type="unfinished">Props mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleList</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="54"/>
-      <source>The following commands will be applied to all vehicles</source>
-      <translation type="unfinished">The following commands will be applied to all vehicles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleManager</name>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="121"/>
-      <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="139"/>
-      <source>Connected to Vehicle %1</source>
-      <translation type="unfinished">Connected to Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleSelector</name>
-    <message>
-      <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="49"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineMap</name>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="241"/>
-      <source>Error Message</source>
-      <translation type="unfinished">Error Message</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="271"/>
-      <source>Max Cache Disk Size (MB):</source>
-      <translation type="unfinished">Max Cache Disk Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="287"/>
-      <source>Max Cache Memory Size (MB):</source>
-      <translation type="unfinished">Max Cache Memory Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="303"/>
-      <source>Memory cache changes require a restart to take effect.</source>
-      <translation type="unfinished">Memory cache changes require a restart to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="307"/>
-      <source>Mapbox Access Token</source>
-      <translation type="unfinished">Mapbox Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="318"/>
-      <source>To enable Mapbox maps, enter your access token.</source>
-      <translation type="unfinished">To enable Mapbox maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="324"/>
-      <source>Mapbox User Name</source>
-      <translation type="unfinished">Mapbox User Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="335"/>
-      <source>To enable custom Mapbox styles, enter your account name.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your account name.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="341"/>
-      <source>Mapbox Style ID</source>
-      <translation type="unfinished">Mapbox Style ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="352"/>
-      <source>To enable custom Mapbox styles, enter your style ID.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your style ID.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="358"/>
-      <source>Esri Access Token</source>
-      <translation type="unfinished">Esri Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="369"/>
-      <source>To enable Esri maps, enter your access token.</source>
-      <translation type="unfinished">To enable Esri maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="375"/>
-      <source>VWorld Access Token</source>
-      <translation type="unfinished">VWorld Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="386"/>
-      <source>To enable VWorld maps, enter your access token.</source>
-      <translation type="unfinished">To enable VWorld maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="392"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="403"/>
-      <source>URL with {x} {y} {z} or {zoom} substitutions</source>
-      <translation type="unfinished">URL with {x} {y} {z} or {zoom} substitutions</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="418"/>
-      <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</source>
-      <translation type="unfinished">This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="420"/>
-      <source>Delete %1 and all its tiles.
-
-Is this really what you want?</source>
-      <translation type="unfinished">Delete %1 and all its tiles.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="525"/>
-      <source>System Wide Tile Cache</source>
-      <translation type="unfinished">System Wide Tile Cache</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="538"/>
-      <source>Zoom Levels:</source>
-      <translation type="unfinished">Zoom Levels:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="545"/>
-      <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="552"/>
-      <source>Unique:</source>
-      <translation type="unfinished">Unique:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="560"/>
-      <source>Downloaded:</source>
-      <translation type="unfinished">Downloaded:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="567"/>
-      <source>Error Count:</source>
-      <translation type="unfinished">Error Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="575"/>
-      <source>Size:</source>
-      <translation type="unfinished">Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="582"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="957"/>
-      <source>Tile Count:</source>
-      <translation type="unfinished">Tile Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="589"/>
-      <source>Resume Download</source>
-      <translation type="unfinished">Resume Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="598"/>
-      <source>Cancel Download</source>
-      <translation type="unfinished">Cancel Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="607"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="609"/>
-      <source>Confirm Delete</source>
-      <translation type="unfinished">Confirm Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="612"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1209"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1289"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1002"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1159"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1313"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="686"/>
-      <source>Min Zoom: %1</source>
-      <translation type="unfinished">Min Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="726"/>
-      <source>Max Zoom: %1</source>
-      <translation type="unfinished">Max Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="772"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1034"/>
-      <source>Add New Set</source>
-      <translation type="unfinished">Add New Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="800"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="813"/>
-      <source>Map type:</source>
-      <translation type="unfinished">Map type:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="836"/>
-      <source>Fetch elevation data</source>
-      <translation type="unfinished">Fetch elevation data</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="862"/>
-      <source>Min/Max Zoom Levels</source>
-      <translation type="unfinished">Min/Max Zoom Levels</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="966"/>
-      <source>Est Size:</source>
-      <translation type="unfinished">Est Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="978"/>
-      <source>Too many tiles</source>
-      <translation type="unfinished">Too many tiles</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="989"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1072"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1303"/>
-      <source>Import</source>
-      <translation type="unfinished">Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1081"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1149"/>
-      <source>Export</source>
-      <translation type="unfinished">Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1087"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1089"/>
-      <source>Offline Maps Options</source>
-      <translation type="unfinished">Offline Maps Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1110"/>
-      <source>Select Tile Sets to Export</source>
-      <translation type="unfinished">Select Tile Sets to Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1139"/>
-      <source>Select All</source>
-      <translation type="unfinished">Select All</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1144"/>
-      <source>Select None</source>
-      <translation type="unfinished">Select None</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1153"/>
-      <source>Export Tile Set</source>
-      <translation type="unfinished">Export Tile Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Progress</source>
-      <translation type="unfinished">Tile Set Export Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Completed</source>
-      <translation type="unfinished">Tile Set Export Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1244"/>
-      <source>Map Tile Set Import</source>
-      <translation type="unfinished">Map Tile Set Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1246"/>
-      <source>Map Tile Set Import Progress</source>
-      <translation type="unfinished">Map Tile Set Import Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1248"/>
-      <source>Map Tile Set Import Completed</source>
-      <translation type="unfinished">Map Tile Set Import Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1276"/>
-      <source>Append to existing set</source>
-      <translation type="unfinished">Append to existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1282"/>
-      <source>Replace existing set</source>
-      <translation type="unfinished">Replace existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1307"/>
-      <source>Import Tile Set</source>
-      <translation type="unfinished">Import Tile Set</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineVehicleFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
-      <source>Vehicle Information</source>
-      <translation type="unfinished">Vehicle Information</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
-      <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>PIDTuning</name>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune enabled</source>
-      <translation type="unfinished">Autotune enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune disabled</source>
-      <translation type="unfinished">Autotune disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="227"/>
-      <source>Select Tuning:</source>
-      <translation type="unfinished">Select Tuning:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="253"/>
-      <source>Clipboard Values:</source>
-      <translation type="unfinished">Clipboard Values:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="279"/>
-      <source>Save To Clipboard</source>
-      <translation type="unfinished">Save To Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="284"/>
-      <source>Restore From Clipboard</source>
-      <translation type="unfinished">Restore From Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="343"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="371"/>
-      <source>Automatic Flight Mode Switching</source>
-      <translation type="unfinished">Automatic Flight Mode Switching</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="381"/>
-      <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
-      <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
-      <source>Switches to &apos;%1&apos; when you click Stop.</source>
-      <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <source>FLIGHT MODES</source>
-      <translation type="unfinished">FLIGHT MODES</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <source>You can assign multiple flight modes to a single channel. </source>
-      <translation type="unfinished">You can assign multiple flight modes to a single channel. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <source>Turn your radio control on to test switch settings. </source>
-      <translation type="unfinished">Turn your radio control on to test switch settings. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <source>The following channels: </source>
-      <translation type="unfinished">The following channels: </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <source> are not available for Flight Modes since they are already in use for other functions.</source>
-      <translation type="unfinished"> are not available for Flight Modes since they are already in use for other functions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <source>Manual/Main</source>
-      <translation type="unfinished">Manual/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <source>Stabilized/Main</source>
-      <translation type="unfinished">Stabilized/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <source>The pilot has full control of the aircraft, no assistance is provided. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, no assistance is provided. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <source>The Main mode switch must always be assigned to a channel in order to fly</source>
-      <translation type="unfinished">The Main mode switch must always be assigned to a channel in order to fly</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <source>The pilot has full control of the aircraft, only attitude is stabilized. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, only attitude is stabilized. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <source>Assist</source>
-      <translation type="unfinished">Assist</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <source>If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <source>In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</source>
-      <translation type="unfinished">In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <source>If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <source>In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</source>
-      <translation type="unfinished">In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <source>Roll/pitch angles and rudder deflection are controlled. </source>
-      <translation type="unfinished">Roll/pitch angles and rudder deflection are controlled. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <source>The angular rates are controlled, but not the attitude. </source>
-      <translation type="unfinished">The angular rates are controlled, but not the attitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <source>Roll stick controls banking, pitch stick altitude </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick altitude </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <source>Throttle stick controls speed. </source>
-      <translation type="unfinished">Throttle stick controls speed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <source>With no stick inputs the plane holds heading, but drifts off in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane holds heading, but drifts off in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <source>Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </source>
-      <translation type="unfinished">Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <source>Position Control</source>
-      <translation type="unfinished">Position Control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <source>Roll stick controls banking, pitch stick controls altitude. </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick controls altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <source>Throttle stick controls speed.</source>
-      <translation type="unfinished">Throttle stick controls speed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <source>With no stick inputs the plane flies a straight line, even in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane flies a straight line, even in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <source>Roll and Pitch sticks control sideways and forward speed </source>
-      <translation type="unfinished">Roll and Pitch sticks control sideways and forward speed </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <source>Throttle stick controls climb / sink rade. </source>
-      <translation type="unfinished">Throttle stick controls climb / sink rade. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <source>The aircraft obeys the programmed mission sent by QGroundControl. </source>
-      <translation type="unfinished">The aircraft obeys the programmed mission sent by QGroundControl. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <source>The aircraft flies in a circle around the current position at the current altitude. </source>
-      <translation type="unfinished">The aircraft flies in a circle around the current position at the current altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <source>The multirotor hovers at the current position and altitude. </source>
-      <translation type="unfinished">The multirotor hovers at the current position and altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <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 launch position, loiters and then lands. </source>
-      <translation type="unfinished">The vehicle returns to the launch position, loiters and then lands. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <source>All flight control aspects are controlled by an offboard system.</source>
-      <translation type="unfinished">All flight control aspects are controlled by an offboard system.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <source>Flight Mode Config is disabled since you have a Joystick enabled.</source>
-      <translation type="unfinished">Flight Mode Config is disabled since you have a Joystick enabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <source>Use Single Channel Mode Selection</source>
-      <translation type="unfinished">Use Single Channel Mode Selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <source>Generate Thresholds</source>
-      <translation type="unfinished">Generate Thresholds</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModesController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="151"/>
-      <source>%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="167"/>
-      <source>%1 is set to same channel as %2.
-</source>
-      <translation type="unfinished">%1 is set to same channel as %2.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="177"/>
-      <source>%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="144"/>
-      <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="37"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="38"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
-      <source>Rattitude</source>
-      <translation type="unfinished">Rattitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
-      <source>Return to Groundstation</source>
-      <translation type="unfinished">Return to Groundstation</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="187"/>
-      <source>Unknown %1:%2</source>
-      <translation type="unfinished">Unknown %1:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="396"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="416"/>
-      <source>Unable to go to location, vehicle position not known.</source>
-      <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="489"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="498"/>
-      <source>Unable to change altitude, home position unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="502"/>
-      <source>Unable to change altitude, home position altitude unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="533"/>
-      <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="537"/>
-      <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="609"/>
-      <source>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</source>
-      <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwareUpgradeThreadWorker</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="153"/>
-      <source>Programming new version...</source>
-      <translation type="unfinished">Programming new version...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="163"/>
-      <source>Verifying program...</source>
-      <translation type="unfinished">Verifying program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="167"/>
-      <source>Verify complete</source>
-      <translation type="unfinished">Verify complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="174"/>
-      <source>Rebooting board</source>
-      <translation type="unfinished">Rebooting board</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="198"/>
-      <source>Erasing previous program...</source>
-      <translation type="unfinished">Erasing previous program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="202"/>
-      <source>Erase complete</source>
-      <translation type="unfinished">Erase complete</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehavior</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
-      <source>Flight Behavior</source>
-      <translation type="unfinished">Flight Behavior</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
-      <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehaviorCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <source>Responsiveness</source>
-      <translation type="unfinished">Responsiveness</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <source>Horizontal velocity (m/s)</source>
-      <translation type="unfinished">Horizontal velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <source>Vertial velocity (m/s)</source>
-      <translation type="unfinished">Vertial velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <source>Mission Turning Radius</source>
-      <translation type="unfinished">Mission Turning Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlowSensor</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FlowSensor.qml" line="23"/>
-      <source>PX4Flow Camera</source>
-      <translation type="unfinished">PX4Flow Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4ParameterMetaData</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="342"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="16"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="27"/>
-      <source>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</source>
-      <translation type="unfinished">Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <source>Flaps</source>
-      <translation type="unfinished">Flaps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <source>Aux1</source>
-      <translation type="unfinished">Aux1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <source>Aux2</source>
-      <translation type="unfinished">Aux2</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4SimpleFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <source>Mode Channel</source>
-      <translation type="unfinished">Mode Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <source>Flight Mode %1</source>
-      <translation type="unfinished">Flight Mode %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <source>Switch Settings</source>
-      <translation type="unfinished">Switch Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
-      <source>PID Tuning</source>
-      <translation type="unfinished">PID Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
-      <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <source>Rate Controller</source>
-      <translation type="unfinished">Rate Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <source>Attitude Controller</source>
-      <translation type="unfinished">Attitude Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <source>Velocity Controller</source>
-      <translation type="unfinished">Velocity Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <source>Position Controller</source>
-      <translation type="unfinished">Position Controller</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAttitude</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <source>Proportional Gain (MC_YAW_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterPosition</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <source>Proportional gain (MPC_Z_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterRate</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterVelocity</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <source>Increase to reduce steady-state error</source>
-      <translation type="unfinished">Increase to reduce steady-state error</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <source>TECS</source>
-      <translation type="unfinished">TECS</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneTECS</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <source>Altitude &amp; Airspeed</source>
-      <translation type="unfinished">Altitude &amp; Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <source>TODO</source>
-      <translation type="unfinished">TODO</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentVTOL</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <source>Multirotor</source>
-      <translation type="unfinished">Multirotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingManager</name>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
-      <source>Pairing Successfull</source>
-      <translation type="unfinished">Pairing Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
-      <source>Connection Successfull</source>
-      <translation type="unfinished">Connection Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
-      <source>Connection Rejected</source>
-      <translation type="unfinished">Connection Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
-      <source>Pairing Rejected</source>
-      <translation type="unfinished">Pairing Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
-      <source>No Response From Vehicle</source>
-      <translation type="unfinished">No Response From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
-      <source>Connecting to %1</source>
-      <translation type="unfinished">Connecting to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
-      <source>Invalid Pairing File</source>
-      <translation type="unfinished">Invalid Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="257"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="265"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="278"/>
-      <source>Error Parsing Pairing File</source>
-      <translation type="unfinished">Error Parsing Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
-      <source>NFC</source>
-      <translation type="unfinished">NFC</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="495"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="517"/>
-      <source>Pairing...</source>
-      <translation type="unfinished">Pairing...</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingNFC</name>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="30"/>
-      <source>Waiting for NFC connection</source>
-      <translation type="unfinished">Waiting for NFC connection</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
-      <source>Device detected</source>
-      <translation type="unfinished">Device detected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
-      <source>Device removed</source>
-      <translation type="unfinished">Device removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterDiffDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="42"/>
-      <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="43"/>
-      <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="71"/>
-      <source>Comp ID</source>
-      <translation type="unfinished">Comp ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="78"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="84"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="93"/>
-      <source>N/A</source>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditor</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="63"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="85"/>
-      <source>Show modified only</source>
-      <translation type="unfinished">Show modified only</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
-      <source>Tools</source>
-      <translation type="unfinished">Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="105"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="109"/>
-      <source>Reset all to firmware&apos;s defaults</source>
-      <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="110"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="115"/>
-      <source>Reset All</source>
-      <translation type="unfinished">Reset All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="113"/>
-      <source>Reset to vehicle&apos;s configuration defaults</source>
-      <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="119"/>
-      <source>Load from file...</source>
-      <translation type="unfinished">Load from file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="121"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="127"/>
-      <source>Save to file...</source>
-      <translation type="unfinished">Save to file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="129"/>
-      <source>Save Parameters</source>
-      <translation type="unfinished">Save Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="136"/>
-      <source>Clear all RC to Param</source>
-      <translation type="unfinished">Clear all RC to Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="318"/>
-      <source>Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="142"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="143"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="275"/>
-      <source>Parameter Editor</source>
-      <translation type="unfinished">Parameter Editor</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>Parameter Files (*.%1)</source>
-      <translation type="unfinished">Parameter Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="333"/>
-      <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="350"/>
-      <source>Select Ok to reboot vehicle.</source>
-      <translation type="unfinished">Select Ok to reboot vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorController</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="217"/>
-      <source>Unable to create file: %1</source>
-      <translation type="unfinished">Unable to create file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="258"/>
-      <source>Unable to open file: %1</source>
-      <translation type="unfinished">Unable to open file: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="135"/>
-      <source>Reset to default</source>
-      <translation type="unfinished">Reset to default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="209"/>
-      <source>Min: </source>
-      <translation type="unfinished">Min: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="214"/>
-      <source>Max: </source>
-      <translation type="unfinished">Max: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="219"/>
-      <source>Default: </source>
-      <translation type="unfinished">Default: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="225"/>
-      <source>Parameter name: </source>
-      <translation type="unfinished">Parameter name: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
-      <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
-      <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="243"/>
-      <source>Make sure you know what you are doing and double-check your values before Save!</source>
-      <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
-      <source>Force save (dangerous!)</source>
-      <translation type="unfinished">Force save (dangerous!)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="267"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="282"/>
-      <source>Manual Entry</source>
-      <translation type="unfinished">Manual Entry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
-      <source>Set RC to Param</source>
-      <translation type="unfinished">Set RC to Param</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterManager</name>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="678"/>
-      <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="700"/>
-      <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="926"/>
-      <source>Parameter cache CRC match failed</source>
-      <translation type="unfinished">Parameter cache CRC match failed</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="977"/>
-      <source>Parameters not loaded since they are not currently on the vehicle: %1
-</source>
-      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
-</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="981"/>
-      <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1149"/>
-      <source>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</source>
-      <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1175"/>
-      <source>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</source>
-      <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PhotoVideoControl</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
-      <source>Video Grab</source>
-      <translation type="unfinished">Video Grab</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="243"/>
-      <source>Camera Trigger</source>
-      <translation type="unfinished">Camera Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="299"/>
-      <source>Free Space: </source>
-      <translation type="unfinished">Free Space: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="305"/>
-      <source>Battery: </source>
-      <translation type="unfinished">Battery: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="316"/>
-      <source>Settings</source>
-      <translation type="unfinished">Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="331"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
-      <source>Video Stream</source>
-      <translation type="unfinished">Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
-      <source>Thermal View Mode</source>
-      <translation type="unfinished">Thermal View Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
-      <source>Blend Opacity</source>
-      <translation type="unfinished">Blend Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="364"/>
-      <source>Photo Mode</source>
-      <translation type="unfinished">Photo Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
-      <source>Photo Interval (seconds)</source>
-      <translation type="unfinished">Photo Interval (seconds)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
-      <source>Video Screen Fit</source>
-      <translation type="unfinished">Video Screen Fit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
-      <source>Reset Camera Defaults</source>
-      <translation type="unfinished">Reset Camera Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Blend</source>
-      <translation type="unfinished">Blend</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Full</source>
-      <translation type="unfinished">Full</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Picture In Picture</source>
-      <translation type="unfinished">Picture In Picture</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Time Lapse</source>
-      <translation type="unfinished">Time Lapse</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="533"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
-      <source>Reset Camera to Factory Settings</source>
-      <translation type="unfinished">Reset Camera to Factory Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
-      <source>Confirm resetting all settings?</source>
-      <translation type="unfinished">Confirm resetting all settings?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="551"/>
-      <source>Format</source>
-      <translation type="unfinished">Format</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="556"/>
-      <source>Format Camera Storage</source>
-      <translation type="unfinished">Format Camera Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="557"/>
-      <source>Confirm erasing all files?</source>
-      <translation type="unfinished">Confirm erasing all files?</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanManager</name>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="178"/>
-      <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
-      <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="183"/>
-      <source>Mission request list failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="187"/>
-      <source>Retrying %1 REQUEST_LIST retry Count</source>
-      <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="194"/>
-      <source>Mission read failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="198"/>
-      <source>Retrying %1 MISSION_REQUEST retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="206"/>
-      <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
-      <source>Mission write mission count failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="220"/>
-      <source>Vehicle did not request all items from ground station: %1</source>
-      <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="228"/>
-      <source>Mission remove all, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="232"/>
-      <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="239"/>
-      <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="350"/>
-      <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="500"/>
-      <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="615"/>
-      <source>Vehicle remove all failed. Error: %1</source>
-      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="690"/>
-      <source>Item #%1 Command: %2</source>
-      <translation type="unfinished">Item #%1 Command: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="694"/>
-      <source>Frame: %1</source>
-      <translation type="unfinished">Frame: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="700"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="703"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="706"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="709"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="712"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="715"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="718"/>
-      <source>Value: %1</source>
-      <translation type="unfinished">Value: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="737"/>
-      <source>Mission accepted.</source>
-      <translation type="unfinished">Mission accepted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="740"/>
-      <source>Unspecified error.</source>
-      <translation type="unfinished">Unspecified error.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="743"/>
-      <source>Coordinate frame is not supported.</source>
-      <translation type="unfinished">Coordinate frame is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="746"/>
-      <source>Command is not supported.</source>
-      <translation type="unfinished">Command is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="749"/>
-      <source>Mission item exceeds storage space.</source>
-      <translation type="unfinished">Mission item exceeds storage space.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="752"/>
-      <source>One of the parameters has an invalid value.</source>
-      <translation type="unfinished">One of the parameters has an invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="755"/>
-      <source>Param 1 invalid value.</source>
-      <translation type="unfinished">Param 1 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="758"/>
-      <source>Param 2 invalid value.</source>
-      <translation type="unfinished">Param 2 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="761"/>
-      <source>Param 3 invalid value.</source>
-      <translation type="unfinished">Param 3 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="764"/>
-      <source>Param 4 invalid value.</source>
-      <translation type="unfinished">Param 4 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="767"/>
-      <source>Param 5 invalid value.</source>
-      <translation type="unfinished">Param 5 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="770"/>
-      <source>Param 6 invalid value.</source>
-      <translation type="unfinished">Param 6 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="773"/>
-      <source>Param 7 invalid value.</source>
-      <translation type="unfinished">Param 7 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="776"/>
-      <source>Received mission item out of sequence.</source>
-      <translation type="unfinished">Received mission item out of sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="779"/>
-      <source>Not accepting any mission commands.</source>
-      <translation type="unfinished">Not accepting any mission commands.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-      <source>Unknown error: %1.</source>
-      <translation type="unfinished">Unknown error: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="626"/>
-      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanMasterController</name>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="223"/>
-      <source>Download not supported on high latency links.</source>
-      <translation type="unfinished">Download not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="337"/>
-      <source>Upload not supported on high latency links.</source>
-      <translation type="unfinished">Upload not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="357"/>
-      <source>Error loading Plan file (%1). %2</source>
-      <translation type="unfinished">Error loading Plan file (%1). %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="481"/>
-      <source>Plan save error %1 : %2</source>
-      <translation type="unfinished">Plan save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="513"/>
-      <source>KML save error %1 : %2</source>
-      <translation type="unfinished">KML save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="584"/>
-      <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
-      <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="585"/>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>Plan Files (*.%1)</source>
-      <translation type="unfinished">Plan Files (*.%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanToolBarIndicators</name>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="138"/>
-      <source>Selected Waypoint</source>
-      <translation type="unfinished">Selected Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="143"/>
-      <source>Alt diff:</source>
-      <translation type="unfinished">Alt diff:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="152"/>
-      <source>Azimuth:</source>
-      <translation type="unfinished">Azimuth:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="161"/>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="197"/>
-      <source>Distance:</source>
-      <translation type="unfinished">Distance:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="168"/>
-      <source>Gradient:</source>
-      <translation type="unfinished">Gradient:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="177"/>
-      <source>Heading:</source>
-      <translation type="unfinished">Heading:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="192"/>
-      <source>Total Mission</source>
-      <translation type="unfinished">Total Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="206"/>
-      <source>Max telem dist:</source>
-      <translation type="unfinished">Max telem dist:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="213"/>
-      <source>Time:</source>
-      <translation type="unfinished">Time:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="229"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="234"/>
-      <source>Batteries required:</source>
-      <translation type="unfinished">Batteries required:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload Required</source>
-      <translation type="unfinished">Upload Required</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="308"/>
-      <source>Syncing Mission</source>
-      <translation type="unfinished">Syncing Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="316"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanView</name>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="62"/>
-      <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation type="unfinished">Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="129"/>
-      <source>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</source>
-      <translation type="unfinished">You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="209"/>
-      <source>You need at least one item to create a KML.</source>
-      <translation type="unfinished">You need at least one item to create a KML.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Plan is waiting on terrain data from server for correct altitude values.</source>
-      <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="263"/>
-      <source>Plan Upload</source>
-      <translation type="unfinished">Plan Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="269"/>
-      <source>Select Plan File</source>
-      <translation type="unfinished">Select Plan File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="280"/>
-      <source>Save Plan</source>
-      <translation type="unfinished">Save Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="295"/>
-      <source>Save KML</source>
-      <translation type="unfinished">Save KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="401"/>
-      <source>Move the selected mission item to the be after following mission item:</source>
-      <translation type="unfinished">Move the selected mission item to the be after following mission item:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="642"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="685"/>
-      <source>Pattern</source>
-      <translation type="unfinished">Pattern</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="708"/>
-      <source>Center</source>
-      <translation type="unfinished">Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="619"/>
-      <location filename="../src/PlanView/PlanView.qml" line="785"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="121"/>
-      <source>Apply new altitude</source>
-      <translation type="unfinished">Apply new altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Disconnected</source>
-      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Changed</source>
-      <translation type="unfinished">Plan View - Vehicle Changed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="148"/>
-      <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="149"/>
-      <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="156"/>
-      <source>Discard Unsaved Changes</source>
-      <translation type="unfinished">Discard Unsaved Changes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="157"/>
-      <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="158"/>
-      <source>Load New Plan From Vehicle</source>
-      <translation type="unfinished">Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="169"/>
-      <source>Keep Current Plan</source>
-      <translation type="unfinished">Keep Current Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="170"/>
-      <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="187"/>
-      <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Send To Vehicle</source>
-      <translation type="unfinished">Send To Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="637"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="651"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>Cancel ROI</source>
-      <translation type="unfinished">Cancel ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="817"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="820"/>
-      <source>Fence</source>
-      <translation type="unfinished">Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="824"/>
-      <source>Rally</source>
-      <translation type="unfinished">Rally</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="942"/>
-      <source>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="954"/>
-      <source>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1228"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="978"/>
-      <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1004"/>
-      <source>Create complex pattern:</source>
-      <translation type="unfinished">Create complex pattern:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Mission overwrite</source>
-      <translation type="unfinished">Mission overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>GeoFence overwrite</source>
-      <translation type="unfinished">GeoFence overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Rally Points overwrite</source>
-      <translation type="unfinished">Rally Points overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1037"/>
-      <source>You have unsaved changes.</source>
-      <translation type="unfinished">You have unsaved changes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1136"/>
-      <source>Open...</source>
-      <translation type="unfinished">Open...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1150"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Unable to %1</source>
-      <translation type="unfinished">Unable to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <source>Plan has incomplete items. Complete all items and %1 again.</source>
-      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="967"/>
-      <source>Are you sure you want to remove current plan and create a new plan? </source>
-      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1036"/>
-      <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1044"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1096"/>
-      <source>Create Plan</source>
-      <translation type="unfinished">Create Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1115"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1164"/>
-      <source>Save As...</source>
-      <translation type="unfinished">Save As...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1176"/>
-      <source>Save Mission Waypoints As KML...</source>
-      <translation type="unfinished">Save Mission Waypoints As KML...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1181"/>
-      <source>KML</source>
-      <translation type="unfinished">KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1202"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1193"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1213"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-  </context>
-  <context>
-    <name>PolygonEditor</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>Click to add point %1</source>
-      <translation type="unfinished">Click to add point %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>- Right Click to end polygon</source>
-      <translation type="unfinished">- Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="185"/>
-      <source>Click to add point</source>
-      <translation type="unfinished">Click to add point</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="192"/>
-      <source>Click to add point - Right Click to end polygon</source>
-      <translation type="unfinished">Click to add point - Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="198"/>
-      <source>Adjust polygon by dragging corners</source>
-      <translation type="unfinished">Adjust polygon by dragging corners</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <source>Performing calibration. This will take a few seconds..</source>
-      <translation type="unfinished">Performing calibration. This will take a few seconds..</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>ESC Calibration failed</source>
-      <translation type="unfinished">ESC Calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <source>ESC Calibration failed. </source>
-      <translation type="unfinished">ESC Calibration failed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <source>Calibration complete. You can disconnect your battery now if you like.</source>
-      <translation type="unfinished">Calibration complete. You can disconnect your battery now if you like.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source> Connect the battery now and calibration will begin.</source>
-      <translation type="unfinished"> Connect the battery now and calibration will begin.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</source>
-      <translation type="unfinished">You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <source>Battery </source>
-      <translation type="unfinished">Battery </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <source>Voltage divider:</source>
-      <translation type="unfinished">Voltage divider:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <source>Number of Cells (in Series)</source>
-      <translation type="unfinished">Number of Cells (in Series)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <source>Full Voltage (per cell)</source>
-      <translation type="unfinished">Full Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <source>Battery Max:</source>
-      <translation type="unfinished">Battery Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <source>Empty Voltage (per cell)</source>
-      <translation type="unfinished">Empty Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <source>Battery Min:</source>
-      <translation type="unfinished">Battery Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <source>Voltage divider</source>
-      <translation type="unfinished">Voltage divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <source>Calculate Voltage Divider</source>
-      <translation type="unfinished">Calculate Voltage Divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <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. </source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <source>Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <source>Amps per volt</source>
-      <translation type="unfinished">Amps per volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <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. </source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <source>ESC PWM Minimum and Maximum Calibration</source>
-      <translation type="unfinished">ESC PWM Minimum and Maximum Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <source>You must use USB connection for this operation.</source>
-      <translation type="unfinished">You must use USB connection for this operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <source>Show UAVCAN Settings</source>
-      <translation type="unfinished">Show UAVCAN Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <source>UAVCAN Bus Configuration</source>
-      <translation type="unfinished">UAVCAN Bus Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <source>Change required restart</source>
-      <translation type="unfinished">Change required restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <source>UAVCAN Motor Index and Direction Assignment</source>
-      <translation type="unfinished">UAVCAN Motor Index and Direction Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <source>ESC parameters will only be accessible in the editor after assignment.</source>
-      <translation type="unfinished">ESC parameters will only be accessible in the editor after assignment.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <source>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</source>
-      <translation type="unfinished">Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <source>Start Assignment</source>
-      <translation type="unfinished">Start Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <source>Stop Assignment</source>
-      <translation type="unfinished">Stop Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <source>Show Advanced Settings</source>
-      <translation type="unfinished">Show Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <source>Voltage Drop on Full Load (per cell)</source>
-      <translation type="unfinished">Voltage Drop on Full Load (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <source>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </source>
-      <translation type="unfinished">Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <source>throttle, divided by the number of battery cells. Leave at the default if unsure. </source>
-      <translation type="unfinished">throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <source>If this value is set too high, the battery might be deep discharged and damaged.</source>
-      <translation type="unfinished">If this value is set too high, the battery might be deep discharged and damaged.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <source>Compensated Minimum Voltage:</source>
-      <translation type="unfinished">Compensated Minimum Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <source> V</source>
-      <translation type="unfinished"> V</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="19"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="30"/>
-      <source>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</source>
-      <translation type="unfinished">Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <source>Battery Full</source>
-      <translation type="unfinished">Battery Full</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <source>Battery Empty</source>
-      <translation type="unfinished">Battery Empty</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <source>Number of Cells</source>
-      <translation type="unfinished">Number of Cells</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightBatteryCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="18"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="19"/>
-      <source>Battery connector firmly plugged?</source>
-      <translation type="unfinished">Battery connector firmly plugged?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="22"/>
-      <source>Warning - Battery charge below %1%.</source>
-      <translation type="unfinished">Warning - Battery charge below %1%.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="23"/>
-      <source>Battery charge below %1%. Please recharge.</source>
-      <translation type="unfinished">Battery charge below %1%. Please recharge.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckButton</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="54"/>
-      <source>Passed</source>
-      <translation type="unfinished">Passed</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckGroup</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
-      <source> (passed)</source>
-      <translation type="unfinished"> (passed)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckList</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>Pre-Flight Checklist %1</source>
-      <translation type="unfinished">Pre-Flight Checklist %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>(passed)</source>
-      <translation type="unfinished">(passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="93"/>
-      <source>Reset the checklist (e.g. after a vehicle reboot)</source>
-      <translation type="unfinished">Reset the checklist (e.g. after a vehicle reboot)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>(Passed)</source>
-      <translation type="unfinished">(Passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>In Progress</source>
-      <translation type="unfinished">In Progress</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckListShowAction</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
-      <source>Checklist</source>
-      <translation type="unfinished">Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightGPSCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="17"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="20"/>
-      <source>Waiting for 3D lock.</source>
-      <translation type="unfinished">Waiting for 3D lock.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Warning - Sat count below %1.</source>
-      <translation type="unfinished">Warning - Sat count below %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Waiting for sat count above %1.</source>
-      <translation type="unfinished">Waiting for sat count above %1.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightRCCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="17"/>
-      <source>Radio Control</source>
-      <translation type="unfinished">Radio Control</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="18"/>
-      <source>Receiving signal. Perform range test &amp; confirm.</source>
-      <translation type="unfinished">Receiving signal. Perform range test &amp; confirm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="19"/>
-      <source>No signal or invalid autopilot-RC config. Check RC and console.</source>
-      <translation type="unfinished">No signal or invalid autopilot-RC config. Check RC and console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSensorsHealthCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="17"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="35"/>
-      <source>Failure. Magnetometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Magnetometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="36"/>
-      <source>Failure. Accelerometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Accelerometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="37"/>
-      <source>Failure. Gyroscope issues. Check console.</source>
-      <translation type="unfinished">Failure. Gyroscope issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="38"/>
-      <source>Failure. Barometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Barometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="39"/>
-      <source>Failure. Airspeed sensor issues. Check console.</source>
-      <translation type="unfinished">Failure. Airspeed sensor issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="40"/>
-      <source>Failure. AHRS issues. Check console.</source>
-      <translation type="unfinished">Failure. AHRS issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="41"/>
-      <source>Failure. GPS issues. Check console.</source>
-      <translation type="unfinished">Failure. GPS issues. Check console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSoundCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="16"/>
-      <source>Sound output</source>
-      <translation type="unfinished">Sound output</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="17"/>
-      <source>QGC audio output enabled. System audio output enabled, too?</source>
-      <translation type="unfinished">QGC audio output enabled. System audio output enabled, too?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="18"/>
-      <source>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</source>
-      <translation type="unfinished">QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
-    </message>
-  </context>
-  <context>
-    <name>ProximityRadarValues</name>
-    <message>
-      <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCApplication</name>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="198"/>
-      <source>You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="214"/>
-      <source>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="580"/>
-      <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
-      <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="588"/>
-      <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
-      <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="656"/>
-      <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
-      <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="714"/>
-      <source>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</source>
-      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>New Version Available</source>
-      <translation type="unfinished">New Version Available</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="673"/>
-      <source>Unable to save telemetry log. Application save directory is not set.</source>
-      <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="680"/>
-      <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
-      <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCControlDebug</name>
-    <message>
-      <location filename="../src/QmlControls/QGCControlDebug.qml" line="22"/>
-      <source>%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</source>
-      <comment>Do not translate</comment>
-      <translation type="unfinished">%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCCorePlugin</name>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="134"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="138"/>
-      <source>Comm Links</source>
-      <translation type="unfinished">Comm Links</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="142"/>
-      <source>Offline Maps</source>
-      <translation type="unfinished">Offline Maps</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="147"/>
-      <source>Taisync</source>
-      <translation type="unfinished">Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="153"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="159"/>
-      <source>AirMap</source>
-      <translation type="unfinished">AirMap</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="164"/>
-      <source>MAVLink</source>
-      <translation type="unfinished">MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="168"/>
-      <source>Console</source>
-      <translation type="unfinished">Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="171"/>
-      <source>Help</source>
-      <translation type="unfinished">Help</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="176"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="179"/>
-      <source>Debug</source>
-      <translation type="unfinished">Debug</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="182"/>
-      <source>Palette Test</source>
-      <translation type="unfinished">Palette Test</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="201"/>
-      <source>Vibration</source>
-      <translation type="unfinished">Vibration</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
-      <source>Log Download</source>
-      <translation type="unfinished">Log Download</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
-      <source>GeoTag Images</source>
-      <translation type="unfinished">GeoTag Images</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="197"/>
-      <source>MAVLink Console</source>
-      <translation type="unfinished">MAVLink Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="199"/>
-      <source>MAVLink Inspector</source>
-      <translation type="unfinished">MAVLink Inspector</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="286"/>
-      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
-      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFenceCircle</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
-      <source>GeoFence Circle only supports version %1</source>
-      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFencePolygon</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
-      <source>GeoFence Polygon only supports version %1</source>
-      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="123"/>
-      <source>Path: %1</source>
-      <translation type="unfinished">Path: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="154"/>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="267"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="165"/>
-      <source>No files</source>
-      <translation type="unfinished">No files</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="206"/>
-      <source>New file name:</source>
-      <translation type="unfinished">New file name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="219"/>
-      <source>File names must end with .%1 file extension. If missing it will be added.</source>
-      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="227"/>
-      <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="235"/>
-      <source>Save to existing file:</source>
-      <translation type="unfinished">Save to existing file:</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDownload</name>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="102"/>
-      <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="112"/>
-      <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="135"/>
-      <source>Download cancelled</source>
-      <translation type="unfinished">Download cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="138"/>
-      <source>Error: File Not Found</source>
-      <translation type="unfinished">Error: File Not Found</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="141"/>
-      <source>Error during download. Error: %1</source>
-      <translation type="unfinished">Error during download. Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCLogEntry</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-      <source>Pending</source>
-      <translation type="unfinished">Pending</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMAVLinkSystem</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="587"/>
-      <source>Comp All</source>
-      <translation type="unfinished">Comp All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="592"/>
-      <source>Comp %1</source>
-      <translation type="unfinished">Comp %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolygonVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
-      <source>Polygon Tools</source>
-      <translation type="unfinished">Polygon Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="51"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
-      <source>Set radius...</source>
-      <translation type="unfinished">Set radius...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
-      <source>Edit Center Position</source>
-      <translation type="unfinished">Edit Center Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
-      <source>Edit Vertex Position</source>
-      <translation type="unfinished">Edit Vertex Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
-      <source>Circular</source>
-      <translation type="unfinished">Circular</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolylineVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
-      <source>Polyline Tools</source>
-      <translation type="unfinished">Polyline Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="41"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
-      <source>Select KML File</source>
-      <translation type="unfinished">Select KML File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="335"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="359"/>
-      <source>Load KML...</source>
-      <translation type="unfinished">Load KML...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCOptionsComboBox</name>
-    <message>
-      <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPluginHost</name>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
-      <source>Loaded Plugins</source>
-      <translation type="unfinished">Loaded Plugins</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
-      <source>Plugin Log</source>
-      <translation type="unfinished">Plugin Log</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPopupDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCTextField</name>
-    <message>
-      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-      <source>?</source>
-      <translation type="unfinished">?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCViewDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="34"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="37"/>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="46"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="40"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="43"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="49"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="52"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="55"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="58"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="61"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="64"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="67"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="73"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="76"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="79"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="82"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="85"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGroundControlQmlGlobal</name>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="254"/>
-      <source>32 bit</source>
-      <translation type="unfinished">32 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="256"/>
-      <source>64 bit</source>
-      <translation type="unfinished">64 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="270"/>
-      <source>(AMSL)</source>
-      <translation type="unfinished">(AMSL)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="272"/>
-      <source>(CalcT)</source>
-      <translation type="unfinished">(CalcT)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="292"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="294"/>
-      <source>Calc Above Terrain</source>
-      <translation type="unfinished">Calc Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="298"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="274"/>
-      <source>(TerrF)</source>
-      <translation type="unfinished">(TerrF)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="290"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="296"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-  </context>
-  <context>
-    <name>QMap3D</name>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="20"/>
-      <source>Map</source>
-      <translation type="unfinished">Map</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="30"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>QObject</name>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
-      <source>OpenPilot</source>
-      <translation type="unfinished">OpenPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="68"/>
-      <source>Guided mode not supported by Vehicle.</source>
-      <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="32"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="46"/>
-      <source>The following required keys are missing: %1</source>
-      <translation type="unfinished">The following required keys are missing: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="60"/>
-      <source>value for coordinate is not array</source>
-      <translation type="unfinished">value for coordinate is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="67"/>
-      <source>Coordinate array must contain %1 values</source>
-      <translation type="unfinished">Coordinate array must contain %1 values</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="73"/>
-      <source>Coordinate array may only contain double values, found: %1</source>
-      <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="151"/>
-      <source>Incorrect value type - key:type:expected %1:%2:%3</source>
-      <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="209"/>
-      <source>Incorrect file type key expected:%1 actual:%2</source>
-      <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="216"/>
-      <source>File version %1 is no longer supported</source>
-      <translation type="unfinished">File version %1 is no longer supported</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="220"/>
-      <source>File version %1 is newer than current supported version %2</source>
-      <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="379"/>
-      <source>value for coordinate array is not array</source>
-      <translation type="unfinished">value for coordinate array is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="488"/>
-      <source>Unknown type: %1</source>
-      <translation type="unfinished">Unknown type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="252"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="253"/>
-      <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
-      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QmlTest</name>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
-      <source>Window Color</source>
-      <translation type="unfinished">Window Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
-      <source>Import/Export</source>
-      <translation type="unfinished">Import/Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
-      <source>Light</source>
-      <translation type="unfinished">Light</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
-      <source>Dark</source>
-      <translation type="unfinished">Dark</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
-      <source>QGC name</source>
-      <translation type="unfinished">QGC name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</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>
-      <translation type="unfinished">Button</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
-      <source>Hover Button</source>
-      <translation type="unfinished">Hover Button</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>
-      <translation type="unfinished">Item 1</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>
-      <translation type="unfinished">Item 2</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>
-      <translation type="unfinished">Item 3</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
-      <source>Check Box</source>
-      <translation type="unfinished">Check Box</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
-      <source>SUB MENU</source>
-      <translation type="unfinished">SUB MENU</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Status</source>
-      <translation type="unfinished">RC RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Data Unavailable</source>
-      <translation type="unfinished">RC RSSI Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>N/A</source>
-      <comment>No data available</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
-      <source>RSSI:</source>
-      <translation type="unfinished">RSSI:</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCToParamDialog</name>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
-      <source>RC To Param</source>
-      <translation type="unfinished">RC To Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="44"/>
-      <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
-      <source>Waiting on parameter update from Vehicle.</source>
-      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
-      <source>Parameter</source>
-      <translation type="unfinished">Parameter</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
-      <source>Tuning ID</source>
-      <translation type="unfinished">Tuning ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
-      <source>Scale</source>
-      <translation type="unfinished">Scale</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
-      <source>Center Value</source>
-      <translation type="unfinished">Center Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
-      <source>Min Value</source>
-      <translation type="unfinished">Min Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
-      <source>Max Value</source>
-      <translation type="unfinished">Max Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
-      <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ROIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="53"/>
-      <source>ROI Disabled</source>
-      <translation type="unfinished">ROI Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="62"/>
-      <source>Disable ROI</source>
-      <translation type="unfinished">Disable ROI</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-      <source>Reboot required</source>
-      <translation type="unfinished">Reboot required</translation>
-    </message>
-    <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>
-      <translation type="unfinished">Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-      <source>Throttle channel reversed</source>
-      <translation type="unfinished">Throttle channel reversed</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>
-      <translation type="unfinished">Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</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>
-      <translation type="unfinished">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.</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>
-      <translation type="unfinished">Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
-
-%1</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>
-      <translation type="unfinished">Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>Please turn on transmitter.</source>
-      <translation type="unfinished">Please turn on transmitter.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>%1 channels or more are needed to fly.</source>
-      <translation type="unfinished">%1 channels or more are needed to fly.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="110"/>
-      <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
-      <translation type="unfinished">Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
-      <source>DSM2 Mode</source>
-      <translation type="unfinished">DSM2 Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
-      <source>DSMX (7 channels or less)</source>
-      <translation type="unfinished">DSMX (7 channels or less)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
-      <source>DSMX (8 channels or more)</source>
-      <translation type="unfinished">DSMX (8 channels or more)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
-      <source>Attitude Controls</source>
-      <translation type="unfinished">Attitude Controls</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="246"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="275"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="304"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="332"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="338"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="348"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="371"/>
-      <source>Additional Radio setup:</source>
-      <translation type="unfinished">Additional Radio setup:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="408"/>
-      <source>Spektrum Bind</source>
-      <translation type="unfinished">Spektrum Bind</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="413"/>
-      <source>Copy Trims</source>
-      <translation type="unfinished">Copy Trims</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="437"/>
-      <source>Mode 1</source>
-      <translation type="unfinished">Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="443"/>
-      <source>Mode 2</source>
-      <translation type="unfinished">Mode 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="118"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
-      <source>Move the Throttle stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="125"/>
-      <source>Move the Throttle stick all the way down and leave it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="126"/>
-      <source>Move the Yaw stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
-      <source>Move the Yaw stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
-      <source>Move the Roll stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
-      <source>Move the Roll stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
-      <source>Move the Pitch stick all the way down and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
-      <source>Move the Pitch stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
-      <source>Allow the Pitch stick to move back to center...</source>
-      <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
-      <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-      <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
-      <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-      <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="201"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="804"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="826"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="850"/>
-      <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">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.</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointController</name>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
-      <source>Rally: %1</source>
-      <translation type="unfinished">Rally: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
-      <source>Rally Points supports version %1</source>
-      <translation type="unfinished">Rally Points supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointEditorHeader</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
-      <source>Rally Points</source>
-      <translation type="unfinished">Rally Points</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">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-  </context>
-  <context>
-    <name>RoverChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
-      <source>Rover Initial Checks</source>
-      <translation type="unfinished">Rover Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
-      <source>Battery mounted and secured?</source>
-      <translation type="unfinished">Battery mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
-      <source>Mission area</source>
-      <translation type="unfinished">Mission area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
-      <source>Mission area and path free of obstacles/people?</source>
-      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SHPFileHelper</name>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="18"/>
-      <source>SHP file load failed. %1</source>
-      <translation type="unfinished">SHP file load failed. %1</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">UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="54"/>
-      <source>Only WGS84 or UTM projections are supported.</source>
-      <translation type="unfinished">Only WGS84 or UTM projections are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="57"/>
-      <source>PRJ file open failed: %1</source>
-      <translation type="unfinished">PRJ file open failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="60"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="63"/>
-      <source>File is not a .shp file: %1</source>
-      <translation type="unfinished">File is not a .shp file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="79"/>
-      <source>SHPOpen failed.</source>
-      <translation type="unfinished">SHPOpen failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="101"/>
-      <source>More than one entity found.</source>
-      <translation type="unfinished">More than one entity found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="105"/>
-      <source>No supported types found.</source>
-      <translation type="unfinished">No supported types found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="133"/>
-      <source>File does not contain a polygon.</source>
-      <translation type="unfinished">File does not contain a polygon.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="139"/>
-      <source>Only single part polygons are supported.</source>
-      <translation type="unfinished">Only single part polygons are supported.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <source>Low Battery Failsafe Trigger</source>
-      <translation type="unfinished">Low Battery Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <source>Battery Warn Level:</source>
-      <translation type="unfinished">Battery Warn Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <source>Battery Failsafe Level:</source>
-      <translation type="unfinished">Battery Failsafe Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <source>Battery Emergency Level:</source>
-      <translation type="unfinished">Battery Emergency Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <source>Object Detection</source>
-      <translation type="unfinished">Object Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <source>Collision Prevention:</source>
-      <translation type="unfinished">Collision Prevention:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <source>Obstacle Avoidance:</source>
-      <translation type="unfinished">Obstacle Avoidance:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <source>Minimum Distance: (</source>
-      <translation type="unfinished">Minimum Distance: (</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <source>Show obstacle distance overlay</source>
-      <translation type="unfinished">Show obstacle distance overlay</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <source>RC Loss Failsafe Trigger</source>
-      <translation type="unfinished">RC Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <source>RC Loss Timeout:</source>
-      <translation type="unfinished">RC Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <source>Data Link Loss Failsafe Trigger</source>
-      <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <source>Data Link Loss Timeout:</source>
-      <translation type="unfinished">Data Link Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <source>Geofence Failsafe Trigger</source>
-      <translation type="unfinished">Geofence Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <source>Action on breach:</source>
-      <translation type="unfinished">Action on breach:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <source>Max Radius:</source>
-      <translation type="unfinished">Max Radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <source>Max Altitude:</source>
-      <translation type="unfinished">Max Altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <source>Return To Launch Settings</source>
-      <translation type="unfinished">Return To Launch Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <source>Return to launch, then:</source>
-      <translation type="unfinished">Return to launch, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <source>Telemetry logging to vehicle storage:</source>
-      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <source>Climb to altitude of:</source>
-      <translation type="unfinished">Climb to altitude of:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <source>Loiter Altitude</source>
-      <translation type="unfinished">Loiter Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <source>Land Mode Settings</source>
-      <translation type="unfinished">Land Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <source>Landing Descent Rate:</source>
-      <translation type="unfinished">Landing Descent Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <source>Disarm After:</source>
-      <translation type="unfinished">Disarm After:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <source>Vehicle Telemetry Logging</source>
-      <translation type="unfinished">Vehicle Telemetry Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <source>Hardware in the Loop Simulation</source>
-      <translation type="unfinished">Hardware in the Loop Simulation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <source>HITL Enabled:</source>
-      <translation type="unfinished">HITL Enabled:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="19"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <source>Low Battery Failsafe</source>
-      <translation type="unfinished">Low Battery Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <source>RC Loss Failsafe</source>
-      <translation type="unfinished">RC Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <source>RC Loss Timeout</source>
-      <translation type="unfinished">RC Loss Timeout</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <source>Data Link Loss Failsafe</source>
-      <translation type="unfinished">Data Link Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <source>RTL Climb To</source>
-      <translation type="unfinished">RTL Climb To</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <source>RTL, Then</source>
-      <translation type="unfinished">RTL, Then</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <source>Loiter Alt</source>
-      <translation type="unfinished">Loiter Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <source>Land Delay</source>
-      <translation type="unfinished">Land Delay</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="27"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="39"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="173"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="190"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="276"/>
-      <source>Unsupported calibration firmware version, using log</source>
-      <translation type="unfinished">Unsupported calibration firmware version, using log</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="308"/>
-      <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
-      <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation type="unfinished">Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="395"/>
-      <source>Hold still in the current orientation</source>
-      <translation type="unfinished">Hold still in the current orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="433"/>
-      <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation type="unfinished">Place you vehicle into one of the orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="442"/>
-      <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="502"/>
-      <source>Reset successful</source>
-      <translation type="unfinished">Reset successful</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="509"/>
-      <source>Reset failed</source>
-      <translation type="unfinished">Reset failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <source>Compass 0</source>
-      <translation type="unfinished">Compass 0</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <source>Compass 1</source>
-      <translation type="unfinished">Compass 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <source>Compass 2</source>
-      <translation type="unfinished">Compass 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummaryFixedWing</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <source>Compass:</source>
-      <translation type="unfinished">Compass:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <source>Gyro:</source>
-      <translation type="unfinished">Gyro:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <source>Accelerometer:</source>
-      <translation type="unfinished">Accelerometer:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <source>Airspeed:</source>
-      <translation type="unfinished">Airspeed:</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsSetup</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <source>If the orientation is in the direction of flight, select ROTATION_NONE.</source>
-      <translation type="unfinished">If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <source>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <source>Compass Calibration Complete</source>
-      <translation type="unfinished">Compass Calibration Complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Sensor Calibration</source>
-      <translation type="unfinished">Sensor Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</source>
-      <translation type="unfinished">Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <source>Set autopilot orientation before calibrating.</source>
-      <translation type="unfinished">Set autopilot orientation before calibrating.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <source>Autopilot Orientation</source>
-      <translation type="unfinished">Autopilot Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <source>Click Ok to start calibration.</source>
-      <translation type="unfinished">Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <source>Reboot the vehicle prior to flight.</source>
-      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <source>Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <source>Mag %1 Orientation</source>
-      <translation type="unfinished">Mag %1 Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <source>Gyroscope</source>
-      <translation type="unfinished">Gyroscope</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <source>Airspeed</source>
-      <translation type="unfinished">Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <source>Calibrate Airspeed</source>
-      <translation type="unfinished">Calibrate Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <source>Orientations</source>
-      <translation type="unfinished">Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <source>Set Orientations</source>
-      <translation type="unfinished">Set Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <source>Factory reset</source>
-      <translation type="unfinished">Factory reset</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialConfiguration</name>
-    <message>
-      <location filename="../src/comm/SerialLink.h" line="83"/>
-      <source>Serial Link Settings</source>
-      <translation type="unfinished">Serial Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialLink</name>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="75"/>
-      <source>Could not send data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not send data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="121"/>
-      <source>Error connecting: Could not create port. %1</source>
-      <translation type="unfinished">Error connecting: Could not create port. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="244"/>
-      <source>Could not read data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not read data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="282"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="92"/>
-      <source>Baud rate name not in combo box</source>
-      <translation type="unfinished">Baud rate name not in combo box</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="114"/>
-      <source>Enable Flow Control</source>
-      <translation type="unfinished">Enable Flow Control</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="31"/>
-      <source>Serial Port</source>
-      <translation type="unfinished">Serial Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="65"/>
-      <source>None Available</source>
-      <translation type="unfinished">None Available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="73"/>
-      <source>Baud Rate</source>
-      <translation type="unfinished">Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="102"/>
-      <source>Advanced Settings</source>
-      <translation type="unfinished">Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="119"/>
-      <source>Parity</source>
-      <translation type="unfinished">Parity</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Even</source>
-      <translation type="unfinished">Even</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Odd</source>
-      <translation type="unfinished">Odd</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="157"/>
-      <source>Data Bits</source>
-      <translation type="unfinished">Data Bits</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="165"/>
-      <source>Stop Bits</source>
-      <translation type="unfinished">Stop Bits</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupPage</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>flying</source>
-      <translation type="unfinished">flying</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="44"/>
-      <source>%1 Setup</source>
-      <translation type="unfinished">%1 Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="66"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="77"/>
-      <source> (Disabled while the vehicle is %1)</source>
-      <translation type="unfinished"> (Disabled while the vehicle is %1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupView</name>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="35"/>
-      <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation type="unfinished">This operation cannot be performed while the vehicle is armed.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="38"/>
-      <source>missing message panel text</source>
-      <translation type="unfinished">missing message panel text</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="80"/>
-      <source>%1 setup must be completed prior to %2 setup.</source>
-      <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="132"/>
-      <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="150"/>
-      <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="171"/>
-      <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="172"/>
-      <source>As a result, the full set of vehicle setup options are not available.</source>
-      <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="231"/>
-      <source>Summary</source>
-      <translation type="unfinished">Summary</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="243"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="254"/>
-      <source>PX4Flow</source>
-      <translation type="unfinished">PX4Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="266"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="293"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>ShapeFileHelper</name>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="17"/>
-      <source>Shape file load failed. %1</source>
-      <translation type="unfinished">Shape file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="40"/>
-      <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
-      <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="93"/>
-      <source>Polyline not support from SHP files.</source>
-      <translation type="unfinished">Polyline not support from SHP files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="102"/>
-      <source>KML Files (*.%1)</source>
-      <translation type="unfinished">KML Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="107"/>
-      <source>KML/SHP Files (*.%1 *.%2)</source>
-      <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="76"/>
-      <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="157"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="38"/>
-      <source>Internal Error</source>
-      <translation type="unfinished">Internal Error</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="65"/>
-      <source>Provides advanced access to all commands/parameters. Be very careful!</source>
-      <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="77"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>desired</source>
-      <translation type="unfinished">desired</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>climbout</source>
-      <translation type="unfinished">climbout</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
-      <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
-      <source>Ensure clear of obstacles and into the wind.</source>
-      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="105"/>
-      <source>Click in map to set planned Takeoff location.</source>
-      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="106"/>
-      <source>Click in map to set planned Launch location.</source>
-      <translation type="unfinished">Click in map to set planned Launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="129"/>
-      <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="183"/>
-      <source>Actual AMSL alt sent: %1 %2</source>
-      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="243"/>
-      <source>Flight Speed</source>
-      <translation type="unfinished">Flight Speed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="406"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="410"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="412"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="414"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="416"/>
-      <source>VTOL Land</source>
-      <translation type="unfinished">VTOL Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="419"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-  </context>
-  <context>
-    <name>StructureScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="235"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="241"/>
-      <source>%1 version %2 not supported</source>
-      <translation type="unfinished">%1 version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="26"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</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">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
-      <source>Grid</source>
-      <translation type="unfinished">Grid</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
-      <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
-      <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="121"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
-      <source>Scan Distance</source>
-      <translation type="unfinished">Scan Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="131"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="222"/>
-      <source>Layer Height</source>
-      <translation type="unfinished">Layer Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="132"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="237"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="139"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Bottom</source>
-      <translation type="unfinished">Start Scan From Bottom</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Top</source>
-      <translation type="unfinished">Start Scan From Top</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="164"/>
-      <source>Structure Height</source>
-      <translation type="unfinished">Structure Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="171"/>
-      <source>Scan Bottom Alt</source>
-      <translation type="unfinished">Scan Bottom Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="178"/>
-      <source>Entrance/Exit Alt</source>
-      <translation type="unfinished">Entrance/Exit Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="186"/>
-      <source>Gimbal Pitch</source>
-      <translation type="unfinished">Gimbal Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="202"/>
-      <source>Rotate entry point</source>
-      <translation type="unfinished">Rotate entry point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="211"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="219"/>
-      <source>Layers</source>
-      <translation type="unfinished">Layers</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="225"/>
-      <source>Top Layer Alt</source>
-      <translation type="unfinished">Top Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="228"/>
-      <source>Bottom Layer Alt</source>
-      <translation type="unfinished">Bottom Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="231"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="234"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="235"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-  </context>
-  <context>
-    <name>SubChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
-      <source>Submarine Initial checks</source>
-      <translation type="unfinished">Submarine Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
-      <source>All seals in place?</source>
-      <translation type="unfinished">All seals in place?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="169"/>
-      <source>Survey items do not support version %1</source>
-      <translation type="unfinished">Survey items do not support version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="226"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="282"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="330"/>
-      <source>%1 but %2 object is missing</source>
-      <translation type="unfinished">%1 but %2 object is missing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="58"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="59"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="60"/>
-      <source>S</source>
-      <translation type="unfinished">S</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="18"/>
-      <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="19"/>
-      <source>Transects</source>
-      <translation type="unfinished">Transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="39"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="61"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="77"/>
-      <source>Hover and capture image</source>
-      <translation type="unfinished">Hover and capture image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="83"/>
-      <source>Refly at 90 deg offset</source>
-      <translation type="unfinished">Refly at 90 deg offset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="89"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="95"/>
-      <source>Fly alternate transects</source>
-      <translation type="unfinished">Fly alternate transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="107"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>SysStatusSensorInfo</name>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="103"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="111"/>
-      <source>Normal</source>
-      <translation type="unfinished">Normal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="119"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>SyslinkComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="43"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="61"/>
-      <source>Channel</source>
-      <translation type="unfinished">Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="86"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="112"/>
-      <source>Data Rate</source>
-      <translation type="unfinished">Data Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="16"/>
-      <source>Syslink</source>
-      <translation type="unfinished">Syslink</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="28"/>
-      <source>The Syslink Component is used to setup the radio connection on Crazyflies.</source>
-      <translation type="unfinished">The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPConfiguration</name>
-    <message>
-      <location filename="../src/comm/TCPLink.h" line="58"/>
-      <source>TCP Link Settings</source>
-      <translation type="unfinished">TCP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPLink</name>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <source>Error on link %1. Connection failed</source>
-      <translation type="unfinished">Error on link %1. Connection failed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Error on link %1. Error on socket: %2.</source>
-      <translation type="unfinished">Error on link %1. Error on socket: %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncManager</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="127"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="128"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="150"/>
-      <source>Stream</source>
-      <translation type="unfinished">Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="151"/>
-      <source>HDMI Port</source>
-      <translation type="unfinished">HDMI Port</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="172"/>
-      <source>Low</source>
-      <translation type="unfinished">Low</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="173"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="174"/>
-      <source>High</source>
-      <translation type="unfinished">High</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncSettings</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="56"/>
-      <source>Reboot ground unit for changes to take effect.</source>
-      <translation type="unfinished">Reboot ground unit for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="71"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="88"/>
-      <source>Enable Taisync</source>
-      <translation type="unfinished">Enable Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="94"/>
-      <source>Enable Taisync Video</source>
-      <translation type="unfinished">Enable Taisync Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="112"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="134"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="143"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="150"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="156"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="174"/>
-      <source>Device Info</source>
-      <translation type="unfinished">Device Info</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="196"/>
-      <source>Serial Number:</source>
-      <translation type="unfinished">Serial Number:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="200"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="204"/>
-      <source>Firmware Version:</source>
-      <translation type="unfinished">Firmware Version:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="222"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="244"/>
-      <source>Radio Mode:</source>
-      <translation type="unfinished">Radio Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="254"/>
-      <source>Radio Frequency:</source>
-      <translation type="unfinished">Radio Frequency:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="275"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="297"/>
-      <source>Video Output:</source>
-      <translation type="unfinished">Video Output:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="307"/>
-      <source>Encoder:</source>
-      <translation type="unfinished">Encoder:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="316"/>
-      <source>Bit Rate:</source>
-      <translation type="unfinished">Bit Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="337"/>
-      <source>Streaming Settings</source>
-      <translation type="unfinished">Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="359"/>
-      <source>RTSP URI:</source>
-      <translation type="unfinished">RTSP URI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="370"/>
-      <source>Account:</source>
-      <translation type="unfinished">Account:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="379"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="406"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="512"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="415"/>
-      <source>Set Streaming Settings</source>
-      <translation type="unfinished">Set Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="416"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="438"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="460"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="471"/>
-      <source>Ground Unit IP Address:</source>
-      <translation type="unfinished">Ground Unit IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="481"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="521"/>
-      <source>Set Network Settings</source>
-      <translation type="unfinished">Set Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="522"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</translation>
-    </message>
-  </context>
-  <context>
-    <name>TakeoffItemMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>TcpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="29"/>
-      <source>Server Address</source>
-      <translation type="unfinished">Server Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="36"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-  </context>
-  <context>
-    <name>TelemetryRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
-      <source>Telemetry RSSI Status</source>
-      <translation type="unfinished">Telemetry RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
-      <source>Local RSSI:</source>
-      <translation type="unfinished">Local RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
-      <source>Remote RSSI:</source>
-      <translation type="unfinished">Remote RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
-      <source>RX Errors:</source>
-      <translation type="unfinished">RX Errors:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
-      <source>Errors Fixed:</source>
-      <translation type="unfinished">Errors Fixed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
-      <source>TX Buffer:</source>
-      <translation type="unfinished">TX Buffer:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
-      <source>Local Noise:</source>
-      <translation type="unfinished">Local Noise:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
-      <source>Remote Noise:</source>
-      <translation type="unfinished">Remote Noise:</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainProgress</name>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
-      <source>Terrain Load Progress</source>
-      <translation type="unfinished">Terrain Load Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainStatus</name>
-    <message>
-      <location filename="../src/PlanView/TerrainStatus.qml" line="45"/>
-      <source>Height AMSL (%1)</source>
-      <translation type="unfinished">Height AMSL (%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="233"/>
-      <source>TransectStyleComplexItem version %2 not supported</source>
-      <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="101"/>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="102"/>
-      <source>Transect</source>
-      <translation type="unfinished">Transect</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="36"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="92"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="102"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="103"/>
-      <source>Trigger Dist</source>
-      <translation type="unfinished">Trigger Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="104"/>
-      <source>Spacing</source>
-      <translation type="unfinished">Spacing</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="123"/>
-      <source>Rotate Entry Point</source>
-      <translation type="unfinished">Rotate Entry Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="131"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="234"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="163"/>
-      <source>Presets</source>
-      <translation type="unfinished">Presets</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="178"/>
-      <source>Apply Preset</source>
-      <translation type="unfinished">Apply Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="185"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="193"/>
-      <source>Delete Preset</source>
-      <translation type="unfinished">Delete Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="196"/>
-      <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="212"/>
-      <source>Save Settings As New Preset</source>
-      <translation type="unfinished">Save Settings As New Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="249"/>
-      <source>Save Preset</source>
-      <translation type="unfinished">Save Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="265"/>
-      <source>Save the current settings as a named preset.</source>
-      <translation type="unfinished">Save the current settings as a named preset.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="270"/>
-      <source>Preset Name</source>
-      <translation type="unfinished">Preset Name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="276"/>
-      <source>Enter preset name</source>
-      <translation type="unfinished">Enter preset name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="283"/>
-      <source>Preset name cannot be blank.</source>
-      <translation type="unfinished">Preset name cannot be blank.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="286"/>
-      <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemStats</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
-      <source>Survey Area</source>
-      <translation type="unfinished">Survey Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemTerrainFollow</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
-      <source>Tolerance</source>
-      <translation type="unfinished">Tolerance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
-      <source>Max Climb Rate</source>
-      <translation type="unfinished">Max Climb Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
-      <source>Max Descent Rate</source>
-      <translation type="unfinished">Max Descent Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>UAS</name>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="318"/>
-      <source>UNINIT</source>
-      <translation type="unfinished">UNINIT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="319"/>
-      <source>Unitialized, booting up.</source>
-      <translation type="unfinished">Unitialized, booting up.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="322"/>
-      <source>BOOT</source>
-      <translation type="unfinished">BOOT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="323"/>
-      <source>Booting system, please wait.</source>
-      <translation type="unfinished">Booting system, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="326"/>
-      <source>CALIBRATING</source>
-      <translation type="unfinished">CALIBRATING</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="327"/>
-      <source>Calibrating sensors, please wait.</source>
-      <translation type="unfinished">Calibrating sensors, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="330"/>
-      <source>ACTIVE</source>
-      <translation type="unfinished">ACTIVE</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="331"/>
-      <source>Active, normal operation.</source>
-      <translation type="unfinished">Active, normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="334"/>
-      <source>STANDBY</source>
-      <translation type="unfinished">STANDBY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="335"/>
-      <source>Standby mode, ready for launch.</source>
-      <translation type="unfinished">Standby mode, ready for launch.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="338"/>
-      <source>CRITICAL</source>
-      <translation type="unfinished">CRITICAL</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="339"/>
-      <source>FAILURE: Continuing operation.</source>
-      <translation type="unfinished">FAILURE: Continuing operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="342"/>
-      <source>EMERGENCY</source>
-      <translation type="unfinished">EMERGENCY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="343"/>
-      <source>EMERGENCY: Land Immediately!</source>
-      <translation type="unfinished">EMERGENCY: Land Immediately!</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="351"/>
-      <source>SHUTDOWN</source>
-      <translation type="unfinished">SHUTDOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="352"/>
-      <source>Powering off system.</source>
-      <translation type="unfinished">Powering off system.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="356"/>
-      <source>UNKNOWN</source>
-      <translation type="unfinished">UNKNOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="357"/>
-      <source>Unknown system state</source>
-      <translation type="unfinished">Unknown system state</translation>
-    </message>
-  </context>
-  <context>
-    <name>UASMessageHandler</name>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
-      <source> EMERGENCY:</source>
-      <translation type="unfinished"> EMERGENCY:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
-      <source> ALERT:</source>
-      <translation type="unfinished"> ALERT:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
-      <source> Critical:</source>
-      <translation type="unfinished"> Critical:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
-      <source> Error:</source>
-      <translation type="unfinished"> Error:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
-      <source> Warning:</source>
-      <translation type="unfinished"> Warning:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
-      <source> Notice:</source>
-      <translation type="unfinished"> Notice:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
-      <source> Info:</source>
-      <translation type="unfinished"> Info:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
-      <source> Debug:</source>
-      <translation type="unfinished"> Debug:</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPConfiguration</name>
-    <message>
-      <location filename="../src/comm/UDPLink.h" line="79"/>
-      <source>UDP Link Settings</source>
-      <translation type="unfinished">UDP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPLink</name>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>UDP Link Error</source>
-      <translation type="unfinished">UDP Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <source>Error binding UDP port: %1</source>
-      <translation type="unfinished">Error binding UDP port: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>Error registering Zeroconf</source>
-      <translation type="unfinished">Error registering Zeroconf</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>
-      <translation type="unfinished">Could not detect ULog file header magic</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
-      <source>Could not detect camera_capture packets in ULog</source>
-      <translation type="unfinished">Could not detect camera_capture packets in ULog</translation>
-    </message>
-  </context>
-  <context>
-    <name>UdpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="31"/>
-      <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="37"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="48"/>
-      <source>Server Addresses (optional)</source>
-      <translation type="unfinished">Server Addresses (optional)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="62"/>
-      <source>Remove</source>
-      <translation type="unfinished">Remove</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="74"/>
-      <source>Example: 127.0.0.1:14550</source>
-      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="77"/>
-      <source>Add Server</source>
-      <translation type="unfinished">Add Server</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
-      <source>Measurement Units</source>
-      <translation type="unfinished">Measurement Units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="64"/>
-      <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
-      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
-      <source>System of units</source>
-      <translation type="unfinished">System of units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Metric System</source>
-      <translation type="unfinished">Metric System</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Imperial System</source>
-      <translation type="unfinished">Imperial System</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsSettings</name>
-    <message>
-      <location filename="../src/Settings/UnitsSettings.cc" line="196"/>
-      <source>Weight units</source>
-      <translation type="unfinished">Weight units</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
-      <source>VTOL Initial Checks</source>
-      <translation type="unfinished">VTOL Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="23"/>
-      <source>VTOL Landing</source>
-      <translation type="unfinished">VTOL Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="82"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="150"/>
-      <source>Landing Dist</source>
-      <translation type="unfinished">Landing Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="180"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="218"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="227"/>
-      <source>* Avoid tailwind on approach to land.</source>
-      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="236"/>
-      <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="262"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="269"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="301"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="305"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="259"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLModeIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: FW</source>
-      <translation type="unfinished">VTOL: FW</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: MR</source>
-      <translation type="unfinished">VTOL: MR</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle</name>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="558"/>
-      <source>MAVLink Generic</source>
-      <translation type="unfinished">MAVLink Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="565"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="567"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="569"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="571"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="573"/>
-      <source>Rover</source>
-      <translation type="unfinished">Rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="575"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="577"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="866"/>
-      <source> ... </source>
-      <comment>Indicates missing chunk from chunked STATUS_TEXT</comment>
-      <translation type="unfinished"> ... </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2168"/>
-      <source>Mission transfer failed. Error: %1</source>
-      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2174"/>
-      <source>GeoFence transfer failed. Error: %1</source>
-      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2180"/>
-      <source>Rally Point transfer failed. Error: %1</source>
-      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1423"/>
-      <source>battery %1 level low</source>
-      <translation type="unfinished">battery %1 level low</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1429"/>
-      <source>battery %1 level is critical</source>
-      <translation type="unfinished">battery %1 level is critical</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1435"/>
-      <source>battery %1 level emergency</source>
-      <translation type="unfinished">battery %1 level emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1441"/>
-      <source>battery %1 failed</source>
-      <translation type="unfinished">battery %1 failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1447"/>
-      <source>battery %1 unhealthy</source>
-      <translation type="unfinished">battery %1 unhealthy</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1459"/>
-      <source>warning</source>
-      <translation type="unfinished">warning</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2391"/>
-      <source>Generic micro air vehicle</source>
-      <translation type="unfinished">Generic micro air vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2392"/>
-      <source>Fixed wing aircraft</source>
-      <translation type="unfinished">Fixed wing aircraft</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2393"/>
-      <source>Quadrotor</source>
-      <translation type="unfinished">Quadrotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2394"/>
-      <source>Coaxial helicopter</source>
-      <translation type="unfinished">Coaxial helicopter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2395"/>
-      <source>Normal helicopter with tail rotor.</source>
-      <translation type="unfinished">Normal helicopter with tail rotor.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2396"/>
-      <source>Ground installation</source>
-      <translation type="unfinished">Ground installation</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2397"/>
-      <source>Operator control unit / ground control station</source>
-      <translation type="unfinished">Operator control unit / ground control station</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2398"/>
-      <source>Airship, controlled</source>
-      <translation type="unfinished">Airship, controlled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2399"/>
-      <source>Free balloon, uncontrolled</source>
-      <translation type="unfinished">Free balloon, uncontrolled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2400"/>
-      <source>Rocket</source>
-      <translation type="unfinished">Rocket</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2401"/>
-      <source>Ground rover</source>
-      <translation type="unfinished">Ground rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2402"/>
-      <source>Surface vessel, boat, ship</source>
-      <translation type="unfinished">Surface vessel, boat, ship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2403"/>
-      <source>Submarine</source>
-      <translation type="unfinished">Submarine</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2404"/>
-      <source>Hexarotor</source>
-      <translation type="unfinished">Hexarotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2405"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2406"/>
-      <source>Octorotor</source>
-      <translation type="unfinished">Octorotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2407"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2408"/>
-      <source>Flapping wing</source>
-      <translation type="unfinished">Flapping wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2409"/>
-      <source>Onboard companion controller</source>
-      <translation type="unfinished">Onboard companion controller</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2410"/>
-      <source>Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</source>
-      <translation type="unfinished">Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2411"/>
-      <source>Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</source>
-      <translation type="unfinished">Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2412"/>
-      <source>Tiltrotor VTOL</source>
-      <translation type="unfinished">Tiltrotor VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2413"/>
-      <source>VTOL reserved 2</source>
-      <translation type="unfinished">VTOL reserved 2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2414"/>
-      <source>VTOL reserved 3</source>
-      <translation type="unfinished">VTOL reserved 3</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2415"/>
-      <source>VTOL reserved 4</source>
-      <translation type="unfinished">VTOL reserved 4</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2416"/>
-      <source>VTOL reserved 5</source>
-      <translation type="unfinished">VTOL reserved 5</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2417"/>
-      <source>Onboard gimbal</source>
-      <translation type="unfinished">Onboard gimbal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2418"/>
-      <source>Onboard ADSB peripheral</source>
-      <translation type="unfinished">Onboard ADSB peripheral</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2427"/>
-      <source>Vehicle %1 </source>
-      <translation type="unfinished">Vehicle %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3224"/>
-      <source>Vehicle reboot failed.</source>
-      <translation type="unfinished">Vehicle reboot failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2435"/>
-      <source>%1 %2 flight mode</source>
-      <translation type="unfinished">%1 %2 flight mode</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>disarmed</source>
-      <translation type="unfinished">disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Unable to send command: %1.</source>
-      <translation type="unfinished">Unable to send command: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Waiting on previous response to same command.</source>
-      <translation type="unfinished">Waiting on previous response to same command.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2886"/>
-      <source>Vehicle did not respond to command: %1</source>
-      <translation type="unfinished">Vehicle did not respond to command: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2997"/>
-      <source>Bootloader flash succeeded</source>
-      <translation type="unfinished">Bootloader flash succeeded</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3012"/>
-      <source>%1 command temporarily rejected</source>
-      <translation type="unfinished">%1 command temporarily rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3015"/>
-      <source>%1 command denied</source>
-      <translation type="unfinished">%1 command denied</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3018"/>
-      <source>%1 command not supported</source>
-      <translation type="unfinished">%1 command not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3021"/>
-      <source>%1 command failed</source>
-      <translation type="unfinished">%1 command failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="149"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="151"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="153"/>
-      <source>Rover-Boat</source>
-      <translation type="unfinished">Rover-Boat</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="155"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="157"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="159"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="161"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="163"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleLinkManager</name>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <source>%1Communication regained on %2 link</source>
-      <translation type="unfinished">%1Communication regained on %2 link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>primary</source>
-      <translation type="unfinished">primary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>secondary</source>
-      <translation type="unfinished">secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="64"/>
-      <source>%1Communication regained</source>
-      <translation type="unfinished">%1Communication regained</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="69"/>
-      <source>%1Switching communication to new primary link</source>
-      <translation type="unfinished">%1Switching communication to new primary link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>%1Communication lost on %2 link.</source>
-      <translation type="unfinished">%1Communication lost on %2 link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="126"/>
-      <source>%1Switching communication to secondary link.</source>
-      <translation type="unfinished">%1Switching communication to secondary link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="146"/>
-      <source>%1Communication lost</source>
-      <translation type="unfinished">%1Communication lost</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="392"/>
-      <source>Comm Lost</source>
-      <translation type="unfinished">Comm Lost</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleMapItem</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/VehicleMapItem.qml" line="89"/>
-      <source>Vehicle %1</source>
-      <translation type="unfinished">Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleRotationCal</name>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="26"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Incomplete</source>
-      <translation type="unfinished">Incomplete</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleSummary</name>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="87"/>
-      <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation type="unfinished">Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="88"/>
-      <source>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</source>
-      <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleWarnings</name>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
-      <source>No GPS Lock for Vehicle</source>
-      <translation type="unfinished">No GPS Lock for Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
-      <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
-      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VibrationPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
-      <source>Analyze vibration associated with your vehicle.</source>
-      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="74"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="96"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="118"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="139"/>
-      <source>Clip count</source>
-      <translation type="unfinished">Clip count</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="143"/>
-      <source>Accel 1: </source>
-      <translation type="unfinished">Accel 1: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="147"/>
-      <source>Accel 2: </source>
-      <translation type="unfinished">Accel 2: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="151"/>
-      <source>Accel 3: </source>
-      <translation type="unfinished">Accel 3: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="165"/>
-      <source>Not Available</source>
-      <translation type="unfinished">Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoManager</name>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="288"/>
-      <source>Video receiver is not ready.</source>
-      <translation type="unfinished">Video receiver is not ready.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="295"/>
-      <source>Invalid video format defined.</source>
-      <translation type="unfinished">Invalid video format defined.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="306"/>
-      <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoSettings</name>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="22"/>
-      <source>No Video Available</source>
-      <translation type="unfinished">No Video Available</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="23"/>
-      <source>Video Stream Disabled</source>
-      <translation type="unfinished">Video Stream Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="24"/>
-      <source>RTSP Video Stream</source>
-      <translation type="unfinished">RTSP Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="25"/>
-      <source>UDP h.264 Video Stream</source>
-      <translation type="unfinished">UDP h.264 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="26"/>
-      <source>UDP h.265 Video Stream</source>
-      <translation type="unfinished">UDP h.265 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="27"/>
-      <source>TCP-MPEG2 Video Stream</source>
-      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="28"/>
-      <source>MPEG-TS (h.264) Video Stream</source>
-      <translation type="unfinished">MPEG-TS (h.264) Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="29"/>
-      <source>3DR Solo (requires restart)</source>
-      <translation type="unfinished">3DR Solo (requires restart)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="30"/>
-      <source>Parrot Discovery</source>
-      <translation type="unfinished">Parrot Discovery</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="31"/>
-      <source>Yuneec Mantis G</source>
-      <translation type="unfinished">Yuneec Mantis G</translation>
-    </message>
-  </context>
-</TS>
diff --git a/translations/qgc_ru_RU.ts b/translations/qgc_ru_RU.ts
deleted file mode 100644
index 5b41b25320ad..000000000000
--- a/translations/qgc_ru_RU.ts
+++ /dev/null
@@ -1,18078 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru" sourcelanguage="en">
-  <context>
-    <name>ADSBVehicleManager</name>
-    <message>
-      <location filename="../src/ADSB/ADSBVehicleManager.cc" line="70"/>
-      <source>ADSB Server Error: %1</source>
-      <translation type="unfinished">ADSB Server Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <source>Airframe is currently not set.</source>
-      <translation type="unfinished">Airframe is currently not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <source> and frame type &apos;%2&apos;</source>
-      <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="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="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
-      <source> To change this configuration, select the desired frame class below.</source>
-      <translation type="unfinished"> To change this configuration, select the desired frame class below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
-      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="19"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="40"/>
-      <source>Frame Setup is used to select the airframe which matches your vehicle.</source>
-      <translation type="unfinished">Frame Setup is used to select the airframe which matches your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="251"/>
-      <source>Param file github json download failed: %1</source>
-      <translation type="unfinished">Param file github json download failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="261"/>
-      <source>Param file download failed: %1</source>
-      <translation type="unfinished">Param file download failed: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <source>Frame Class</source>
-      <translation type="unfinished">Frame Class</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="226"/>
-      <source>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</source>
-      <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <source>Input channel:</source>
-      <translation type="unfinished">Input channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="20"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="31"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <source>Gimbal type</source>
-      <translation type="unfinished">Gimbal type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <source>Tilt input channel</source>
-      <translation type="unfinished">Tilt input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <source>Pan input channel</source>
-      <translation type="unfinished">Pan input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <source>Roll input channel</source>
-      <translation type="unfinished">Roll input channel</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraSubComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="648"/>
-      <source>Error during Solo video link setup: %1</source>
-      <translation type="unfinished">Error during Solo video link setup: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="770"/>
-      <source>Unable to change altitude, vehicle altitude not known.</source>
-      <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="775"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="838"/>
-      <source>Vehicle does not support guided takeoff</source>
-      <translation type="unfinished">Vehicle does not support guided takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="844"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="854"/>
-      <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="859"/>
-      <source>Unable to takeoff: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="877"/>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="897"/>
-      <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="885"/>
-      <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="890"/>
-      <source>Unable to start mission: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="975"/>
-      <source>Follow failed: Home position not set.</source>
-      <translation type="unfinished">Follow failed: Home position not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="985"/>
-      <source>Follow failed: Ground station cannot provide required position information.</source>
-      <translation type="unfinished">Follow failed: Ground station cannot provide required position information.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source> (Channel 5)</source>
-      <translation type="unfinished"> (Channel 5)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <source>Flight mode channel:</source>
-      <translation type="unfinished">Flight mode channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Not assigned</source>
-      <translation type="unfinished">Not assigned</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 1</source>
-      <translation type="unfinished">Channel 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 2</source>
-      <translation type="unfinished">Channel 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 3</source>
-      <translation type="unfinished">Channel 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 4</source>
-      <translation type="unfinished">Channel 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <source>Flight Mode </source>
-      <translation type="unfinished">Flight Mode </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <source>Simple Mode</source>
-      <translation type="unfinished">Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <source>Switch Options</source>
-      <translation type="unfinished">Switch Options</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <source>Channel option %1 :</source>
-      <translation type="unfinished">Channel option %1 :</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="18"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="29"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <source>Flight Mode 1</source>
-      <translation type="unfinished">Flight Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <source>Flight Mode 2</source>
-      <translation type="unfinished">Flight Mode 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <source>Flight Mode 3</source>
-      <translation type="unfinished">Flight Mode 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <source>Flight Mode 4</source>
-      <translation type="unfinished">Flight Mode 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <source>Flight Mode 5</source>
-      <translation type="unfinished">Flight Mode 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <source>Flight Mode 6</source>
-      <translation type="unfinished">Flight Mode 6</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <source>Enable Follow Me</source>
-      <translation type="unfinished">Enable Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <source>Waiting for Vehicle to update</source>
-      <translation type="unfinished">Waiting for Vehicle to update</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <source>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</source>
-      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <source>Reset To Supported Settings</source>
-      <translation type="unfinished">Reset To Supported Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <source>Vehicle Position</source>
-      <translation type="unfinished">Vehicle Position</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Maintain Current Offsets</source>
-      <translation type="unfinished">Maintain Current Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Specify Offsets</source>
-      <translation type="unfinished">Specify Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <source>Point Vehicle</source>
-      <translation type="unfinished">Point Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Maintain current vehicle orientation</source>
-      <translation type="unfinished">Maintain current vehicle orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Point at ground station location</source>
-      <translation type="unfinished">Point at ground station location</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Same direction as ground station movement</source>
-      <translation type="unfinished">Same direction as ground station movement</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <source>Vehicle Offsets</source>
-      <translation type="unfinished">Vehicle Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <source>Click in the graphic to change angle</source>
-      <translation type="unfinished">Click in the graphic to change angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="28"/>
-      <source>Follow Me Setup is used to configure support for the vehicle following the ground station location.</source>
-      <translation type="unfinished">Follow Me Setup is used to configure support for the vehicle following the ground station location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMHeliComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <source>Servo Setup</source>
-      <translation type="unfinished">Servo Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <source>Servo</source>
-      <translation type="unfinished">Servo</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <source>Min</source>
-      <translation type="unfinished">Min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <source>Max</source>
-      <translation type="unfinished">Max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <source>Trim</source>
-      <translation type="unfinished">Trim</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <source>Reversed</source>
-      <translation type="unfinished">Reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <source>2</source>
-      <translation type="unfinished">2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <source>3</source>
-      <translation type="unfinished">3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <source>4</source>
-      <translation type="unfinished">4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <source>5</source>
-      <translation type="unfinished">5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <source>6</source>
-      <translation type="unfinished">6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <source>7</source>
-      <translation type="unfinished">7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <source>8</source>
-      <translation type="unfinished">8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <source>Swashplate Setup</source>
-      <translation type="unfinished">Swashplate Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <source>Throttle Settings</source>
-      <translation type="unfinished">Throttle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <source>Governor Settings</source>
-      <translation type="unfinished">Governor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <source>Miscellaneous Settings</source>
-      <translation type="unfinished">Miscellaneous Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <source>* Stabilize Collective Curve *</source>
-      <translation type="unfinished">* Stabilize Collective Curve *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <source>* Tail &amp; Gyros *</source>
-      <translation type="unfinished">* Tail &amp; Gyros *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="15"/>
-      <source>Heli</source>
-      <translation type="unfinished">Heli</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="26"/>
-      <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
-      <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <source>Light Output Channels</source>
-      <translation type="unfinished">Light Output Channels</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <source>Lights 1:</source>
-      <translation type="unfinished">Lights 1:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <source>Lights 2:</source>
-      <translation type="unfinished">Lights 2:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <source>Brightness Steps:</source>
-      <translation type="unfinished">Brightness Steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="21"/>
-      <source>Lights</source>
-      <translation type="unfinished">Lights</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="32"/>
-      <source>Lights setup is used to adjust light output channels.</source>
-      <translation type="unfinished">Lights setup is used to adjust light output channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <source>Lights Output 1</source>
-      <translation type="unfinished">Lights Output 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <source>Lights Output 2</source>
-      <translation type="unfinished">Lights Output 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="15"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMNotSupported</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <source>Not supported</source>
-      <translation type="unfinished">Not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <source>Battery 1</source>
-      <translation type="unfinished">Battery 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <source>Battery1 monitor:</source>
-      <translation type="unfinished">Battery1 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <source>Battery 2</source>
-      <translation type="unfinished">Battery 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <source>Battery2 monitor:</source>
-      <translation type="unfinished">Battery2 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <source>WARNING: Remove props prior to calibration!</source>
-      <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Now perform these steps:</source>
-      <translation type="unfinished">Now perform these steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Click Calibrate to start, then:</source>
-      <translation type="unfinished">Click Calibrate to start, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <source>- Disconnect USB and battery so flight controller powers down</source>
-      <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <source>- Connect the battery</source>
-      <translation type="unfinished">- Connect the battery</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <source>- If using a flight controller with a safety button press it until it displays solid red</source>
-      <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <source>- You will hear a musical tone then two beeps</source>
-      <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
-      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
-      <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <source>- Disconnect the battery and power up again normally</source>
-      <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <source>Power Module 90A</source>
-      <translation type="unfinished">Power Module 90A</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <source>Power Module HV</source>
-      <translation type="unfinished">Power Module HV</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <source>3DR Iris</source>
-      <translation type="unfinished">3DR Iris</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <source>Blue Robotics Power Sense Module R2</source>
-      <translation type="unfinished">Blue Robotics Power Sense Module R2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <source>Battery monitor:</source>
-      <translation type="unfinished">Battery monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <source>Battery capacity:</source>
-      <translation type="unfinished">Battery capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <source>Minimum arming voltage:</source>
-      <translation type="unfinished">Minimum arming voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <source>Power sensor:</source>
-      <translation type="unfinished">Power sensor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <source>Current pin:</source>
-      <translation type="unfinished">Current pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <source>Voltage pin:</source>
-      <translation type="unfinished">Voltage pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <source>Voltage multiplier:</source>
-      <translation type="unfinished">Voltage multiplier:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <source>Calculate Voltage Multiplier</source>
-      <translation type="unfinished">Calculate Voltage Multiplier</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <source>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <source>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <source>Amps Offset:</source>
-      <translation type="unfinished">Amps Offset:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <source>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</source>
-      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <source>Calculate And Set</source>
-      <translation type="unfinished">Calculate And Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="18"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="29"/>
-      <source>The Power Component is used to setup battery parameters.</source>
-      <translation type="unfinished">The Power Component is used to setup battery parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="18"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="37"/>
-      <source>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</source>
-      <translation type="unfinished">The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Channel %1</source>
-      <translation type="unfinished">Channel %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <source>Low action:</source>
-      <translation type="unfinished">Low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <source>Critical action:</source>
-      <translation type="unfinished">Critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <source>Low voltage threshold:</source>
-      <translation type="unfinished">Low voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <source>Critical voltage threshold:</source>
-      <translation type="unfinished">Critical voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <source>Low mAh threshold:</source>
-      <translation type="unfinished">Low mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <source>Critical mAh threshold:</source>
-      <translation type="unfinished">Critical mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <source>Final land stage altitude:</source>
-      <translation type="unfinished">Final land stage altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <source>Final land stage descent speed:</source>
-      <translation type="unfinished">Final land stage descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="20"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="33"/>
-      <source>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</source>
-      <translation type="unfinished">Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="44"/>
-      <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="85"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="178"/>
-      <source>Battery low action:</source>
-      <translation type="unfinished">Battery low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="186"/>
-      <source>Battery critical action:</source>
-      <translation type="unfinished">Battery critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="195"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="206"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="155"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="224"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="245"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="252"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="262"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="278"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="293"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="318"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="343"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="355"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="366"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="382"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="402"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="438"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="450"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="472"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="491"/>
-      <source>Land with descent speed:</source>
-      <translation type="unfinished">Land with descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="512"/>
-      <source>Final loiter altitude:</source>
-      <translation type="unfinished">Final loiter altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="534"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="565"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="67"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="88"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="109"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="130"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="142"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="156"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="168"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="68"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="87"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="105"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="122"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="143"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="174"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <source>Failsafe Actions</source>
-      <translation type="unfinished">Failsafe Actions</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <source>GCS Heartbeat:</source>
-      <translation type="unfinished">GCS Heartbeat:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <source>Leak:</source>
-      <translation type="unfinished">Leak:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <source>Detector Pin:</source>
-      <translation type="unfinished">Detector Pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <source>Logic when Dry:</source>
-      <translation type="unfinished">Logic when Dry:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <source>Battery:</source>
-      <translation type="unfinished">Battery:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <source>Voltage:</source>
-      <translation type="unfinished">Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <source>Remaining Capacity:</source>
-      <translation type="unfinished">Remaining Capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <source>EKF:</source>
-      <translation type="unfinished">EKF:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <source>Pilot Input:</source>
-      <translation type="unfinished">Pilot Input:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <source>Timeout:</source>
-      <translation type="unfinished">Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <source>Internal Temperature:</source>
-      <translation type="unfinished">Internal Temperature:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <source>Internal Pressure:</source>
-      <translation type="unfinished">Internal Pressure:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="41"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="46"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="51"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="84"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="77"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="79"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="86"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="92"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="93"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="27"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="38"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="32"/>
-      <source>Voltage failsafe:</source>
-      <translation type="unfinished">Voltage failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="37"/>
-      <source>mAh failsafe:</source>
-      <translation type="unfinished">mAh failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="42"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="43"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="93"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="57"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="60"/>
-      <source>Always Hold</source>
-      <translation type="unfinished">Always Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="73"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="76"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="87"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="92"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="97"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="102"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummarySub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <source>GCS failsafe:</source>
-      <translation type="unfinished">GCS failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <source>Leak failsafe:</source>
-      <translation type="unfinished">Leak failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <source>Battery failsafe:</source>
-      <translation type="unfinished">Battery failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <source>EKF failsafe:</source>
-      <translation type="unfinished">EKF failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <source>Pilot Input failsafe:</source>
-      <translation type="unfinished">Pilot Input failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <source>Int. Temperature failsafe:</source>
-      <translation type="unfinished">Int. Temperature failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <source>Int. Pressure failsafe:</source>
-      <translation type="unfinished">Int. Pressure failsafe:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <source>If mounted in the direction of flight, select None.</source>
-      <translation type="unfinished">If mounted in the direction of flight, select None.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <source>Before calibrating make sure rotation settings are correct. </source>
-      <translation type="unfinished">Before calibrating make sure rotation settings are correct. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <source>If the compass or GPS module is mounted in flight direction, leave the default value (None)</source>
-      <translation type="unfinished">If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <source>The calibration for Compass %1 appears to be poor. </source>
-      <translation type="unfinished">The calibration for Compass %1 appears to be poor. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation type="unfinished">Check the compass position within your vehicle and re-do the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <source>Sensor Settings</source>
-      <translation type="unfinished">Sensor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <source>Accelerometer calibration complete</source>
-      <translation type="unfinished">Accelerometer calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <source>Compass calibration complete</source>
-      <translation type="unfinished">Compass calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(primary</source>
-      <translation type="unfinished">(primary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(secondary</source>
-      <translation type="unfinished">(secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <source>Use Compass</source>
-      <translation type="unfinished">Use Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <source>Shown in the indicator bars is the quality of the calibration for each compass.
-
-</source>
-      <translation type="unfinished">Shown in the indicator bars is the quality of the calibration for each compass.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <source>Compass %1 </source>
-      <translation type="unfinished">Compass %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <source>, </source>
-      <translation type="unfinished">, </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>external</source>
-      <translation type="unfinished">external</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>internal</source>
-      <translation type="unfinished">internal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <source>- Green indicates a well functioning compass.
-</source>
-      <translation type="unfinished">- Green indicates a well functioning compass.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <source>- Yellow indicates a questionable compass or calibration.
-</source>
-      <translation type="unfinished">- Yellow indicates a questionable compass or calibration.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <source>- Red indicates a compass which should not be used.
-
-</source>
-      <translation type="unfinished">- Red indicates a compass which should not be used.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 1</source>
-      <translation type="unfinished">Priority 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 2</source>
-      <translation type="unfinished">Priority 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 3</source>
-      <translation type="unfinished">Priority 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Not Set</source>
-      <translation type="unfinished">Not Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <source>Orientation:</source>
-      <translation type="unfinished">Orientation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <source>Autopilot Rotation:</source>
-      <translation type="unfinished">Autopilot Rotation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <source>Magnetic Declination</source>
-      <translation type="unfinished">Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <source>Manual Magnetic Declination</source>
-      <translation type="unfinished">Manual Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation type="unfinished">This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <source>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </source>
-      <translation type="unfinished">CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <source>It is technically possible to set-up CompassMot using throttle but this is not recommended.</source>
-      <translation type="unfinished">It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <source>Disconnect your props, flip them over and rotate them one position around the frame. </source>
-      <translation type="unfinished">Disconnect your props, flip them over and rotate them one position around the frame. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <source>In this configuration they should push the copter down into the ground when the throttle is raised.</source>
-      <translation type="unfinished">In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <source>Secure the copter (perhaps with tape) so that it does not move.</source>
-      <translation type="unfinished">Secure the copter (perhaps with tape) so that it does not move.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <source>Turn on your transmitter and keep throttle at zero.</source>
-      <translation type="unfinished">Turn on your transmitter and keep throttle at zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <source>Click Ok to start CompassMot calibration.</source>
-      <translation type="unfinished">Click Ok to start CompassMot calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>depth</source>
-      <translation type="unfinished">depth</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>altitude</source>
-      <translation type="unfinished">altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <source>Pressure calibration will set the %1 to zero at the current pressure reading. %2</source>
-      <translation type="unfinished">Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <source>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Accelerometer must be calibrated prior to Compass.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Compass.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Level Horizon.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Baro/Airspeed</source>
-      <translation type="unfinished">Baro/Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Pressure</source>
-      <translation type="unfinished">Pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <source>CompassMot</source>
-      <translation type="unfinished">CompassMot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <source>CompassMot - Compass Motor Interference Calibration</source>
-      <translation type="unfinished">CompassMot - Compass Motor Interference Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="21"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="33"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="186"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="203"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="267"/>
-      <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation type="unfinished">Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="347"/>
-      <source>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</source>
-      <translation type="unfinished">Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="348"/>
-      <source>Quickly bring the throttle back down to zero</source>
-      <translation type="unfinished">Quickly bring the throttle back down to zero</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
-      <source>Press the Next button to complete the calibration</source>
-      <translation type="unfinished">Press the Next button to complete the calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="358"/>
-      <source>Hold the vehicle in its level flight position.</source>
-      <translation type="unfinished">Hold the vehicle in its level flight position.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="367"/>
-      <source>Requesting pressure calibration...</source>
-      <translation type="unfinished">Requesting pressure calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="376"/>
-      <source>Requesting gyro calibration...</source>
-      <translation type="unfinished">Requesting gyro calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="506"/>
-      <source>Successfully completed</source>
-      <translation type="unfinished">Successfully completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="510"/>
-      <source>Failed</source>
-      <translation type="unfinished">Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="302"/>
-      <source>Hold still in the current orientation and press Next when ready</source>
-      <translation type="unfinished">Hold still in the current orientation and press Next when ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="558"/>
-      <source>Compass %1 calibration complete</source>
-      <translation type="unfinished">Compass %1 calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="560"/>
-      <source>Compass %1 calibration below quality threshold</source>
-      <translation type="unfinished">Compass %1 calibration below quality threshold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="579"/>
-      <source>All compasses calibrated successfully</source>
-      <translation type="unfinished">All compasses calibrated successfully</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="580"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="583"/>
-      <source>Compass calibration failed</source>
-      <translation type="unfinished">Compass calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="584"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="588"/>
-      <source>Continue rotating...</source>
-      <translation type="unfinished">Continue rotating...</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <source>Compass </source>
-      <translation type="unfinished">Compass </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <source>Not installed</source>
-      <translation type="unfinished">Not installed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <source>Accelerometer(s)</source>
-      <translation type="unfinished">Accelerometer(s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="21"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="32"/>
-      <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <source>Frame selection</source>
-      <translation type="unfinished">Frame selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <source>Would you like to load the default parameters for the frame ?</source>
-      <translation type="unfinished">Would you like to load the default parameters for the frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <source>Would you like to set the desired frame ?</source>
-      <translation type="unfinished">Would you like to set the desired frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <source>Yes, Load default parameter set for %1</source>
-      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <source>No, set frame only</source>
-      <translation type="unfinished">No, set frame only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <source>Confirm frame %1</source>
-      <translation type="unfinished">Confirm frame %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <source>Git Revision</source>
-      <translation type="unfinished">Git Revision</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <source>Reverse Motor Direction</source>
-      <translation type="unfinished">Reverse Motor Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="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">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.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <source>A 10 second coooldown is required before testing again, please stand by...</source>
-      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
-      <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <source>Automatic Motor Direction Detection</source>
-      <translation type="unfinished">Automatic Motor Direction Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <source>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</source>
-      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="18"/>
-      <source>Tuning</source>
-      <translation type="unfinished">Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="29"/>
-      <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <source>Basic Tuning</source>
-      <translation type="unfinished">Basic Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <source>Roll/Pitch Sensitivity</source>
-      <translation type="unfinished">Roll/Pitch Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
-      <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <source>Climb Sensitivity</source>
-      <translation type="unfinished">Climb Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
-      <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <source>RC Roll/Pitch Feel</source>
-      <translation type="unfinished">RC Roll/Pitch Feel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <source>Slide to the left for soft control, slide to the right for crisp control</source>
-      <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <source>Spin While Armed</source>
-      <translation type="unfinished">Spin While Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <source>Adjust the amount the motors spin to indicate armed</source>
-      <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <source>Minimum Thrust</source>
-      <translation type="unfinished">Minimum Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
-      <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
-      <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <source>AutoTune</source>
-      <translation type="unfinished">AutoTune</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <source>Axes to AutoTune:</source>
-      <translation type="unfinished">Axes to AutoTune:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <source>Channel for AutoTune switch:</source>
-      <translation type="unfinished">Channel for AutoTune switch:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <source>In Flight Tuning</source>
-      <translation type="unfinished">In Flight Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <source>RC Channel 6 Option (Tuning):</source>
-      <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <source>Min:</source>
-      <translation type="unfinished">Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <source>Max:</source>
-      <translation type="unfinished">Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <source>Attitude Controller Parameters</source>
-      <translation type="unfinished">Attitude Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <source>Position Controller Parameters</source>
-      <translation type="unfinished">Position Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <source>Waypoint navigation parameters</source>
-      <translation type="unfinished">Waypoint navigation parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirMapManager</name>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="178"/>
-      <source>AirMap Enabled</source>
-      <translation type="unfinished">AirMap Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="186"/>
-      <source>Failed to create airmap::services::Client instance</source>
-      <translation type="unfinished">Failed to create airmap::services::Client instance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="198"/>
-      <source>No API key for AirMap</source>
-      <translation type="unfinished">No API key for AirMap</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="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">This configuration can only be modified through the Parameter Editor.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
-      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <source>Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
-      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
-      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <source>You&apos;ve connected a %1.</source>
-      <translation type="unfinished">You&apos;ve connected a %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <source>Airframe is not set.</source>
-      <translation type="unfinished">Airframe is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="19"/>
-      <source>Airframe</source>
-      <translation type="unfinished">Airframe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="31"/>
-      <source>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
-      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="85"/>
-      <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation type="unfinished">You cannot change airframe configuration while connected to multiple vehicles.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <source>System ID</source>
-      <translation type="unfinished">System ID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <source>Airframe type</source>
-      <translation type="unfinished">Airframe type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <source>Custom Fw. Ver.</source>
-      <translation type="unfinished">Custom Fw. Ver.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirmapSettings</name>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="67"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="84"/>
-      <source>Enable AirMap Services</source>
-      <translation type="unfinished">Enable AirMap Services</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="89"/>
-      <source>Enable Telemetry</source>
-      <translation type="unfinished">Enable Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="96"/>
-      <source>Show Airspace on Map (Experimental)</source>
-      <translation type="unfinished">Show Airspace on Map (Experimental)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="104"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="113"/>
-      <source>Clear Saved Answers</source>
-      <translation type="unfinished">Clear Saved Answers</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="114"/>
-      <source>All saved ruleset answers will be cleared. Is this really what you want?</source>
-      <translation type="unfinished">All saved ruleset answers will be cleared. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="136"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="205"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="176"/>
-      <source>Login / Registration</source>
-      <translation type="unfinished">Login / Registration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="192"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="292"/>
-      <source>User Name:</source>
-      <translation type="unfinished">User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="208"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="210"/>
-      <source>Anonymous</source>
-      <translation type="unfinished">Anonymous</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="212"/>
-      <source>Authenticated</source>
-      <translation type="unfinished">Authenticated</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="214"/>
-      <source>Authentication Error</source>
-      <translation type="unfinished">Authentication Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="220"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="241"/>
-      <source>Forgot Your AirMap Password?</source>
-      <translation type="unfinished">Forgot Your AirMap Password?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="251"/>
-      <source>Register for an AirMap Account</source>
-      <translation type="unfinished">Register for an AirMap Account</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="272"/>
-      <source>Pilot Profile (WIP)</source>
-      <translation type="unfinished">Pilot Profile (WIP)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="290"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="291"/>
-      <source>John Doe</source>
-      <translation type="unfinished">John Doe</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="293"/>
-      <source>joe36</source>
-      <translation type="unfinished">joe36</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="294"/>
-      <source>Email:</source>
-      <translation type="unfinished">Email:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="295"/>
-      <source>jonh@doe.com</source>
-      <translation type="unfinished">jonh@doe.com</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="296"/>
-      <source>Phone:</source>
-      <translation type="unfinished">Phone:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="297"/>
-      <source>+1 212 555 1212</source>
-      <translation type="unfinished">+1 212 555 1212</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="310"/>
-      <source>License</source>
-      <translation type="unfinished">License</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="329"/>
-      <source>Personal API Key</source>
-      <translation type="unfinished">Personal API Key</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="339"/>
-      <source>API Key:</source>
-      <translation type="unfinished">API Key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="341"/>
-      <source>Client ID:</source>
-      <translation type="unfinished">Client ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="355"/>
-      <source>Flight List Management</source>
-      <translation type="unfinished">Flight List Management</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="367"/>
-      <source>Show Flight List</source>
-      <translation type="unfinished">Show Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="421"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="433"/>
-      <source>Created</source>
-      <translation type="unfinished">Created</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="448"/>
-      <source>Flight Start</source>
-      <translation type="unfinished">Flight Start</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="463"/>
-      <source>Flight End</source>
-      <translation type="unfinished">Flight End</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="478"/>
-      <source>State</source>
-      <translation type="unfinished">State</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Active</source>
-      <translation type="unfinished">Active</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="499"/>
-      <source>Loading Flight List</source>
-      <translation type="unfinished">Loading Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="531"/>
-      <source>Flight List</source>
-      <translation type="unfinished">Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="546"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="555"/>
-      <source>From</source>
-      <translation type="unfinished">From</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="576"/>
-      <source>To</source>
-      <translation type="unfinished">To</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="593"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="609"/>
-      <source>End Selected</source>
-      <translation type="unfinished">End Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="627"/>
-      <source>End Flight</source>
-      <translation type="unfinished">End Flight</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="628"/>
-      <source>Confirm ending active flight?</source>
-      <translation type="unfinished">Confirm ending active flight?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="642"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source> Flights Loaded</source>
-      <translation type="unfinished"> Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source>No Flights Loaded</source>
-      <translation type="unfinished">No Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="657"/>
-      <source>A maximum of 250 flights were loaded</source>
-      <translation type="unfinished">A maximum of 250 flights were loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="665"/>
-      <source>Flight Area </source>
-      <translation type="unfinished">Flight Area </translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceAdvisory</name>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="30"/>
-      <source>Airport</source>
-      <translation type="unfinished">Airport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="31"/>
-      <source>Controlled Airspace</source>
-      <translation type="unfinished">Controlled Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="32"/>
-      <source>Special Use Airspace</source>
-      <translation type="unfinished">Special Use Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="33"/>
-      <source>TFR</source>
-      <translation type="unfinished">TFR</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="34"/>
-      <source>Wild Fire</source>
-      <translation type="unfinished">Wild Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="35"/>
-      <source>Park</source>
-      <translation type="unfinished">Park</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="36"/>
-      <source>Power Plant</source>
-      <translation type="unfinished">Power Plant</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="37"/>
-      <source>Heliport</source>
-      <translation type="unfinished">Heliport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="38"/>
-      <source>Prison</source>
-      <translation type="unfinished">Prison</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="39"/>
-      <source>School</source>
-      <translation type="unfinished">School</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="40"/>
-      <source>Hospital</source>
-      <translation type="unfinished">Hospital</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="41"/>
-      <source>Fire</source>
-      <translation type="unfinished">Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="42"/>
-      <source>Emergency</source>
-      <translation type="unfinished">Emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="43"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="44"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceControl</name>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="109"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="200"/>
-      <source>Airspace</source>
-      <translation type="unfinished">Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="113"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="204"/>
-      <source> Advisories</source>
-      <translation type="unfinished"> Advisories</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="130"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="280"/>
-      <source>Airspace Regulations</source>
-      <translation type="unfinished">Airspace Regulations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="285"/>
-      <source>Advisories based on the selected rules.</source>
-      <translation type="unfinished">Advisories based on the selected rules.</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="326"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>File Flight Plan</source>
-      <translation type="unfinished">File Flight Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="384"/>
-      <source>Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</source>
-      <translation type="unfinished">Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="434"/>
-      <source>Airspace Regulation Options</source>
-      <translation type="unfinished">Airspace Regulation Options</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="456"/>
-      <source>PICK ONE REGULATION</source>
-      <translation type="unfinished">PICK ONE REGULATION</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="477"/>
-      <source>OPTIONAL</source>
-      <translation type="unfinished">OPTIONAL</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="497"/>
-      <source>REQUIRED</source>
-      <translation type="unfinished">REQUIRED</translation>
-    </message>
-  </context>
-  <context>
-    <name>AltModeDialog</name>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
-      <source>Select Altitude Mode</source>
-      <translation type="unfinished">Select Altitude Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="47"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="48"/>
-      <source>Specified altitudes are relative to launch position height.</source>
-      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="53"/>
-      <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
-      <source>Calculated Above Terrain</source>
-      <translation type="unfinished">Calculated Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="58"/>
-      <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="63"/>
-      <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="68"/>
-      <source>The altitude mode can differ for each individual item.</source>
-      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppLogModel</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.cc" line="108"/>
-      <source>Open console log output file failed %1 : %2</source>
-      <translation type="unfinished">Open console log output file failed %1 : %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppMessages</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
-      <source>GStreamer Debug Level</source>
-      <translation type="unfinished">GStreamer Debug Level</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
-      <source>Logging categories</source>
-      <translation type="unfinished">Logging categories</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="170"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="181"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="189"/>
-      <source>Clear All</source>
-      <translation type="unfinished">Clear All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>Log files (*.txt)</source>
-      <translation type="unfinished">Log files (*.txt)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
-      <source>Select log save file</source>
-      <translation type="unfinished">Select log save file</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
-      <source>Save App Log</source>
-      <translation type="unfinished">Save App Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
-      <source>Show Latest</source>
-      <translation type="unfinished">Show Latest</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
-      <source>Set Logging</source>
-      <translation type="unfinished">Set Logging</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppSettings</name>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="30"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="31"/>
-      <source>Telemetry</source>
-      <translation type="unfinished">Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="32"/>
-      <source>Missions</source>
-      <translation type="unfinished">Missions</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="33"/>
-      <source>Logs</source>
-      <translation type="unfinished">Logs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="34"/>
-      <source>Video</source>
-      <translation type="unfinished">Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="35"/>
-      <source>Photo</source>
-      <translation type="unfinished">Photo</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="36"/>
-      <source>CrashLogs</source>
-      <translation type="unfinished">CrashLogs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="182"/>
-      <source> (Partial)</source>
-      <translation type="unfinished"> (Partial)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="191"/>
-      <source> (Test only)</source>
-      <translation type="unfinished"> (Test only)</translation>
-    </message>
-  </context>
-  <context>
-    <name>ArmedIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-  </context>
-  <context>
-    <name>AudioOutput</name>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="155"/>
-      <source> negative </source>
-      <translation type="unfinished"> negative </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="166"/>
-      <source> point </source>
-      <translation type="unfinished"> point </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="177"/>
-      <source> meters</source>
-      <translation type="unfinished"> meters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
-      <source>One or more vehicle components require setup prior to flight.</source>
-      <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Autotune</name>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="37"/>
-      <source>Autotune: In progress</source>
-      <translation type="unfinished">Autotune: In progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="90"/>
-      <source>Autotune: initializing</source>
-      <translation type="unfinished">Autotune: initializing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="93"/>
-      <source>Autotune: roll</source>
-      <translation type="unfinished">Autotune: roll</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="96"/>
-      <source>Autotune: pitch</source>
-      <translation type="unfinished">Autotune: pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="99"/>
-      <source>Autotune: yaw</source>
-      <translation type="unfinished">Autotune: yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="102"/>
-      <source>Wait for disarm</source>
-      <translation type="unfinished">Wait for disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
-      <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="110"/>
-      <source>Autotune: in progress</source>
-      <translation type="unfinished">Autotune: in progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
-      <source>Autotune: Success</source>
-      <translation type="unfinished">Autotune: Success</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="119"/>
-      <source>Autotune successful.</source>
-      <translation type="unfinished">Autotune successful.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="122"/>
-      <source>Autotune: Unknown error</source>
-      <translation type="unfinished">Autotune: Unknown error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="134"/>
-      <source>Autotune: Failed</source>
-      <translation type="unfinished">Autotune: Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="144"/>
-      <source>Autotune: Ack error %1</source>
-      <translation type="unfinished">Autotune: Ack error %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.h" line="59"/>
-      <source>Autotune: Not performed</source>
-      <translation type="unfinished">Autotune: Not performed</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutotuneUI</name>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="27"/>
-      <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="37"/>
-      <source>WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</source>
-      <translation type="unfinished">WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>AxisMonitor</name>
-    <message>
-      <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-  </context>
-  <context>
-    <name>BatteryIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="82"/>
-      <source>100%</source>
-      <translation type="unfinished">100%</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="145"/>
-      <source>Battery Status</source>
-      <translation type="unfinished">Battery Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="168"/>
-      <source>Battery %1</source>
-      <translation type="unfinished">Battery %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="169"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="170"/>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="171"/>
-      <source>Remaining</source>
-      <translation type="unfinished">Remaining</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="172"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="173"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="174"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="175"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-  </context>
-  <context>
-    <name>BlankPlanCreator</name>
-    <message>
-      <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
-      <source>Blank</source>
-      <translation type="unfinished">Blank</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothConfiguration</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="222"/>
-      <source>Bluetooth Link Settings</source>
-      <translation type="unfinished">Bluetooth Link Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="224"/>
-      <source>Bluetooth Not Available</source>
-      <translation type="unfinished">Bluetooth Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothLink</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="185"/>
-      <source>Bluetooth Link Error</source>
-      <translation type="unfinished">Bluetooth Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="31"/>
-      <source>Device</source>
-      <translation type="unfinished">Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="37"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="44"/>
-      <source>Bluetooth Devices</source>
-      <translation type="unfinished">Bluetooth Devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="67"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="73"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-  </context>
-  <context>
-    <name>Bootloader</name>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="224"/>
-      <source>Write failed: %1</source>
-      <translation type="unfinished">Write failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="229"/>
-      <source>Incorrect number of bytes returned for write: actual(%1) expected(%2)</source>
-      <translation type="unfinished">Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="250"/>
-      <source>Timeout waiting for bytes to be available</source>
-      <translation type="unfinished">Timeout waiting for bytes to be available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="260"/>
-      <source>Read failed: error: %1</source>
-      <translation type="unfinished">Read failed: error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="274"/>
-      <source>Get Command Response: </source>
-      <translation type="unfinished">Get Command Response: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="280"/>
-      <source>Invalid sync response: 0x%1 0x%2</source>
-      <translation type="unfinished">Invalid sync response: 0x%1 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="283"/>
-      <source>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</source>
-      <translation type="unfinished">This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="286"/>
-      <source>Unknown response code</source>
-      <translation type="unfinished">Unknown response code</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="292"/>
-      <source>Command failed: 0x%1 (%2)</source>
-      <translation type="unfinished">Command failed: 0x%1 (%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="156"/>
-      <source>Get Board Info: </source>
-      <translation type="unfinished">Get Board Info: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="342"/>
-      <source>Send Command: </source>
-      <translation type="unfinished">Send Command: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="350"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="516"/>
-      <source>Unable to open firmware file %1: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="371"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="541"/>
-      <source>Firmware file read failed: %1</source>
-      <translation type="unfinished">Firmware file read failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="387"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="470"/>
-      <source>Flash failed: %1 at address 0x%2</source>
-      <translation type="unfinished">Flash failed: %1 at address 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="421"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="593"/>
-      <source>Unable to retrieve block from ihx: index %1</source>
-      <translation type="unfinished">Unable to retrieve block from ihx: index %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="441"/>
-      <source>Unable to set flash start address: 0x%2</source>
-      <translation type="unfinished">Unable to set flash start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="559"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="644"/>
-      <source>Read failed: %1 at address: 0x%2</source>
-      <translation type="unfinished">Read failed: %1 at address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="565"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="652"/>
-      <source>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</source>
-      <translation type="unfinished">Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="613"/>
-      <source>Unable to set read start address: 0x%2</source>
-      <translation type="unfinished">Unable to set read start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="689"/>
-      <source>CRC mismatch: board(0x%1) file(0x%2)</source>
-      <translation type="unfinished">CRC mismatch: board(0x%1) file(0x%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="40"/>
-      <source>Open failed on port %1: %2</source>
-      <translation type="unfinished">Open failed on port %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="92"/>
-      <source>Unable to put radio into command mode +++</source>
-      <translation type="unfinished">Unable to put radio into command mode +++</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="97"/>
-      <source>Radio did not respond to command mode</source>
-      <translation type="unfinished">Radio did not respond to command mode</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="105"/>
-      <source>Radio did not respond to ATI2 command</source>
-      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="112"/>
-      <source>Radio did not return board id</source>
-      <translation type="unfinished">Radio did not return board id</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="129"/>
-      <source>Found unsupported bootloader version: %1</source>
-      <translation type="unfinished">Found unsupported bootloader version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="165"/>
-      <source>Unable to reboot radio (ready read)</source>
-      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="181"/>
-      <source>Erase failed: %1</source>
-      <translation type="unfinished">Erase failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="319"/>
-      <source>Get Device: </source>
-      <translation type="unfinished">Get Device: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="747"/>
-      <source>Get Board Id: </source>
-      <translation type="unfinished">Get Board Id: </translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalc</name>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="238"/>
-      <source>CameraCalc section version %1 not supported</source>
-      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="310"/>
-      <source>Custom Camera</source>
-      <translation type="unfinished">Custom Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="315"/>
-      <source>Manual (no camera specs)</source>
-      <translation type="unfinished">Manual (no camera specs)</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcCamera</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="108"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="112"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="120"/>
-      <source>Sensor</source>
-      <translation type="unfinished">Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="135"/>
-      <source>Image</source>
-      <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="150"/>
-      <source>Focal length</source>
-      <translation type="unfinished">Focal length</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcGrid</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="47"/>
-      <source>Front Lap</source>
-      <translation type="unfinished">Front Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="51"/>
-      <source>Side Lap</source>
-      <translation type="unfinished">Side Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="59"/>
-      <source>Overlap</source>
-      <translation type="unfinished">Overlap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="72"/>
-      <source>Select one:</source>
-      <translation type="unfinished">Select one:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="102"/>
-      <source>Grnd Res</source>
-      <translation type="unfinished">Grnd Res</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <source>Vehicle must be restarted for changes to take effect.</source>
-      <translation type="unfinished">Vehicle must be restarted for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <source>Camera Trigger Settings</source>
-      <translation type="unfinished">Camera Trigger Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <source>Time Interval</source>
-      <translation type="unfinished">Time Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <source>Distance Interval</source>
-      <translation type="unfinished">Distance Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <source>Hardware Settings</source>
-      <translation type="unfinished">Hardware Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <source>AUX Pin Assignment</source>
-      <translation type="unfinished">AUX Pin Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <source>Trigger Pin Polarity</source>
-      <translation type="unfinished">Trigger Pin Polarity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <source>Trigger Period</source>
-      <translation type="unfinished">Trigger Period</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="21"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="32"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <source>Time interval</source>
-      <translation type="unfinished">Time interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <source>Distance interval</source>
-      <translation type="unfinished">Distance interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <source>AUX pins</source>
-      <translation type="unfinished">AUX pins</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <source>AUX pin polarity</source>
-      <translation type="unfinished">AUX pin polarity</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraSection</name>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="29"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="54"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="70"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="87"/>
-      <source>Mode</source>
-      <translation type="unfinished">Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="107"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="108"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropButton</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="162"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="165"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="177"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="212"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
-      <source>Follow Vehicle</source>
-      <translation type="unfinished">Follow Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropPanel</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="29"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="32"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="43"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="86"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-  </context>
-  <context>
-    <name>CompInfoParam</name>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="135"/>
-      <source>Component %1</source>
-      <translation type="unfinished">Component %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="262"/>
-      <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplexMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="57"/>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="63"/>
-      <source>This Pattern does not support Presets.</source>
-      <translation type="unfinished">This Pattern does not support Presets.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="69"/>
-      <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplianceRules</name>
-    <message>
-      <location filename="../src/Airmap/ComplianceRules.qml" line="102"/>
-      <source>Rule</source>
-      <translation type="unfinished">Rule</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="124"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="131"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
-      <source>Corridor Scan</source>
-      <translation type="unfinished">Corridor Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="54"/>
-      <source>C</source>
-      <translation type="unfinished">C</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanEditor</name>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="19"/>
-      <source>Corridor</source>
-      <translation type="unfinished">Corridor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="38"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="45"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="18"/>
-      <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="56"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-  </context>
-  <context>
-    <name>DebugWindow</name>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="38"/>
-      <source>Qt Platform:</source>
-      <translation type="unfinished">Qt Platform:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="48"/>
-      <source>Font Point Size 10</source>
-      <translation type="unfinished">Font Point Size 10</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="54"/>
-      <source>Default font width:</source>
-      <translation type="unfinished">Default font width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="64"/>
-      <source>Font Point Size 10.5</source>
-      <translation type="unfinished">Font Point Size 10.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="70"/>
-      <source>Default font height:</source>
-      <translation type="unfinished">Default font height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="80"/>
-      <source>Font Point Size 11</source>
-      <translation type="unfinished">Font Point Size 11</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="86"/>
-      <source>Default font pixel size:</source>
-      <translation type="unfinished">Default font pixel size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="96"/>
-      <source>Font Point Size 11.5</source>
-      <translation type="unfinished">Font Point Size 11.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="102"/>
-      <source>Default font point size:</source>
-      <translation type="unfinished">Default font point size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="112"/>
-      <source>Font Point Size 12</source>
-      <translation type="unfinished">Font Point Size 12</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="118"/>
-      <source>QML Screen Desktop:</source>
-      <translation type="unfinished">QML Screen Desktop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="128"/>
-      <source>Font Point Size 12.5</source>
-      <translation type="unfinished">Font Point Size 12.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="134"/>
-      <source>QML Screen Size:</source>
-      <translation type="unfinished">QML Screen Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="144"/>
-      <source>Font Point Size 13</source>
-      <translation type="unfinished">Font Point Size 13</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="150"/>
-      <source>QML Pixel Density:</source>
-      <translation type="unfinished">QML Pixel Density:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="160"/>
-      <source>Font Point Size 13.5</source>
-      <translation type="unfinished">Font Point Size 13.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="166"/>
-      <source>QML Pixel Ratio:</source>
-      <translation type="unfinished">QML Pixel Ratio:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="176"/>
-      <source>Font Point Size 14</source>
-      <translation type="unfinished">Font Point Size 14</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="182"/>
-      <source>Default Point:</source>
-      <translation type="unfinished">Default Point:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="192"/>
-      <source>Font Point Size 14.5</source>
-      <translation type="unfinished">Font Point Size 14.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="198"/>
-      <source>Computed Font Height:</source>
-      <translation type="unfinished">Computed Font Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="208"/>
-      <source>Font Point Size 15</source>
-      <translation type="unfinished">Font Point Size 15</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="214"/>
-      <source>Computed Screen Height:</source>
-      <translation type="unfinished">Computed Screen Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="224"/>
-      <source>Font Point Size 15.5</source>
-      <translation type="unfinished">Font Point Size 15.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="230"/>
-      <source>Computed Screen Width:</source>
-      <translation type="unfinished">Computed Screen Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="240"/>
-      <source>Font Point Size 16</source>
-      <translation type="unfinished">Font Point Size 16</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="246"/>
-      <source>Desktop Available Width:</source>
-      <translation type="unfinished">Desktop Available Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="256"/>
-      <source>Font Point Size 16.5</source>
-      <translation type="unfinished">Font Point Size 16.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="262"/>
-      <source>Desktop Available Height:</source>
-      <translation type="unfinished">Desktop Available Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="272"/>
-      <source>Font Point Size 17</source>
-      <translation type="unfinished">Font Point Size 17</translation>
-    </message>
-  </context>
-  <context>
-    <name>DefaultChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
-      <source>Generic Initial checks</source>
-      <translation type="unfinished">Generic Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266Component</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="33"/>
-      <source>controller WiFi Bridge</source>
-      <translation type="unfinished">controller WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="66"/>
-      <source>Error fetching WiFi Bridge Status: %1</source>
-      <translation type="unfinished">Error fetching WiFi Bridge Status: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="116"/>
-      <source>ESP WiFi Bridge Settings</source>
-      <translation type="unfinished">ESP WiFi Bridge Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="143"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="159"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="176"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="192"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="208"/>
-      <source>WiFi STA SSID</source>
-      <translation type="unfinished">WiFi STA SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="225"/>
-      <source>WiFi STA Password</source>
-      <translation type="unfinished">WiFi STA Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="242"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="258"/>
-      <source>QGC UDP Port</source>
-      <translation type="unfinished">QGC UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="277"/>
-      <source>ESP WiFi Bridge Status</source>
-      <translation type="unfinished">ESP WiFi Bridge Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
-      <source>Bridge/Vehicle Link</source>
-      <translation type="unfinished">Bridge/Vehicle Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
-      <source>Bridge/QGC Link</source>
-      <translation type="unfinished">Bridge/QGC Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="298"/>
-      <source>QGC/Bridge Link</source>
-      <translation type="unfinished">QGC/Bridge Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="304"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="319"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="333"/>
-      <source>Messages Received</source>
-      <translation type="unfinished">Messages Received</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="360"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="374"/>
-      <source>Messages Lost</source>
-      <translation type="unfinished">Messages Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="388"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="416"/>
-      <source>Messages Sent</source>
-      <translation type="unfinished">Messages Sent</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="433"/>
-      <source>Restore Defaults</source>
-      <translation type="unfinished">Restore Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="440"/>
-      <source>Restart WiFi Bridge</source>
-      <translation type="unfinished">Restart WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="451"/>
-      <source>Reboot WiFi Bridge</source>
-      <translation type="unfinished">Reboot WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="452"/>
-      <source>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</source>
-      <translation type="unfinished">This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="463"/>
-      <source>Reset Counters</source>
-      <translation type="unfinished">Reset Counters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="16"/>
-      <source>WiFi Bridge</source>
-      <translation type="unfinished">WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="28"/>
-      <source>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</source>
-      <translation type="unfinished">The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266ComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="29"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="33"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="37"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="42"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="46"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="60"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>EditPositionDialog</name>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="51"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="59"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="67"/>
-      <source>Set Geographic</source>
-      <translation type="unfinished">Set Geographic</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="79"/>
-      <source>Zone</source>
-      <translation type="unfinished">Zone</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="87"/>
-      <source>Hemisphere</source>
-      <translation type="unfinished">Hemisphere</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="96"/>
-      <source>Easting</source>
-      <translation type="unfinished">Easting</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="104"/>
-      <source>Northing</source>
-      <translation type="unfinished">Northing</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="112"/>
-      <source>Set UTM</source>
-      <translation type="unfinished">Set UTM</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
-      <source>MGRS</source>
-      <translation type="unfinished">MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
-      <source>Set MGRS</source>
-      <translation type="unfinished">Set MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
-      <source>Set From Vehicle Position</source>
-      <translation type="unfinished">Set From Vehicle Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>ExitWithErrorWindow</name>
-    <message>
-      <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FTPManager</name>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="234"/>
-      <source>Invalid Nak format</source>
-      <translation type="unfinished">Invalid Nak format</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="236"/>
-      <source>errno %1</source>
-      <translation type="unfinished">errno %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="131"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="258"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="280"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="293"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="297"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="402"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="411"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="449"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="484"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="530"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="539"/>
-      <source>Download failed</source>
-      <translation type="unfinished">Download failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="368"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="497"/>
-      <source>Download failed: Error saving file</source>
-      <translation type="unfinished">Download failed: Error saving file</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="166"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="322"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="326"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="201"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="152"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="239"/>
-      <source>* Approximate glide slope altitudes.</source>
-      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="248"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="257"/>
-      <source>* Avoid tailwind on landing.</source>
-      <translation type="unfinished">* Avoid tailwind on landing.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="283"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="290"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="332"/>
-      <source>Landing Area</source>
-      <translation type="unfinished">Landing Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="370"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-  </context>
-  <context>
-    <name>Fact</name>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="247"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>true</source>
-      <translation type="unfinished">true</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>false</source>
-      <translation type="unfinished">false</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="745"/>
-      <source>Change of parameter %1 requires a Vehicle reboot to take effect.</source>
-      <translation type="unfinished">Change of parameter %1 requires a Vehicle reboot to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="747"/>
-      <source>Change of &apos;%1&apos; value requires restart of %2 to take effect.</source>
-      <translation type="unfinished">Change of &apos;%1&apos; value requires restart of %2 to take effect.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactMetaData</name>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="39"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="40"/>
-      <source>Misc</source>
-      <translation type="unfinished">Misc</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="461"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="469"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="479"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="487"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="495"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="504"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="549"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="557"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="567"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="575"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="583"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="592"/>
-      <source>Value must be within %1 and %2</source>
-      <translation type="unfinished">Value must be within %1 and %2</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="523"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="611"/>
-      <source>Invalid number</source>
-      <translation type="unfinished">Invalid number</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactTextField</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="36"/>
-      <source>Invalid Value</source>
-      <translation type="unfinished">Invalid Value</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="40"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
-      <source>Default</source>
-      <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
-      <source>Small</source>
-      <translation type="unfinished">Small</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
-      <source>Large</source>
-      <translation type="unfinished">Large</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
-      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Load Settings</source>
-      <translation type="unfinished">Load Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueSlider</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactValueSlider.qml" line="100"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>Firmware Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="73"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="75"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="77"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareImage</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="143"/>
-      <source>Incorrectly formatted line in .ihx file, line too short</source>
-      <translation type="unfinished">Incorrectly formatted line in .ihx file, line too short</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="148"/>
-      <source>Unsupported record type in file: %1</source>
-      <translation type="unfinished">Unsupported record type in file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="218"/>
-      <source>Unable to open firmware file %1, error: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="227"/>
-      <source>Supplied file is not a valid JSON document</source>
-      <translation type="unfinished">Supplied file is not a valid JSON document</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="238"/>
-      <source>Firmware file missing required key: %1</source>
-      <translation type="unfinished">Firmware file missing required key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="248"/>
-      <source>Firmware file has invalid key: %1</source>
-      <translation type="unfinished">Firmware file has invalid key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="254"/>
-      <source>Downloaded firmware board id does not match hardware board id: %1 != %2</source>
-      <translation type="unfinished">Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="276"/>
-      <source>Write failed for parameter meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for parameter meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="283"/>
-      <source>Unable to open parameter meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open parameter meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="305"/>
-      <source>Write failed for airframe meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for airframe meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="312"/>
-      <source>Unable to open airframe meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open airframe meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="338"/>
-      <source>Unable to open decompressed file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open decompressed file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="344"/>
-      <source>Write failed for decompressed image file, error: %1</source>
-      <translation type="unfinished">Write failed for decompressed image file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="368"/>
-      <source>Firmware file has invalid decompressed size for %1</source>
-      <translation type="unfinished">Firmware file has invalid decompressed size for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="380"/>
-      <source>Could not find compressed bytes for %1 in Firmware file</source>
-      <translation type="unfinished">Could not find compressed bytes for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="385"/>
-      <source>Incorrectly formed compressed bytes section for %1 in Firmware file</source>
-      <translation type="unfinished">Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="401"/>
-      <source>Firmware file has 0 length %1</source>
-      <translation type="unfinished">Firmware file has 0 length %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="405"/>
-      <source>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</source>
-      <translation type="unfinished">Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="409"/>
-      <source>Successfully decompressed %1</source>
-      <translation type="unfinished">Successfully decompressed %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="437"/>
-      <source>Unabled to open firmware file %1, %2</source>
-      <translation type="unfinished">Unabled to open firmware file %1, %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="347"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="364"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="381"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="398"/>
-      <source>Canon</source>
-      <translation type="unfinished">Canon</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="348"/>
-      <source>S100 PowerShot</source>
-      <translation type="unfinished">S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="357"/>
-      <source>Canon S100 PowerShot</source>
-      <translation type="unfinished">Canon S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="365"/>
-      <source>EOS-M 22mm</source>
-      <translation type="unfinished">EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="374"/>
-      <source>Canon EOS-M 22mm</source>
-      <translation type="unfinished">Canon EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="382"/>
-      <source>G9 X PowerShot</source>
-      <translation type="unfinished">G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="391"/>
-      <source>Canon G9 X PowerShot</source>
-      <translation type="unfinished">Canon G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="399"/>
-      <source>SX260 HS PowerShot</source>
-      <translation type="unfinished">SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="408"/>
-      <source>Canon SX260 HS PowerShot</source>
-      <translation type="unfinished">Canon SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="414"/>
-      <source>GoPro</source>
-      <translation type="unfinished">GoPro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="415"/>
-      <source>Hero 4</source>
-      <translation type="unfinished">Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="424"/>
-      <source>GoPro Hero 4</source>
-      <translation type="unfinished">GoPro Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="430"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="446"/>
-      <source>Parrot</source>
-      <translation type="unfinished">Parrot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="431"/>
-      <source>Sequioa RGB</source>
-      <translation type="unfinished">Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="440"/>
-      <source>Parrot Sequioa RGB</source>
-      <translation type="unfinished">Parrot Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="447"/>
-      <source>Sequioa Monochrome</source>
-      <translation type="unfinished">Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="456"/>
-      <source>Parrot Sequioa Monochrome</source>
-      <translation type="unfinished">Parrot Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="462"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="463"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="472"/>
-      <source>RedEdge</source>
-      <translation type="unfinished">RedEdge</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="479"/>
-      <source>Ricoh</source>
-      <translation type="unfinished">Ricoh</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="480"/>
-      <source>GR II</source>
-      <translation type="unfinished">GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="489"/>
-      <source>Ricoh GR II</source>
-      <translation type="unfinished">Ricoh GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="495"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="511"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="527"/>
-      <source>Sentera</source>
-      <translation type="unfinished">Sentera</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="496"/>
-      <source>Double 4K Sensor</source>
-      <translation type="unfinished">Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="505"/>
-      <source>Sentera Double 4K Sensor</source>
-      <translation type="unfinished">Sentera Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="512"/>
-      <source>NDVI Single Sensor</source>
-      <translation type="unfinished">NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="521"/>
-      <source>Sentera NDVI Single Sensor</source>
-      <translation type="unfinished">Sentera NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="528"/>
-      <source>6X Sensor</source>
-      <translation type="unfinished">6X Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="545"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="561"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="577"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="593"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="609"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="625"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="641"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="657"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="673"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="689"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="705"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="724"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="742"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="759"/>
-      <source>Sony</source>
-      <translation type="unfinished">Sony</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="546"/>
-      <source>a6000 16mm</source>
-      <translation type="unfinished">a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="555"/>
-      <source>Sony a6000 16mm</source>
-      <translation type="unfinished">Sony a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="562"/>
-      <source>a6000 35mm</source>
-      <translation type="unfinished">a6000 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="578"/>
-      <source>a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="587"/>
-      <source>Sony a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="594"/>
-      <source>a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="603"/>
-      <source>Sony a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="610"/>
-      <source>a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="619"/>
-      <source>Sony a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="626"/>
-      <source>a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="635"/>
-      <source>Sony a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="642"/>
-      <source>a7r III 35mm</source>
-      <translation type="unfinished">a7r III 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="658"/>
-      <source>a7r IV 35mm</source>
-      <translation type="unfinished">a7r IV 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="674"/>
-      <source>DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="683"/>
-      <source>Sony DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">Sony DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="690"/>
-      <source>DSC-RX0</source>
-      <translation type="unfinished">DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="699"/>
-      <source>Sony DSC-RX0</source>
-      <translation type="unfinished">Sony DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="706"/>
-      <source>DSC-RX1R II 35mm</source>
-      <translation type="unfinished">DSC-RX1R II 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="725"/>
-      <source>ILCE-QX1</source>
-      <translation type="unfinished">ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="734"/>
-      <source>Sony ILCE-QX1</source>
-      <translation type="unfinished">Sony ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="743"/>
-      <source>NEX-5R 20mm</source>
-      <translation type="unfinished">NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="752"/>
-      <source>Sony NEX-5R 20mm</source>
-      <translation type="unfinished">Sony NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="760"/>
-      <source>RX100 II 28mm</source>
-      <translation type="unfinished">RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="769"/>
-      <source>Sony RX100 II 28mm</source>
-      <translation type="unfinished">Sony RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="775"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="791"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="807"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="823"/>
-      <source>Yuneec</source>
-      <translation type="unfinished">Yuneec</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="776"/>
-      <source>CGOET</source>
-      <translation type="unfinished">CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="785"/>
-      <source>Yuneec CGOET</source>
-      <translation type="unfinished">Yuneec CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="792"/>
-      <source>E10T</source>
-      <translation type="unfinished">E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="801"/>
-      <source>Yuneec E10T</source>
-      <translation type="unfinished">Yuneec E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="808"/>
-      <source>E50</source>
-      <translation type="unfinished">E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="817"/>
-      <source>Yuneec E50</source>
-      <translation type="unfinished">Yuneec E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="824"/>
-      <source>E90</source>
-      <translation type="unfinished">E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="833"/>
-      <source>Yuneec E90</source>
-      <translation type="unfinished">Yuneec E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="839"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="855"/>
-      <source>Flir</source>
-      <translation type="unfinished">Flir</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="840"/>
-      <source>Duo R</source>
-      <translation type="unfinished">Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="849"/>
-      <source>Flir Duo R</source>
-      <translation type="unfinished">Flir Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="856"/>
-      <source>Duo Pro R</source>
-      <translation type="unfinished">Duo Pro R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="871"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="887"/>
-      <source>Workswell</source>
-      <translation type="unfinished">Workswell</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="872"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="888"/>
-      <source>Wiris Security</source>
-      <translation type="unfinished">Wiris Security</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="1061"/>
-      <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
-      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="28"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="44"/>
-      <source>Firmware Setup</source>
-      <translation type="unfinished">Firmware Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="47"/>
-      <source>%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</source>
-      <translation type="unfinished">%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="48"/>
-      <source>Update the autopilot firmware to the latest version</source>
-      <translation type="unfinished">Update the autopilot firmware to the latest version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="52"/>
-      <source>All %1 connections to vehicles must be </source>
-      <translation type="unfinished">All %1 connections to vehicles must be </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="70"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="82"/>
-      <source>Select Firmware File</source>
-      <translation type="unfinished">Select Firmware File</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
-      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="127"/>
-      <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
-      <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="128"/>
-      <source>Detected [%1]: </source>
-      <translation type="unfinished">Detected [%1]: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="135"/>
-      <source>Found device</source>
-      <translation type="unfinished">Found device</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="177"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="331"/>
-      <source>PX4 Pro </source>
-      <translation type="unfinished">PX4 Pro </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="242"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="276"/>
-      <source>Standard Version (stable)</source>
-      <translation type="unfinished">Standard Version (stable)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="246"/>
-      <source>Beta Testing (beta)</source>
-      <translation type="unfinished">Beta Testing (beta)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="250"/>
-      <source>Developer Build (master)</source>
-      <translation type="unfinished">Developer Build (master)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="254"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="280"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="293"/>
-      <source>Custom firmware file...</source>
-      <translation type="unfinished">Custom firmware file...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="263"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="267"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="344"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="289"/>
-      <source>Standard Version</source>
-      <translation type="unfinished">Standard Version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="313"/>
-      <source>Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</source>
-      <translation type="unfinished">Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="314"/>
-      <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
-      <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="315"/>
-      <source>Press Ok to upgrade your vehicle.</source>
-      <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="318"/>
-      <source>Flight Stack</source>
-      <translation type="unfinished">Flight Stack</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="386"/>
-      <source>Downloading list of available firmwares...</source>
-      <translation type="unfinished">Downloading list of available firmwares...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="394"/>
-      <source>No Firmware Available</source>
-      <translation type="unfinished">No Firmware Available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="444"/>
-      <source>Select the standard version or one from the file system (previously downloaded):</source>
-      <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="445"/>
-      <source>Select which version of the firmware you would like to install:</source>
-      <translation type="unfinished">Select which version of the firmware you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="446"/>
-      <source>Select which version of the above flight stack you would like to install:</source>
-      <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="461"/>
-      <source>WARNING: BETA FIRMWARE. </source>
-      <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="462"/>
-      <source>This firmware version is ONLY intended for beta testers. </source>
-      <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="463"/>
-      <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
-      <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="464"/>
-      <source>Do NOT use for normal operation.</source>
-      <translation type="unfinished">Do NOT use for normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="467"/>
-      <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
-      <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="468"/>
-      <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
-      <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="469"/>
-      <source>It is only intended for DEVELOPERS. </source>
-      <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="470"/>
-      <source>Run bench tests without props first. </source>
-      <translation type="unfinished">Run bench tests without props first. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="471"/>
-      <source>Do NOT fly this without additional safety precautions. </source>
-      <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="472"/>
-      <source>Follow the forums actively when using it.</source>
-      <translation type="unfinished">Follow the forums actively when using it.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="512"/>
-      <source>Flash ChibiOS Bootloader</source>
-      <translation type="unfinished">Flash ChibiOS Bootloader</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgradeController</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="162"/>
-      <source>Connect not allowed during Firmware Upgrade.</source>
-      <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="280"/>
-      <source>Connected to bootloader:</source>
-      <translation type="unfinished">Connected to bootloader:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="281"/>
-      <source>  Version: %1</source>
-      <translation type="unfinished">  Version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="282"/>
-      <source>  Board ID: %1</source>
-      <translation type="unfinished">  Board ID: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="283"/>
-      <source>  Flash size: %1</source>
-      <translation type="unfinished">  Flash size: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="366"/>
-      <source>Custom firmware selected but no filename given.</source>
-      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="371"/>
-      <source>Unable to find specified firmware for board type</source>
-      <translation type="unfinished">Unable to find specified firmware for board type</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="377"/>
-      <source>No firmware file selected</source>
-      <translation type="unfinished">No firmware file selected</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="388"/>
-      <source>Downloading firmware...</source>
-      <translation type="unfinished">Downloading firmware...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="389"/>
-      <source> From: %1</source>
-      <translation type="unfinished"> From: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="410"/>
-      <source>Download complete</source>
-      <translation type="unfinished">Download complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="418"/>
-      <source>Image load failed</source>
-      <translation type="unfinished">Image load failed</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="424"/>
-      <source>Bootloader not found</source>
-      <translation type="unfinished">Bootloader not found</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="429"/>
-      <source>Image size of %1 is too large for board flash size %2</source>
-      <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="461"/>
-      <source>Upgrade complete</source>
-      <translation type="unfinished">Upgrade complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="519"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="595"/>
-      <source>Choose board type</source>
-      <translation type="unfinished">Choose board type</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
-      <source>Fixed Wing Initial Checks</source>
-      <translation type="unfinished">Fixed Wing Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
-      <source>Fixed Wing Landing</source>
-      <translation type="unfinished">Fixed Wing Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="98"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightBrief</name>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="32"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="51"/>
-      <source>Authorizations</source>
-      <translation type="unfinished">Authorizations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="96"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="128"/>
-      <source>Authorization Pending</source>
-      <translation type="unfinished">Authorization Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="98"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="130"/>
-      <source>Authorization Accepted</source>
-      <translation type="unfinished">Authorization Accepted</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="100"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="132"/>
-      <source>Authorization Rejected</source>
-      <translation type="unfinished">Authorization Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="101"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="135"/>
-      <source>Authorization Unknown</source>
-      <translation type="unfinished">Authorization Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="134"/>
-      <source>Authorization Not Required</source>
-      <translation type="unfinished">Authorization Not Required</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="144"/>
-      <source>Rules &amp; Compliance</source>
-      <translation type="unfinished">Rules &amp; Compliance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="149"/>
-      <source>Rules you may be violating</source>
-      <translation type="unfinished">Rules you may be violating</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="159"/>
-      <source>Rules needing more information</source>
-      <translation type="unfinished">Rules needing more information</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="169"/>
-      <source>Rules you should review</source>
-      <translation type="unfinished">Rules you should review</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="179"/>
-      <source>Rules you are following</source>
-      <translation type="unfinished">Rules you are following</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="198"/>
-      <source>Update Plan</source>
-      <translation type="unfinished">Update Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="210"/>
-      <source>Submit Plan</source>
-      <translation type="unfinished">Submit Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="223"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDetails</name>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="32"/>
-      <source>Flight Details</source>
-      <translation type="unfinished">Flight Details</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="51"/>
-      <source>Flight Date &amp; Time</source>
-      <translation type="unfinished">Flight Date &amp; Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="71"/>
-      <location filename="../src/Airmap/FlightDetails.qml" line="141"/>
-      <source>Now</source>
-      <translation type="unfinished">Now</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="82"/>
-      <source>Today</source>
-      <translation type="unfinished">Today</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="96"/>
-      <source>Flight Start Time</source>
-      <translation type="unfinished">Flight Start Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="146"/>
-      <source>Duration</source>
-      <translation type="unfinished">Duration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="186"/>
-      <source>Flight Context</source>
-      <translation type="unfinished">Flight Context</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDisplayViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>WAITING FOR VIDEO</source>
-      <translation type="unfinished">WAITING FOR VIDEO</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>VIDEO DISABLED</source>
-      <translation type="unfinished">VIDEO DISABLED</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightMap</name>
-    <message>
-      <location filename="../src/FlightMap/FlightMap.qml" line="69"/>
-      <source>Specify Position</source>
-      <translation type="unfinished">Specify Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeDropdown</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeDropdown.qml" line="22"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeMenu</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeMenu.qml" line="20"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="24"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="35"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <source>Mode switch</source>
-      <translation type="unfinished">Mode switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <source>Flight Mode %1 </source>
-      <translation type="unfinished">Flight Mode %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <source>Position Ctl switch</source>
-      <translation type="unfinished">Position Ctl switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <source>Loiter switch</source>
-      <translation type="unfinished">Loiter switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <source>Return switch</source>
-      <translation type="unfinished">Return switch</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewAirspaceIndicator</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
-      <source>Approval Pending</source>
-      <translation type="unfinished">Approval Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
-      <source>Flight Approved</source>
-      <translation type="unfinished">Flight Approved</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
-      <source>Flight Rejected</source>
-      <translation type="unfinished">Flight Rejected</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMap</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="346"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="371"/>
-      <source>Go here</source>
-      <comment>Go to location waypoint</comment>
-      <translation type="unfinished">Go here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="474"/>
-      <source>ROI here</source>
-      <comment>Make this a Region Of Interest</comment>
-      <translation type="unfinished">ROI here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="510"/>
-      <source>Orbit</source>
-      <comment>Orbit waypoint</comment>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="522"/>
-      <source>Go to location</source>
-      <translation type="unfinished">Go to location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="531"/>
-      <source>Orbit at location</source>
-      <translation type="unfinished">Orbit at location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="540"/>
-      <source>ROI at location</source>
-      <translation type="unfinished">ROI at location</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMissionCompleteDialog</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="44"/>
-      <source>Flight Plan complete</source>
-      <translation type="unfinished">Flight Plan complete</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="80"/>
-      <source>%1 Images Taken</source>
-      <translation type="unfinished">%1 Images Taken</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="87"/>
-      <source>Remove plan from vehicle</source>
-      <translation type="unfinished">Remove plan from vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="98"/>
-      <source>Leave plan on vehicle</source>
-      <translation type="unfinished">Leave plan on vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="116"/>
-      <source>Resume Mission From Waypoint %1</source>
-      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="127"/>
-      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
-      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="135"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewPreFlightChecklistPopup</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
-      <source>Pre-Flight Checklist</source>
-      <translation type="unfinished">Pre-Flight Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStrip</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStripActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStripActionList.qml" line="22"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="68"/>
-      <source>Double-click to exit full screen</source>
-      <translation type="unfinished">Double-click to exit full screen</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewWidgetLayer</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="89"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="95"/>
-      <source>Multi-Vehicle</source>
-      <translation type="unfinished">Multi-Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Status</source>
-      <translation type="unfinished">GPS Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Data Unavailable</source>
-      <translation type="unfinished">GPS Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
-      <source>GPS Count:</source>
-      <translation type="unfinished">GPS Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
-      <source>GPS Lock:</source>
-      <translation type="unfinished">GPS Lock:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
-      <source>HDOP:</source>
-      <translation type="unfinished">HDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="70"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="72"/>
-      <source>--.--</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">--.--</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
-      <source>VDOP:</source>
-      <translation type="unfinished">VDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="71"/>
-      <source>Course Over Ground:</source>
-      <translation type="unfinished">Course Over Ground:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSRTKIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>Survey-in Active</source>
-      <translation type="unfinished">Survey-in Active</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>RTK Streaming</source>
-      <translation type="unfinished">RTK Streaming</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="61"/>
-      <source>Duration:</source>
-      <translation type="unfinished">Duration:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Accuracy:</source>
-      <translation type="unfinished">Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Current Accuracy:</source>
-      <translation type="unfinished">Current Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="77"/>
-      <source>Satellites:</source>
-      <translation type="unfinished">Satellites:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeneralSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="407"/>
-      <source>Units</source>
-      <translation type="unfinished">Units</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="444"/>
-      <source>Miscellaneous</source>
-      <translation type="unfinished">Miscellaneous</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="468"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="479"/>
-      <source>Color Scheme</source>
-      <translation type="unfinished">Color Scheme</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="490"/>
-      <source>Map Provider</source>
-      <translation type="unfinished">Map Provider</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="510"/>
-      <source>Map Type</source>
-      <translation type="unfinished">Map Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="529"/>
-      <source>Stream GCS Position</source>
-      <translation type="unfinished">Stream GCS Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="611"/>
-      <source>Mute all audio output</source>
-      <translation type="unfinished">Mute all audio output</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="626"/>
-      <source>Clear all settings on next start</source>
-      <translation type="unfinished">Clear all settings on next start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="636"/>
-      <source>Clear Settings</source>
-      <translation type="unfinished">Clear Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="637"/>
-      <source>All saved settings will be reset the next time you start %1. Is this really what you want?</source>
-      <translation type="unfinished">All saved settings will be reset the next time you start %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="661"/>
-      <source>Application Load/Save Path</source>
-      <translation type="unfinished">Application Load/Save Path</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="665"/>
-      <source>&lt;not set&gt;</source>
-      <translation type="unfinished">&lt;not set&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="668"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1072"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1094"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="672"/>
-      <source>Choose the location to save/load files</source>
-      <translation type="unfinished">Choose the location to save/load files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="685"/>
-      <source>Telemetry Logs from Vehicle</source>
-      <translation type="unfinished">Telemetry Logs from Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="703"/>
-      <source>Save log after each flight</source>
-      <translation type="unfinished">Save log after each flight</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="711"/>
-      <source>Save logs even if vehicle was not armed</source>
-      <translation type="unfinished">Save logs even if vehicle was not armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="84"/>
-      <source>Fly View</source>
-      <translation type="unfinished">Fly View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="145"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="177"/>
-      <source>Show simple camera controls (DIGICAM_CONTROL)</source>
-      <translation type="unfinished">Show simple camera controls (DIGICAM_CONTROL)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="188"/>
-      <source>Guided Command Settings</source>
-      <translation type="unfinished">Guided Command Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="194"/>
-      <source>Minimum Altitude</source>
-      <translation type="unfinished">Minimum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="205"/>
-      <source>Maximum Altitude</source>
-      <translation type="unfinished">Maximum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
-      <source>UI Scaling</source>
-      <translation type="unfinished">UI Scaling</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="604"/>
-      <source>Use Vehicle Pairing</source>
-      <translation type="unfinished">Use Vehicle Pairing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="618"/>
-      <source>Check for Internet connection</source>
-      <translation type="unfinished">Check for Internet connection</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="719"/>
-      <source>Save CSV log of telemetry data</source>
-      <translation type="unfinished">Save CSV log of telemetry data</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="103"/>
-      <source>Use Preflight Checklist</source>
-      <translation type="unfinished">Use Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="111"/>
-      <source>Enforce Preflight Checklist</source>
-      <translation type="unfinished">Enforce Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="120"/>
-      <source>Keep Map Centered On Vehicle</source>
-      <translation type="unfinished">Keep Map Centered On Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="128"/>
-      <source>Show Telemetry Log Replay Status Bar</source>
-      <translation type="unfinished">Show Telemetry Log Replay Status Bar</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="139"/>
-      <source>Virtual Joystick</source>
-      <translation type="unfinished">Virtual Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="153"/>
-      <source>Use Vertical Instrument Panel</source>
-      <translation type="unfinished">Use Vertical Instrument Panel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="161"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="169"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="216"/>
-      <source>Go To Location Max Distance</source>
-      <translation type="unfinished">Go To Location Max Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="233"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="240"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="296"/>
-      <source>File Format</source>
-      <translation type="unfinished">File Format</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="318"/>
-      <source>Video decode priority</source>
-      <translation type="unfinished">Video decode priority</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="345"/>
-      <source>Auto-Delete Saved Recordings</source>
-      <translation type="unfinished">Auto-Delete Saved Recordings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="356"/>
-      <source>Plan View</source>
-      <translation type="unfinished">Plan View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="378"/>
-      <source>Default Mission Altitude</source>
-      <translation type="unfinished">Default Mission Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="384"/>
-      <source>VTOL TransitionDistance</source>
-      <translation type="unfinished">VTOL TransitionDistance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="392"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="397"/>
-      <source>Missions Do Not Require Takeoff Item</source>
-      <translation type="unfinished">Missions Do Not Require Takeoff Item</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="731"/>
-      <source>AutoConnect to the following devices</source>
-      <translation type="unfinished">AutoConnect to the following devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>LibrePilot</source>
-      <translation type="unfinished">LibrePilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="847"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Zero-Conf</source>
-      <translation type="unfinished">Zero-Conf</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="781"/>
-      <source>NMEA GPS Device</source>
-      <translation type="unfinished">NMEA GPS Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="812"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="832"/>
-      <source>NMEA stream UDP port</source>
-      <translation type="unfinished">NMEA stream UDP port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="870"/>
-      <source>Perform Survey-In</source>
-      <translation type="unfinished">Perform Survey-In</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="904"/>
-      <source>Use Specified Base Position</source>
-      <translation type="unfinished">Use Specified Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="965"/>
-      <source>Save Current Base Position</source>
-      <translation type="unfinished">Save Current Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="981"/>
-      <source>ADSB Server</source>
-      <translation type="unfinished">ADSB Server</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="999"/>
-      <source>Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</source>
-      <translation type="unfinished">Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="253"/>
-      <source>UDP Port</source>
-      <translation type="unfinished">UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="264"/>
-      <source>RTSP URL</source>
-      <translation type="unfinished">RTSP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="275"/>
-      <source>TCP URL</source>
-      <translation type="unfinished">TCP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="285"/>
-      <source>Aspect Ratio</source>
-      <translation type="unfinished">Aspect Ratio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="331"/>
-      <source>Disable When Disarmed</source>
-      <translation type="unfinished">Disable When Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="338"/>
-      <source>Low Latency Mode</source>
-      <translation type="unfinished">Low Latency Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="307"/>
-      <source>Max Storage Usage</source>
-      <translation type="unfinished">Max Storage Usage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1044"/>
-      <source>Brand Image</source>
-      <translation type="unfinished">Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1063"/>
-      <source>Indoor Image</source>
-      <translation type="unfinished">Indoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1076"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1098"/>
-      <source>Choose custom brand image file</source>
-      <translation type="unfinished">Choose custom brand image file</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1085"/>
-      <source>Outdoor Image</source>
-      <translation type="unfinished">Outdoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1106"/>
-      <source>Reset Default Brand Image</source>
-      <translation type="unfinished">Reset Default Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1119"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceController</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="151"/>
-      <source>GeoFence supports version %1</source>
-      <translation type="unfinished">GeoFence supports version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="158"/>
-      <source>GeoFence polygon not stored as object</source>
-      <translation type="unfinished">GeoFence polygon not stored as object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="172"/>
-      <source>GeoFence circle not stored as object</source>
-      <translation type="unfinished">GeoFence circle not stored as object</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceEditor</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="37"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="65"/>
-      <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
-      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="66"/>
-      <source>This vehicle does not support GeoFence.</source>
-      <translation type="unfinished">This vehicle does not support GeoFence.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="116"/>
-      <source>Insert GeoFence</source>
-      <translation type="unfinished">Insert GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="121"/>
-      <source>Polygon Fence</source>
-      <translation type="unfinished">Polygon Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="133"/>
-      <source>Circular Fence</source>
-      <translation type="unfinished">Circular Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
-      <source>Polygon Fences</source>
-      <translation type="unfinished">Polygon Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="151"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="226"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="162"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="238"/>
-      <source>Inclusion</source>
-      <translation type="unfinished">Inclusion</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="178"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="254"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="202"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="294"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="211"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="303"/>
-      <source>Del</source>
-      <translation type="unfinished">Del</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="222"/>
-      <source>Circular Fences</source>
-      <translation type="unfinished">Circular Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="278"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="314"/>
-      <source>Breach Return Point</source>
-      <translation type="unfinished">Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="318"/>
-      <source>Add Breach Return Point</source>
-      <translation type="unfinished">Add Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="327"/>
-      <source>Remove Breach Return Point</source>
-      <translation type="unfinished">Remove Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="342"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceManager</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="161"/>
-      <source>GeoFence load: Vertex count change mid-polygon - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="165"/>
-      <source>GeoFence load: Polygon type changed before last load complete - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="178"/>
-      <source>GeoFence load: Incomplete polygon loaded</source>
-      <translation type="unfinished">GeoFence load: Incomplete polygon loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="186"/>
-      <source>GeoFence load: Unsupported command %1</source>
-      <translation type="unfinished">GeoFence load: Unsupported command %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="170"/>
-      <source>B</source>
-      <comment>Breach Return Point item indicator</comment>
-      <translation type="unfinished">B</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagController</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="58"/>
-      <source>Images have alreay been tagged. Existing images will be removed.</source>
-      <translation type="unfinished">Images have alreay been tagged. Existing images will be removed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="81"/>
-      <source>The save folder already contains images.</source>
-      <translation type="unfinished">The save folder already contains images.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="95"/>
-      <source>Cannot find the image directory.</source>
-      <translation type="unfinished">Cannot find the image directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="103"/>
-      <source>Couldn&apos;t replace the previously tagged images</source>
-      <translation type="unfinished">Couldn&apos;t replace the previously tagged images</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="110"/>
-      <source>Cannot find the save directory.</source>
-      <translation type="unfinished">Cannot find the save directory.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="26"/>
-      <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="67"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="75"/>
-      <source>Select log file</source>
-      <translation type="unfinished">Select log file</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>ULog file (*.ulg)</source>
-      <translation type="unfinished">ULog file (*.ulg)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>PX4 log file (*.px4log)</source>
-      <translation type="unfinished">PX4 log file (*.px4log)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="95"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="103"/>
-      <source>Select image directory</source>
-      <translation type="unfinished">Select image directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="122"/>
-      <source>(Optionally) Select save directory</source>
-      <translation type="unfinished">(Optionally) Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="130"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Cancel Tagging</source>
-      <translation type="unfinished">Cancel Tagging</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Start Tagging</source>
-      <translation type="unfinished">Start Tagging</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagWorker</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="158"/>
-      <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
-      <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="169"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="257"/>
-      <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="181"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="213"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="228"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="242"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="284"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="291"/>
-      <source>Tagging cancelled</source>
-      <translation type="unfinished">Tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="190"/>
-      <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>%1 - tagging cancelled</source>
-      <translation type="unfinished">%1 - tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>Log parsing failed</source>
-      <translation type="unfinished">Log parsing failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="235"/>
-      <source>Geotagging failed in trigger filtering</source>
-      <translation type="unfinished">Geotagging failed in trigger filtering</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
-      <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="264"/>
-      <source>Geotagging failed. Couldn&apos;t write to image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="274"/>
-      <source>Geotagging failed. Couldn&apos;t write to an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to an image.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionConfirm</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="104"/>
-      <source>Slide to confirm</source>
-      <translation type="unfinished">Slide to confirm</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="81"/>
-      <source>Select Action</source>
-      <translation type="unfinished">Select Action</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionsController</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="36"/>
-      <source>EMERGENCY STOP</source>
-      <translation type="unfinished">EMERGENCY STOP</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="42"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
-      <source>Start Mission</source>
-      <translation type="unfinished">Start Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="44"/>
-      <source>Start Mission (MV)</source>
-      <translation type="unfinished">Start Mission (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="45"/>
-      <source>Continue Mission</source>
-      <translation type="unfinished">Continue Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="46"/>
-      <source>Resume FAILED</source>
-      <translation type="unfinished">Resume FAILED</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="47"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="48"/>
-      <source>Pause (MV)</source>
-      <translation type="unfinished">Pause (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="49"/>
-      <source>Change Altitude</source>
-      <translation type="unfinished">Change Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="50"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="51"/>
-      <source>Land Abort</source>
-      <translation type="unfinished">Land Abort</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
-      <source>Set Waypoint</source>
-      <translation type="unfinished">Set Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
-      <source>Go To Location</source>
-      <translation type="unfinished">Go To Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
-      <source>Return to the launch position of the vehicle.</source>
-      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
-      <source>VTOL Transition</source>
-      <translation type="unfinished">VTOL Transition</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
-      <source>Arm the vehicle.</source>
-      <translation type="unfinished">Arm the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
-      <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
-      <source>Disarm the vehicle</source>
-      <translation type="unfinished">Disarm the vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
-      <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
-      <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
-      <source>Takeoff from ground and hold position.</source>
-      <translation type="unfinished">Takeoff from ground and hold position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-      <source>Takeoff from ground and start the current mission.</source>
-      <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
-      <source>Continue the mission from the current waypoint.</source>
-      <translation type="unfinished">Continue the mission from the current waypoint.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
-      <source>Upload of resume mission failed. Confirm to retry upload</source>
-      <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
-      <source>Land the vehicle at the current position.</source>
-      <translation type="unfinished">Land the vehicle at the current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
-      <source>Change the altitude of the vehicle up or down.</source>
-      <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
-      <source>Move the vehicle to the specified location.</source>
-      <translation type="unfinished">Move the vehicle to the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
-      <source>Adjust current waypoint to %1.</source>
-      <translation type="unfinished">Adjust current waypoint to %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
-      <source>Orbit the vehicle around the specified location.</source>
-      <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
-      <source>Abort the landing sequence.</source>
-      <translation type="unfinished">Abort the landing sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
-      <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
-      <source>Pause all vehicles at their current position.</source>
-      <translation type="unfinished">Pause all vehicles at their current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
-      <source>Transition VTOL to fixed wing flight.</source>
-      <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
-      <source>Transition VTOL to multi-rotor flight.</source>
-      <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="77"/>
-      <source>Make the specified location a Region Of Interest.</source>
-      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="163"/>
-      <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="392"/>
-      <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="536"/>
-      <source>Internal error: unknown actionCode</source>
-      <translation type="unfinished">Internal error: unknown actionCode</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedAltitudeSlider</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="65"/>
-      <source>New Alt(rel)</source>
-      <translation type="unfinished">New Alt(rel)</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="37"/>
-      <source>QGroundControl User Guide</source>
-      <translation type="unfinished">QGroundControl User Guide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="44"/>
-      <source>PX4 Users Discussion Forum</source>
-      <translation type="unfinished">PX4 Users Discussion Forum</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="51"/>
-      <source>ArduPilot Users Discussion Forum</source>
-      <translation type="unfinished">ArduPilot Users Discussion Forum</translation>
-    </message>
-  </context>
-  <context>
-    <name>HorizontalFactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="128"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="153"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="136"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="160"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
-      <source>Color</source>
-      <translation type="unfinished">Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
-      <source>Opacity</source>
-      <translation type="unfinished">Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueArea</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="85"/>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="109"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <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/QmlControls/InstrumentValueArea.qml" line="127"/>
-      <source>Reset To Defaults</source>
-      <translation type="unfinished">Reset To Defaults</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueEditDialog</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
-      <source>Value Display</source>
-      <translation type="unfinished">Value Display</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
-      <source>Valuec requires a connected vehicle for setup.</source>
-      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="89"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="129"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="133"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="146"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="159"/>
-      <source>Show Units</source>
-      <translation type="unfinished">Show Units</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="164"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="246"/>
-      <source>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</source>
-      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="264"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="371"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="470"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="321"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="420"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="505"/>
-      <source>Add Row</source>
-      <translation type="unfinished">Add Row</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="353"/>
-      <source>Specify the icon you want to display based on value ranges.</source>
-      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="452"/>
-      <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="520"/>
-      <source>Select Icon</source>
-      <translation type="unfinished">Select Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueValue.qml" line="47"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>Joystick</name>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="44"/>
-      <source>No Action</source>
-      <translation type="unfinished">No Action</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="45"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="46"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="47"/>
-      <source>Toggle Arm</source>
-      <translation type="unfinished">Toggle Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="48"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="49"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="50"/>
-      <source>Continuous Zoom In</source>
-      <translation type="unfinished">Continuous Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="51"/>
-      <source>Continuous Zoom Out</source>
-      <translation type="unfinished">Continuous Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="52"/>
-      <source>Step Zoom In</source>
-      <translation type="unfinished">Step Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="53"/>
-      <source>Step Zoom Out</source>
-      <translation type="unfinished">Step Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="58"/>
-      <source>Trigger Camera</source>
-      <translation type="unfinished">Trigger Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="59"/>
-      <source>Start Recording Video</source>
-      <translation type="unfinished">Start Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="60"/>
-      <source>Stop Recording Video</source>
-      <translation type="unfinished">Stop Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="61"/>
-      <source>Toggle Recording Video</source>
-      <translation type="unfinished">Toggle Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="62"/>
-      <source>Gimbal Down</source>
-      <translation type="unfinished">Gimbal Down</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="63"/>
-      <source>Gimbal Up</source>
-      <translation type="unfinished">Gimbal Up</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="64"/>
-      <source>Gimbal Left</source>
-      <translation type="unfinished">Gimbal Left</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="65"/>
-      <source>Gimbal Right</source>
-      <translation type="unfinished">Gimbal Right</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="66"/>
-      <source>Gimbal Center</source>
-      <translation type="unfinished">Gimbal Center</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="67"/>
-      <source>Emergency Stop</source>
-      <translation type="unfinished">Emergency Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="54"/>
-      <source>Next Video Stream</source>
-      <translation type="unfinished">Next Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="55"/>
-      <source>Previous Video Stream</source>
-      <translation type="unfinished">Previous Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="56"/>
-      <source>Next Camera</source>
-      <translation type="unfinished">Next Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="57"/>
-      <source>Previous Camera</source>
-      <translation type="unfinished">Previous Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfig</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigAdvanced</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
-      <source>Full down stick is zero throttle</source>
-      <translation type="unfinished">Full down stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
-      <source>Center stick is zero throttle</source>
-      <translation type="unfinished">Center stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
-      <source>Spring loaded throttle smoothing</source>
-      <translation type="unfinished">Spring loaded throttle smoothing</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
-      <source>Allow negative Thrust</source>
-      <translation type="unfinished">Allow negative Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
-      <source>Exponential:</source>
-      <translation type="unfinished">Exponential:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
-      <source>Enable further advanced settings (careful!)</source>
-      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
-      <source>Axis frequency (Hz):</source>
-      <translation type="unfinished">Axis frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="127"/>
-      <source>Button repeat frequency (Hz):</source>
-      <translation type="unfinished">Button repeat frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="145"/>
-      <source>Enable circle correction</source>
-      <translation type="unfinished">Enable circle correction</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="163"/>
-      <source>Deadbands</source>
-      <translation type="unfinished">Deadbands</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="180"/>
-      <source>Deadband can be set during the first </source>
-      <translation type="unfinished">Deadband can be set during the first </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="181"/>
-      <source>step of calibration by gently wiggling each axis. </source>
-      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="182"/>
-      <source>Deadband can also be adjusted by clicking and </source>
-      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="183"/>
-      <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigButtons</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
-      <source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
-      <translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="124"/>
-      <source>#</source>
-      <translation type="unfinished">#</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="128"/>
-      <source>Function: </source>
-      <translation type="unfinished">Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="132"/>
-      <source>Shift Function: </source>
-      <translation type="unfinished">Shift Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="185"/>
-      <source>No firmware support</source>
-      <translation type="unfinished">No firmware support</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigCalibration</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="169"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="175"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigController</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="197"/>
-      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigGeneral</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable joystick input</source>
-      <translation type="unfinished">Enable joystick input</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable not allowed (Calibrate First)</source>
-      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
-      <source>Active joystick:</source>
-      <translation type="unfinished">Active joystick:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
-      <source>Active joystick name not in combo</source>
-      <translation type="unfinished">Active joystick name not in combo</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
-      <source>RC Mode:</source>
-      <translation type="unfinished">RC Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Lateral</source>
-      <translation type="unfinished">Lateral</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-      <source>Joystick Status</source>
-      <translation type="unfinished">Joystick Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-      <source>Connected:</source>
-      <translation type="unfinished">Connected:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-      <source>Enabled:</source>
-      <translation type="unfinished">Enabled:</translation>
-    </message>
-  </context>
-  <context>
-    <name>JsonHelper</name>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="181"/>
-      <source>File open failed: file:error %1 %2</source>
-      <translation type="unfinished">File open failed: file:error %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="334"/>
-      <source>Unable to open file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="343"/>
-      <source>Unable to parse json file: %1 error: %2 offset: %3</source>
-      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="348"/>
-      <source>Root of json file is not object: %1</source>
-      <translation type="unfinished">Root of json file is not object: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="355"/>
-      <source>Json file: &apos;%1&apos;. %2</source>
-      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLHelper</name>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="15"/>
-      <source>KML file load failed. %1</source>
-      <translation type="unfinished">KML file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="24"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="29"/>
-      <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="37"/>
-      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="61"/>
-      <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="77"/>
-      <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="83"/>
-      <location filename="../src/KMLHelper.cc" line="144"/>
-      <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="138"/>
-      <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLOrSHPFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>LandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="635"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="655"/>
-      <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkManager</name>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="235"/>
-      <source>Connect not allowed: %1</source>
-      <translation type="unfinished">Connect not allowed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="607"/>
-      <location filename="../src/comm/LinkManager.cc" line="613"/>
-      <location filename="../src/comm/LinkManager.cc" line="618"/>
-      <location filename="../src/comm/LinkManager.cc" line="623"/>
-      <source>%1 on %2 (AutoConnect)</source>
-      <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="667"/>
-      <source>Shutdown</source>
-      <translation type="unfinished">Shutdown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="683"/>
-      <source>Serial</source>
-      <translation type="unfinished">Serial</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="685"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="686"/>
-      <source>TCP</source>
-      <translation type="unfinished">TCP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="691"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="694"/>
-      <location filename="../src/comm/LinkManager.cc" line="884"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="95"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="104"/>
-      <source>Remove Link Configuration</source>
-      <translation type="unfinished">Remove Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="105"/>
-      <source>Remove %1. Is this really what you want?</source>
-      <translation type="unfinished">Remove %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="116"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="121"/>
-      <source>Add</source>
-      <translation type="unfinished">Add</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="125"/>
-      <source>Connect</source>
-      <translation type="unfinished">Connect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="130"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="135"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Edit Link Configuration Settings</source>
-      <translation type="unfinished">Edit Link Configuration Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Create New Link Configuration</source>
-      <translation type="unfinished">Create New Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="183"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="189"/>
-      <source>Enter name</source>
-      <translation type="unfinished">Enter name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="194"/>
-      <source>Automatically Connect on Start</source>
-      <translation type="unfinished">Automatically Connect on Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="201"/>
-      <source>High Latency</source>
-      <translation type="unfinished">High Latency</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="206"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="240"/>
-      <source>OK</source>
-      <translation type="unfinished">OK</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="260"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogCompressor</name>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="50"/>
-      <source>Log Compressor: Cannot start/compress log file, since input file %1 is not readable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since input file %1 is not readable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="67"/>
-      <source>Log Compressor: Cannot start/compress log file, since output file %1 is not writable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since output file %1 is not writable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="105"/>
-      <source>Log compressor: Dataset contains dimensions: </source>
-      <translation type="unfinished">Log compressor: Dataset contains dimensions: </translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="213"/>
-      <source>Log Compressor</source>
-      <translation type="unfinished">Log Compressor</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadController</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="180"/>
-      <source>Available</source>
-      <translation type="unfinished">Available</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="227"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="705"/>
-      <source>Canceled</source>
-      <translation type="unfinished">Canceled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="274"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="385"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="646"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="366"/>
-      <source>Downloaded</source>
-      <translation type="unfinished">Downloaded</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="436"/>
-      <source>Timed Out</source>
-      <translation type="unfinished">Timed Out</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="556"/>
-      <source>Waiting</source>
-      <translation type="unfinished">Waiting</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="601"/>
-      <source>UnknownDate</source>
-      <translation type="unfinished">UnknownDate</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="24"/>
-      <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation type="unfinished">Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="59"/>
-      <source>Id</source>
-      <translation type="unfinished">Id</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="72"/>
-      <source>Date</source>
-      <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="83"/>
-      <source>Date Unknown</source>
-      <translation type="unfinished">Date Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="94"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="107"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="124"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>Log Refresh</source>
-      <translation type="unfinished">Log Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation type="unfinished">You must be connected to a vehicle in order to download logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="136"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="153"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="170"/>
-      <source>Erase All</source>
-      <translation type="unfinished">Erase All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="174"/>
-      <source>Delete All Log Files</source>
-      <translation type="unfinished">Delete All Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="180"/>
-      <source>All log files will be erased permanently. Is this really what you want?</source>
-      <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="189"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLink</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="83"/>
-      <source>Log Replay Error</source>
-      <translation type="unfinished">Log Replay Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="104"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="269"/>
-      <source>Attempt to load new log while log being played</source>
-      <translation type="unfinished">Attempt to load new log while log being played</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="275"/>
-      <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="285"/>
-      <source>The log file &apos;%1&apos; is corrupt or empty.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="358"/>
-      <source>Connect not allowed during Flight Data replay.</source>
-      <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="425"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="445"/>
-      <source>Unable to seek to new position</source>
-      <translation type="unfinished">Unable to seek to new position</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkConfiguration</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.h" line="40"/>
-      <source>Log Replay Link Settings</source>
-      <translation type="unfinished">Log Replay Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkController</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="593"/>
-      <source>%2m:%3s</source>
-      <translation type="unfinished">%2m:%3s</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="595"/>
-      <source>%1h:%2m:%3s</source>
-      <translation type="unfinished">%1h:%2m:%3s</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplaySettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="26"/>
-      <source>Log File</source>
-      <translation type="unfinished">Log File</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="35"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="41"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayStatusBar</name>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Play</source>
-      <translation type="unfinished">Play</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="104"/>
-      <source>Load Telemetry Log</source>
-      <translation type="unfinished">Load Telemetry Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="110"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="195"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="196"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="197"/>
-      <source>Magnetometer</source>
-      <translation type="unfinished">Magnetometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="198"/>
-      <source>Absolute pressure</source>
-      <translation type="unfinished">Absolute pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="199"/>
-      <source>Differential pressure</source>
-      <translation type="unfinished">Differential pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="200"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="201"/>
-      <source>Optical flow</source>
-      <translation type="unfinished">Optical flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="202"/>
-      <source>Computer vision position</source>
-      <translation type="unfinished">Computer vision position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="203"/>
-      <source>Laser based position</source>
-      <translation type="unfinished">Laser based position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="204"/>
-      <source>External ground truth</source>
-      <translation type="unfinished">External ground truth</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="205"/>
-      <source>Angular rate control</source>
-      <translation type="unfinished">Angular rate control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="206"/>
-      <source>Attitude stabilization</source>
-      <translation type="unfinished">Attitude stabilization</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="207"/>
-      <source>Yaw position</source>
-      <translation type="unfinished">Yaw position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="208"/>
-      <source>Z/altitude control</source>
-      <translation type="unfinished">Z/altitude control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="209"/>
-      <source>X/Y position control</source>
-      <translation type="unfinished">X/Y position control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="210"/>
-      <source>Motor outputs / control</source>
-      <translation type="unfinished">Motor outputs / control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="211"/>
-      <source>RC receiver</source>
-      <translation type="unfinished">RC receiver</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="212"/>
-      <source>Gyro 2</source>
-      <translation type="unfinished">Gyro 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="213"/>
-      <source>Accelerometer 2</source>
-      <translation type="unfinished">Accelerometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="214"/>
-      <source>Magnetometer 2</source>
-      <translation type="unfinished">Magnetometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="215"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="216"/>
-      <source>AHRS</source>
-      <translation type="unfinished">AHRS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="217"/>
-      <source>Terrain</source>
-      <translation type="unfinished">Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="218"/>
-      <source>Motors reversed</source>
-      <translation type="unfinished">Motors reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="219"/>
-      <source>Logging</source>
-      <translation type="unfinished">Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="220"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="221"/>
-      <source>Proximity</source>
-      <translation type="unfinished">Proximity</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="222"/>
-      <source>Satellite Communication</source>
-      <translation type="unfinished">Satellite Communication</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="223"/>
-      <source>Pre-Arm Check</source>
-      <translation type="unfinished">Pre-Arm Check</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="224"/>
-      <source>Avoidance/collision prevention</source>
-      <translation type="unfinished">Avoidance/collision prevention</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink unknown SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="236"/>
-      <source>Unknown sensor</source>
-      <translation type="unfinished">Unknown sensor</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkChart</name>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
-      <source>Scale:</source>
-      <translation type="unfinished">Scale:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
-      <source>Range:</source>
-      <translation type="unfinished">Range:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorController</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
-      <source>5 Sec</source>
-      <translation type="unfinished">5 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
-      <source>10 Sec</source>
-      <translation type="unfinished">10 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
-      <source>30 Sec</source>
-      <translation type="unfinished">30 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
-      <source>60 Sec</source>
-      <translation type="unfinished">60 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="744"/>
-      <source>10,000</source>
-      <translation type="unfinished">10,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="745"/>
-      <source>1,000</source>
-      <translation type="unfinished">1,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="746"/>
-      <source>100</source>
-      <translation type="unfinished">100</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="747"/>
-      <source>10</source>
-      <translation type="unfinished">10</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="748"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="749"/>
-      <source>0.1</source>
-      <translation type="unfinished">0.1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="750"/>
-      <source>0.01</source>
-      <translation type="unfinished">0.01</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="751"/>
-      <source>0.001</source>
-      <translation type="unfinished">0.001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="752"/>
-      <source>0.0001</source>
-      <translation type="unfinished">0.0001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="846"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="859"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="874"/>
-      <source>System %1</source>
-      <translation type="unfinished">System %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="45"/>
-      <source>Inspect real time MAVLink messages.</source>
-      <translation type="unfinished">Inspect real time MAVLink messages.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="142"/>
-      <source>Message:</source>
-      <translation type="unfinished">Message:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="150"/>
-      <source>Component:</source>
-      <translation type="unfinished">Component:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="156"/>
-      <source>Count:</source>
-      <translation type="unfinished">Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="171"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="174"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="177"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="180"/>
-      <source>Plot 1</source>
-      <translation type="unfinished">Plot 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="183"/>
-      <source>Plot 2</source>
-      <translation type="unfinished">Plot 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkProtocol</name>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>MAVLink Protocol</source>
-      <translation type="unfinished">MAVLink Protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
-      <translation type="unfinished">MAVLink Logging failed. Could not write to file %1, logging disabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
-      <translation type="unfinished">Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="383"/>
-      <source>MAVLink protocol</source>
-      <translation type="unfinished">MAVLink protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
-      <translation type="unfinished">Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainRootWindow</name>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="270"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="287"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="306"/>
-      <source>%1 close</source>
-      <translation type="unfinished">%1 close</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="307"/>
-      <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
-      <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="271"/>
-      <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="156"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="385"/>
-      <source>Analyze Tools</source>
-      <translation type="unfinished">Analyze Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="160"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="370"/>
-      <source>Vehicle Setup</source>
-      <translation type="unfinished">Vehicle Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="164"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="401"/>
-      <source>Application Settings</source>
-      <translation type="unfinished">Application Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="288"/>
-      <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="351"/>
-      <source>Select Tool</source>
-      <translation type="unfinished">Select Tool</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="419"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="452"/>
-      <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="520"/>
-      <source>Back</source>
-      <translation type="unfinished">Back</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainStatusIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="35"/>
-      <source>Communication Lost</source>
-      <translation type="unfinished">Communication Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="36"/>
-      <source>Ready To Fly</source>
-      <translation type="unfinished">Ready To Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="37"/>
-      <source>Not Ready</source>
-      <translation type="unfinished">Not Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="38"/>
-      <source>Disconnected</source>
-      <translation type="unfinished">Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="39"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="40"/>
-      <source>Flying</source>
-      <translation type="unfinished">Flying</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="41"/>
-      <source>Landing</source>
-      <translation type="unfinished">Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>FW(vtol)</source>
-      <translation type="unfinished">FW(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>MR(vtol)</source>
-      <translation type="unfinished">MR(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="196"/>
-      <source>Sensor Status</source>
-      <translation type="unfinished">Sensor Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Multi-Rotor</source>
-      <translation type="unfinished">Transition to Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Fixed Wing</source>
-      <translation type="unfinished">Transition to Fixed Wing</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainToolBar</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="201"/>
-      <source>Downloading</source>
-      <translation type="unfinished">Downloading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="209"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="82"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-  </context>
-  <context>
-    <name>MapScale</name>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="46"/>
-      <source> km</source>
-      <translation type="unfinished"> km</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="48"/>
-      <source> m</source>
-      <translation type="unfinished"> m</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="59"/>
-      <source> mile</source>
-      <translation type="unfinished"> mile</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="61"/>
-      <source> miles</source>
-      <translation type="unfinished"> miles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="64"/>
-      <source> ft</source>
-      <translation type="unfinished"> ft</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="193"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="206"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="219"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkConsolePage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
-      <source>Provides a connection to the vehicle&apos;s system shell.</source>
-      <translation type="unfinished">Provides a connection to the vehicle&apos;s system shell.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="140"/>
-      <source>Copy</source>
-      <translation type="unfinished">Copy</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="146"/>
-      <source>Paste</source>
-      <translation type="unfinished">Paste</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="290"/>
-      <source>Send</source>
-      <translation type="unfinished">Send</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
-      <source>MAVLink Logging</source>
-      <translation type="unfinished">MAVLink Logging</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">Please enter an email address before uploading MAVLink log files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
-      <source>Ground Station</source>
-      <translation type="unfinished">Ground Station</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
-      <source>MAVLink System ID:</source>
-      <translation type="unfinished">MAVLink System ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
-      <source>Emit heartbeat</source>
-      <translation type="unfinished">Emit heartbeat</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
-      <source>Only accept MAVs with same protocol version</source>
-      <translation type="unfinished">Only accept MAVs with same protocol version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="159"/>
-      <source>Enable MAVLink forwarding</source>
-      <translation type="unfinished">Enable MAVLink forwarding</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="170"/>
-      <source>Host name:</source>
-      <translation type="unfinished">Host name:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="183"/>
-      <source>&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</source>
-      <translation type="unfinished">&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="199"/>
-      <source>Telemetry Stream Rates (ArduPilot Only)</source>
-      <translation type="unfinished">Telemetry Stream Rates (ArduPilot Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="219"/>
-      <source>All Streams Controlled By Vehicle Settings</source>
-      <translation type="unfinished">All Streams Controlled By Vehicle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="228"/>
-      <source>Raw Sensors</source>
-      <translation type="unfinished">Raw Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="235"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="242"/>
-      <source>RC Channel</source>
-      <translation type="unfinished">RC Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="249"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="256"/>
-      <source>Extra 1</source>
-      <translation type="unfinished">Extra 1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="263"/>
-      <source>Extra 2</source>
-      <translation type="unfinished">Extra 2</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="270"/>
-      <source>Extra 3</source>
-      <translation type="unfinished">Extra 3</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="288"/>
-      <source>MAVLink Link Status (Current Vehicle)</source>
-      <translation type="unfinished">MAVLink Link Status (Current Vehicle)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="309"/>
-      <source>Total messages sent (computed):</source>
-      <translation type="unfinished">Total messages sent (computed):</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="314"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="329"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="344"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="359"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="324"/>
-      <source>Total messages received:</source>
-      <translation type="unfinished">Total messages received:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="339"/>
-      <source>Total message loss:</source>
-      <translation type="unfinished">Total message loss:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="354"/>
-      <source>Loss rate:</source>
-      <translation type="unfinished">Loss rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="375"/>
-      <source>MAVLink 2.0 Logging (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Logging (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="398"/>
-      <source>Manual Start/Stop:</source>
-      <translation type="unfinished">Manual Start/Stop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="402"/>
-      <source>Start Logging</source>
-      <translation type="unfinished">Start Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="409"/>
-      <source>Stop Logging</source>
-      <translation type="unfinished">Stop Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="419"/>
-      <source>Enable automatic logging</source>
-      <translation type="unfinished">Enable automatic logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="438"/>
-      <source>MAVLink 2.0 Log Uploads (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Log Uploads (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="460"/>
-      <source>Email address for Log Upload:</source>
-      <translation type="unfinished">Email address for Log Upload:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="481"/>
-      <source>Default Description:</source>
-      <translation type="unfinished">Default Description:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="501"/>
-      <source>Default Upload URL</source>
-      <translation type="unfinished">Default Upload URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="522"/>
-      <source>Video URL:</source>
-      <translation type="unfinished">Video URL:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="540"/>
-      <source>Wind Speed:</source>
-      <translation type="unfinished">Wind Speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="578"/>
-      <source>Flight Rating:</source>
-      <translation type="unfinished">Flight Rating:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="616"/>
-      <source>Additional Feedback:</source>
-      <translation type="unfinished">Additional Feedback:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="635"/>
-      <source>Make this log publicly available</source>
-      <translation type="unfinished">Make this log publicly available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="646"/>
-      <source>Enable automatic log uploads</source>
-      <translation type="unfinished">Enable automatic log uploads</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="658"/>
-      <source>Delete log file after uploading</source>
-      <translation type="unfinished">Delete log file after uploading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="677"/>
-      <source>Saved Log Files</source>
-      <translation type="unfinished">Saved Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="740"/>
-      <source>Uploaded</source>
-      <translation type="unfinished">Uploaded</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="763"/>
-      <source>Check All</source>
-      <translation type="unfinished">Check All</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="773"/>
-      <source>Check None</source>
-      <translation type="unfinished">Check None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="783"/>
-      <source>Delete Selected</source>
-      <translation type="unfinished">Delete Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="791"/>
-      <source>Delete Selected Log Files</source>
-      <translation type="unfinished">Delete Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="792"/>
-      <source>Confirm deleting selected log files?</source>
-      <translation type="unfinished">Confirm deleting selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="799"/>
-      <source>Upload Selected</source>
-      <translation type="unfinished">Upload Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="814"/>
-      <source>Upload Selected Log Files</source>
-      <translation type="unfinished">Upload Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="815"/>
-      <source>Confirm uploading selected log files?</source>
-      <translation type="unfinished">Confirm uploading selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="822"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="831"/>
-      <source>Cancel Upload</source>
-      <translation type="unfinished">Cancel Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="832"/>
-      <source>Confirm canceling the upload process?</source>
-      <translation type="unfinished">Confirm canceling the upload process?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MessageIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MessageIndicator.qml" line="112"/>
-      <source>No Messages</source>
-      <translation type="unfinished">No Messages</translation>
-    </message>
-  </context>
-  <context>
-    <name>MicrohardSettings</name>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="63"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="80"/>
-      <source>Enable Microhard</source>
-      <translation type="unfinished">Enable Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="98"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="120"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="126"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="128"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="144"/>
-      <source>Login Error</source>
-      <translation type="unfinished">Login Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="130"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="137"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="152"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="158"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="176"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="198"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="209"/>
-      <source>Remote IP Address:</source>
-      <translation type="unfinished">Remote IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="219"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
-      <source>Configuration User Name:</source>
-      <translation type="unfinished">Configuration User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
-      <source>Configuration Password:</source>
-      <translation type="unfinished">Configuration Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
-      <source>Encryption key:</source>
-      <translation type="unfinished">Encryption key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="282"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandDialog</name>
-    <message>
-      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="32"/>
-      <source>Category:</source>
-      <translation type="unfinished">Category:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandTree</name>
-    <message>
-      <location filename="../src/MissionManager/MissionCommandTree.cc" line="23"/>
-      <source>All commands</source>
-      <translation type="unfinished">All commands</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionController</name>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="788"/>
-      <source>Mission item %1 is not an object</source>
-      <translation type="unfinished">Mission item %1 is not an object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="874"/>
-      <source>Unsupported complex item type: %1</source>
-      <translation type="unfinished">Unsupported complex item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="877"/>
-      <source>Unknown item type: %1</source>
-      <translation type="unfinished">Unknown item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="900"/>
-      <source>Could not find doJumpId: %1</source>
-      <translation type="unfinished">Could not find doJumpId: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="973"/>
-      <source>The mission file is corrupted.</source>
-      <translation type="unfinished">The mission file is corrupted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="978"/>
-      <source>The mission file is not compatible with this version of %1.</source>
-      <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="1026"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1041"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1065"/>
-      <source>Mission: %1</source>
-      <translation type="unfinished">Mission: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="285"/>
-      <source>Type found: %1 must be: %2</source>
-      <translation type="unfinished">Type found: %1 must be: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="291"/>
-      <source>%1 key must contains 7 values</source>
-      <translation type="unfinished">%1 key must contains 7 values</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="297"/>
-      <source>Param %1 incorrect type %2, must be double or null</source>
-      <translation type="unfinished">Param %1 incorrect type %2, must be double or null</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="101"/>
-      <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="206"/>
-      <source>Move to vehicle position</source>
-      <translation type="unfinished">Move to vehicle position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="215"/>
-      <source>Move to previous item position</source>
-      <translation type="unfinished">Move to previous item position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="221"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="223"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="231"/>
-      <source>Show all values</source>
-      <translation type="unfinished">Show all values</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>Mission Edit</source>
-      <translation type="unfinished">Mission Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
-      <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="251"/>
-      <source>Item #%1</source>
-      <translation type="unfinished">Item #%1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="155"/>
-      <source>Select Mission Command</source>
-      <translation type="unfinished">Select Mission Command</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemStatus</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemStatus.qml" line="46"/>
-      <source>Terrain Altitude</source>
-      <translation type="unfinished">Terrain Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionManager</name>
-    <message>
-      <location filename="../src/MissionManager/MissionManager.cc" line="92"/>
-      <source>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</source>
-      <translation type="unfinished">Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="42"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="43"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="119"/>
-      <source>Flight speed</source>
-      <translation type="unfinished">Flight speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="146"/>
-      <source>Above camera commands will take affect immediately upon mission start.</source>
-      <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="239"/>
-      <source>Launch Position</source>
-      <translation type="unfinished">Launch Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="275"/>
-      <source>Set To Map Center</source>
-      <translation type="unfinished">Set To Map Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="157"/>
-      <source>Vehicle Info</source>
-      <translation type="unfinished">Vehicle Info</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="68"/>
-      <source>All Altitudes</source>
-      <translation type="unfinished">All Altitudes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="103"/>
-      <source>Initial Waypoint Alt</source>
-      <translation type="unfinished">Initial Waypoint Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="208"/>
-      <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="213"/>
-      <source>Cruise speed</source>
-      <translation type="unfinished">Cruise speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="224"/>
-      <source>Hover speed</source>
-      <translation type="unfinished">Hover speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="258"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="270"/>
-      <source>Actual position set by vehicle at flight time.</source>
-      <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockConfiguration</name>
-    <message>
-      <location filename="../src/comm/MockLink.h" line="78"/>
-      <source>Mock Link Settings</source>
-      <translation type="unfinished">Mock Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLink</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="46"/>
-      <source>PX4 Vehicle</source>
-      <translation type="unfinished">PX4 Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="51"/>
-      <source>APM ArduCopter Vehicle</source>
-      <translation type="unfinished">APM ArduCopter Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="57"/>
-      <source>APM ArduPlane Vehicle</source>
-      <translation type="unfinished">APM ArduPlane Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="63"/>
-      <source>APM ArduSub Vehicle</source>
-      <translation type="unfinished">APM ArduSub Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="69"/>
-      <source>APM ArduRover Vehicle</source>
-      <translation type="unfinished">APM ArduRover Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="75"/>
-      <source>Generic Vehicle</source>
-      <translation type="unfinished">Generic Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="43"/>
-      <source>Send status text + voice</source>
-      <translation type="unfinished">Send status text + voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="80"/>
-      <source>Stop One MockLink</source>
-      <translation type="unfinished">Stop One MockLink</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkOptionsDlg</name>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="23"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="33"/>
-      <source>Stop Heartbeats</source>
-      <translation type="unfinished">Stop Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="42"/>
-      <source>Start Heartbeats</source>
-      <translation type="unfinished">Start Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="51"/>
-      <source>Connection Removed</source>
-      <translation type="unfinished">Connection Removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="73"/>
-      <source>Send Status Text and Voice</source>
-      <translation type="unfinished">Send Status Text and Voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="80"/>
-      <source>Increment Vehicle Id</source>
-      <translation type="unfinished">Increment Vehicle Id</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="84"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>Generic MAVLink</source>
-      <translation type="unfinished">Generic MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="94"/>
-      <source>Vehicle Type</source>
-      <translation type="unfinished">Vehicle Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduCopter</source>
-      <translation type="unfinished">ArduCopter</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduPlane</source>
-      <translation type="unfinished">ArduPlane</translation>
-    </message>
-  </context>
-  <context>
-    <name>ModeSwitchDisplay</name>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="95"/>
-      <source>Monitor:</source>
-      <translation type="unfinished">Monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="135"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
-      <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiRotorChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
-      <source>Multirotor Initial Checks</source>
-      <translation type="unfinished">Multirotor Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
-      <source>Props mounted and secured?</source>
-      <translation type="unfinished">Props mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleList</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="54"/>
-      <source>The following commands will be applied to all vehicles</source>
-      <translation type="unfinished">The following commands will be applied to all vehicles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleManager</name>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="121"/>
-      <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="139"/>
-      <source>Connected to Vehicle %1</source>
-      <translation type="unfinished">Connected to Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleSelector</name>
-    <message>
-      <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="49"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineMap</name>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="241"/>
-      <source>Error Message</source>
-      <translation type="unfinished">Error Message</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="271"/>
-      <source>Max Cache Disk Size (MB):</source>
-      <translation type="unfinished">Max Cache Disk Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="287"/>
-      <source>Max Cache Memory Size (MB):</source>
-      <translation type="unfinished">Max Cache Memory Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="303"/>
-      <source>Memory cache changes require a restart to take effect.</source>
-      <translation type="unfinished">Memory cache changes require a restart to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="307"/>
-      <source>Mapbox Access Token</source>
-      <translation type="unfinished">Mapbox Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="318"/>
-      <source>To enable Mapbox maps, enter your access token.</source>
-      <translation type="unfinished">To enable Mapbox maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="324"/>
-      <source>Mapbox User Name</source>
-      <translation type="unfinished">Mapbox User Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="335"/>
-      <source>To enable custom Mapbox styles, enter your account name.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your account name.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="341"/>
-      <source>Mapbox Style ID</source>
-      <translation type="unfinished">Mapbox Style ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="352"/>
-      <source>To enable custom Mapbox styles, enter your style ID.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your style ID.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="358"/>
-      <source>Esri Access Token</source>
-      <translation type="unfinished">Esri Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="369"/>
-      <source>To enable Esri maps, enter your access token.</source>
-      <translation type="unfinished">To enable Esri maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="375"/>
-      <source>VWorld Access Token</source>
-      <translation type="unfinished">VWorld Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="386"/>
-      <source>To enable VWorld maps, enter your access token.</source>
-      <translation type="unfinished">To enable VWorld maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="392"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="403"/>
-      <source>URL with {x} {y} {z} or {zoom} substitutions</source>
-      <translation type="unfinished">URL with {x} {y} {z} or {zoom} substitutions</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="418"/>
-      <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</source>
-      <translation type="unfinished">This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="420"/>
-      <source>Delete %1 and all its tiles.
-
-Is this really what you want?</source>
-      <translation type="unfinished">Delete %1 and all its tiles.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="525"/>
-      <source>System Wide Tile Cache</source>
-      <translation type="unfinished">System Wide Tile Cache</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="538"/>
-      <source>Zoom Levels:</source>
-      <translation type="unfinished">Zoom Levels:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="545"/>
-      <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="552"/>
-      <source>Unique:</source>
-      <translation type="unfinished">Unique:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="560"/>
-      <source>Downloaded:</source>
-      <translation type="unfinished">Downloaded:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="567"/>
-      <source>Error Count:</source>
-      <translation type="unfinished">Error Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="575"/>
-      <source>Size:</source>
-      <translation type="unfinished">Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="582"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="957"/>
-      <source>Tile Count:</source>
-      <translation type="unfinished">Tile Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="589"/>
-      <source>Resume Download</source>
-      <translation type="unfinished">Resume Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="598"/>
-      <source>Cancel Download</source>
-      <translation type="unfinished">Cancel Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="607"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="609"/>
-      <source>Confirm Delete</source>
-      <translation type="unfinished">Confirm Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="612"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1209"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1289"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1002"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1159"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1313"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="686"/>
-      <source>Min Zoom: %1</source>
-      <translation type="unfinished">Min Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="726"/>
-      <source>Max Zoom: %1</source>
-      <translation type="unfinished">Max Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="772"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1034"/>
-      <source>Add New Set</source>
-      <translation type="unfinished">Add New Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="800"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="813"/>
-      <source>Map type:</source>
-      <translation type="unfinished">Map type:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="836"/>
-      <source>Fetch elevation data</source>
-      <translation type="unfinished">Fetch elevation data</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="862"/>
-      <source>Min/Max Zoom Levels</source>
-      <translation type="unfinished">Min/Max Zoom Levels</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="966"/>
-      <source>Est Size:</source>
-      <translation type="unfinished">Est Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="978"/>
-      <source>Too many tiles</source>
-      <translation type="unfinished">Too many tiles</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="989"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1072"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1303"/>
-      <source>Import</source>
-      <translation type="unfinished">Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1081"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1149"/>
-      <source>Export</source>
-      <translation type="unfinished">Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1087"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1089"/>
-      <source>Offline Maps Options</source>
-      <translation type="unfinished">Offline Maps Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1110"/>
-      <source>Select Tile Sets to Export</source>
-      <translation type="unfinished">Select Tile Sets to Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1139"/>
-      <source>Select All</source>
-      <translation type="unfinished">Select All</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1144"/>
-      <source>Select None</source>
-      <translation type="unfinished">Select None</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1153"/>
-      <source>Export Tile Set</source>
-      <translation type="unfinished">Export Tile Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Progress</source>
-      <translation type="unfinished">Tile Set Export Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Completed</source>
-      <translation type="unfinished">Tile Set Export Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1244"/>
-      <source>Map Tile Set Import</source>
-      <translation type="unfinished">Map Tile Set Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1246"/>
-      <source>Map Tile Set Import Progress</source>
-      <translation type="unfinished">Map Tile Set Import Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1248"/>
-      <source>Map Tile Set Import Completed</source>
-      <translation type="unfinished">Map Tile Set Import Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1276"/>
-      <source>Append to existing set</source>
-      <translation type="unfinished">Append to existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1282"/>
-      <source>Replace existing set</source>
-      <translation type="unfinished">Replace existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1307"/>
-      <source>Import Tile Set</source>
-      <translation type="unfinished">Import Tile Set</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineVehicleFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
-      <source>Vehicle Information</source>
-      <translation type="unfinished">Vehicle Information</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
-      <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>PIDTuning</name>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune enabled</source>
-      <translation type="unfinished">Autotune enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune disabled</source>
-      <translation type="unfinished">Autotune disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="227"/>
-      <source>Select Tuning:</source>
-      <translation type="unfinished">Select Tuning:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="253"/>
-      <source>Clipboard Values:</source>
-      <translation type="unfinished">Clipboard Values:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="279"/>
-      <source>Save To Clipboard</source>
-      <translation type="unfinished">Save To Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="284"/>
-      <source>Restore From Clipboard</source>
-      <translation type="unfinished">Restore From Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="343"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="371"/>
-      <source>Automatic Flight Mode Switching</source>
-      <translation type="unfinished">Automatic Flight Mode Switching</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="381"/>
-      <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
-      <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
-      <source>Switches to &apos;%1&apos; when you click Stop.</source>
-      <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <source>FLIGHT MODES</source>
-      <translation type="unfinished">FLIGHT MODES</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <source>You can assign multiple flight modes to a single channel. </source>
-      <translation type="unfinished">You can assign multiple flight modes to a single channel. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <source>Turn your radio control on to test switch settings. </source>
-      <translation type="unfinished">Turn your radio control on to test switch settings. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <source>The following channels: </source>
-      <translation type="unfinished">The following channels: </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <source> are not available for Flight Modes since they are already in use for other functions.</source>
-      <translation type="unfinished"> are not available for Flight Modes since they are already in use for other functions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <source>Manual/Main</source>
-      <translation type="unfinished">Manual/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <source>Stabilized/Main</source>
-      <translation type="unfinished">Stabilized/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <source>The pilot has full control of the aircraft, no assistance is provided. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, no assistance is provided. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <source>The Main mode switch must always be assigned to a channel in order to fly</source>
-      <translation type="unfinished">The Main mode switch must always be assigned to a channel in order to fly</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <source>The pilot has full control of the aircraft, only attitude is stabilized. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, only attitude is stabilized. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <source>Assist</source>
-      <translation type="unfinished">Assist</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <source>If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <source>In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</source>
-      <translation type="unfinished">In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <source>If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <source>In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</source>
-      <translation type="unfinished">In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <source>Roll/pitch angles and rudder deflection are controlled. </source>
-      <translation type="unfinished">Roll/pitch angles and rudder deflection are controlled. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <source>The angular rates are controlled, but not the attitude. </source>
-      <translation type="unfinished">The angular rates are controlled, but not the attitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <source>Roll stick controls banking, pitch stick altitude </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick altitude </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <source>Throttle stick controls speed. </source>
-      <translation type="unfinished">Throttle stick controls speed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <source>With no stick inputs the plane holds heading, but drifts off in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane holds heading, but drifts off in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <source>Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </source>
-      <translation type="unfinished">Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <source>Position Control</source>
-      <translation type="unfinished">Position Control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <source>Roll stick controls banking, pitch stick controls altitude. </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick controls altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <source>Throttle stick controls speed.</source>
-      <translation type="unfinished">Throttle stick controls speed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <source>With no stick inputs the plane flies a straight line, even in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane flies a straight line, even in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <source>Roll and Pitch sticks control sideways and forward speed </source>
-      <translation type="unfinished">Roll and Pitch sticks control sideways and forward speed </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <source>Throttle stick controls climb / sink rade. </source>
-      <translation type="unfinished">Throttle stick controls climb / sink rade. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <source>The aircraft obeys the programmed mission sent by QGroundControl. </source>
-      <translation type="unfinished">The aircraft obeys the programmed mission sent by QGroundControl. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <source>The aircraft flies in a circle around the current position at the current altitude. </source>
-      <translation type="unfinished">The aircraft flies in a circle around the current position at the current altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <source>The multirotor hovers at the current position and altitude. </source>
-      <translation type="unfinished">The multirotor hovers at the current position and altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <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 launch position, loiters and then lands. </source>
-      <translation type="unfinished">The vehicle returns to the launch position, loiters and then lands. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <source>All flight control aspects are controlled by an offboard system.</source>
-      <translation type="unfinished">All flight control aspects are controlled by an offboard system.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <source>Flight Mode Config is disabled since you have a Joystick enabled.</source>
-      <translation type="unfinished">Flight Mode Config is disabled since you have a Joystick enabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <source>Use Single Channel Mode Selection</source>
-      <translation type="unfinished">Use Single Channel Mode Selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <source>Generate Thresholds</source>
-      <translation type="unfinished">Generate Thresholds</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModesController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="151"/>
-      <source>%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="167"/>
-      <source>%1 is set to same channel as %2.
-</source>
-      <translation type="unfinished">%1 is set to same channel as %2.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="177"/>
-      <source>%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="144"/>
-      <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="37"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="38"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
-      <source>Rattitude</source>
-      <translation type="unfinished">Rattitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
-      <source>Return to Groundstation</source>
-      <translation type="unfinished">Return to Groundstation</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="187"/>
-      <source>Unknown %1:%2</source>
-      <translation type="unfinished">Unknown %1:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="396"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="416"/>
-      <source>Unable to go to location, vehicle position not known.</source>
-      <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="489"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="498"/>
-      <source>Unable to change altitude, home position unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="502"/>
-      <source>Unable to change altitude, home position altitude unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="533"/>
-      <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="537"/>
-      <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="609"/>
-      <source>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</source>
-      <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwareUpgradeThreadWorker</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="153"/>
-      <source>Programming new version...</source>
-      <translation type="unfinished">Programming new version...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="163"/>
-      <source>Verifying program...</source>
-      <translation type="unfinished">Verifying program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="167"/>
-      <source>Verify complete</source>
-      <translation type="unfinished">Verify complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="174"/>
-      <source>Rebooting board</source>
-      <translation type="unfinished">Rebooting board</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="198"/>
-      <source>Erasing previous program...</source>
-      <translation type="unfinished">Erasing previous program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="202"/>
-      <source>Erase complete</source>
-      <translation type="unfinished">Erase complete</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehavior</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
-      <source>Flight Behavior</source>
-      <translation type="unfinished">Flight Behavior</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
-      <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehaviorCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <source>Responsiveness</source>
-      <translation type="unfinished">Responsiveness</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <source>Horizontal velocity (m/s)</source>
-      <translation type="unfinished">Horizontal velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <source>Vertial velocity (m/s)</source>
-      <translation type="unfinished">Vertial velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <source>Mission Turning Radius</source>
-      <translation type="unfinished">Mission Turning Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlowSensor</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FlowSensor.qml" line="23"/>
-      <source>PX4Flow Camera</source>
-      <translation type="unfinished">PX4Flow Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4ParameterMetaData</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="342"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="16"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="27"/>
-      <source>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</source>
-      <translation type="unfinished">Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <source>Flaps</source>
-      <translation type="unfinished">Flaps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <source>Aux1</source>
-      <translation type="unfinished">Aux1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <source>Aux2</source>
-      <translation type="unfinished">Aux2</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4SimpleFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <source>Mode Channel</source>
-      <translation type="unfinished">Mode Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <source>Flight Mode %1</source>
-      <translation type="unfinished">Flight Mode %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <source>Switch Settings</source>
-      <translation type="unfinished">Switch Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
-      <source>PID Tuning</source>
-      <translation type="unfinished">PID Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
-      <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <source>Rate Controller</source>
-      <translation type="unfinished">Rate Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <source>Attitude Controller</source>
-      <translation type="unfinished">Attitude Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <source>Velocity Controller</source>
-      <translation type="unfinished">Velocity Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <source>Position Controller</source>
-      <translation type="unfinished">Position Controller</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAttitude</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <source>Proportional Gain (MC_YAW_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterPosition</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <source>Proportional gain (MPC_Z_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterRate</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterVelocity</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <source>Increase to reduce steady-state error</source>
-      <translation type="unfinished">Increase to reduce steady-state error</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <source>TECS</source>
-      <translation type="unfinished">TECS</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneTECS</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <source>Altitude &amp; Airspeed</source>
-      <translation type="unfinished">Altitude &amp; Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <source>TODO</source>
-      <translation type="unfinished">TODO</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentVTOL</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <source>Multirotor</source>
-      <translation type="unfinished">Multirotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingManager</name>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
-      <source>Pairing Successfull</source>
-      <translation type="unfinished">Pairing Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
-      <source>Connection Successfull</source>
-      <translation type="unfinished">Connection Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
-      <source>Connection Rejected</source>
-      <translation type="unfinished">Connection Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
-      <source>Pairing Rejected</source>
-      <translation type="unfinished">Pairing Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
-      <source>No Response From Vehicle</source>
-      <translation type="unfinished">No Response From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
-      <source>Connecting to %1</source>
-      <translation type="unfinished">Connecting to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
-      <source>Invalid Pairing File</source>
-      <translation type="unfinished">Invalid Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="257"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="265"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="278"/>
-      <source>Error Parsing Pairing File</source>
-      <translation type="unfinished">Error Parsing Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
-      <source>NFC</source>
-      <translation type="unfinished">NFC</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="495"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="517"/>
-      <source>Pairing...</source>
-      <translation type="unfinished">Pairing...</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingNFC</name>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="30"/>
-      <source>Waiting for NFC connection</source>
-      <translation type="unfinished">Waiting for NFC connection</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
-      <source>Device detected</source>
-      <translation type="unfinished">Device detected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
-      <source>Device removed</source>
-      <translation type="unfinished">Device removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterDiffDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="42"/>
-      <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="43"/>
-      <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="71"/>
-      <source>Comp ID</source>
-      <translation type="unfinished">Comp ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="78"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="84"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="93"/>
-      <source>N/A</source>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditor</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="63"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="85"/>
-      <source>Show modified only</source>
-      <translation type="unfinished">Show modified only</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
-      <source>Tools</source>
-      <translation type="unfinished">Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="105"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="109"/>
-      <source>Reset all to firmware&apos;s defaults</source>
-      <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="110"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="115"/>
-      <source>Reset All</source>
-      <translation type="unfinished">Reset All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="113"/>
-      <source>Reset to vehicle&apos;s configuration defaults</source>
-      <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="119"/>
-      <source>Load from file...</source>
-      <translation type="unfinished">Load from file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="121"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="127"/>
-      <source>Save to file...</source>
-      <translation type="unfinished">Save to file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="129"/>
-      <source>Save Parameters</source>
-      <translation type="unfinished">Save Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="136"/>
-      <source>Clear all RC to Param</source>
-      <translation type="unfinished">Clear all RC to Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="318"/>
-      <source>Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="142"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="143"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="275"/>
-      <source>Parameter Editor</source>
-      <translation type="unfinished">Parameter Editor</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>Parameter Files (*.%1)</source>
-      <translation type="unfinished">Parameter Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="333"/>
-      <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="350"/>
-      <source>Select Ok to reboot vehicle.</source>
-      <translation type="unfinished">Select Ok to reboot vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorController</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="217"/>
-      <source>Unable to create file: %1</source>
-      <translation type="unfinished">Unable to create file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="258"/>
-      <source>Unable to open file: %1</source>
-      <translation type="unfinished">Unable to open file: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="135"/>
-      <source>Reset to default</source>
-      <translation type="unfinished">Reset to default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="209"/>
-      <source>Min: </source>
-      <translation type="unfinished">Min: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="214"/>
-      <source>Max: </source>
-      <translation type="unfinished">Max: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="219"/>
-      <source>Default: </source>
-      <translation type="unfinished">Default: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="225"/>
-      <source>Parameter name: </source>
-      <translation type="unfinished">Parameter name: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
-      <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
-      <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="243"/>
-      <source>Make sure you know what you are doing and double-check your values before Save!</source>
-      <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
-      <source>Force save (dangerous!)</source>
-      <translation type="unfinished">Force save (dangerous!)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="267"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="282"/>
-      <source>Manual Entry</source>
-      <translation type="unfinished">Manual Entry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
-      <source>Set RC to Param</source>
-      <translation type="unfinished">Set RC to Param</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterManager</name>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="678"/>
-      <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="700"/>
-      <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="926"/>
-      <source>Parameter cache CRC match failed</source>
-      <translation type="unfinished">Parameter cache CRC match failed</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="977"/>
-      <source>Parameters not loaded since they are not currently on the vehicle: %1
-</source>
-      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
-</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="981"/>
-      <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1149"/>
-      <source>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</source>
-      <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1175"/>
-      <source>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</source>
-      <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PhotoVideoControl</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
-      <source>Video Grab</source>
-      <translation type="unfinished">Video Grab</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="243"/>
-      <source>Camera Trigger</source>
-      <translation type="unfinished">Camera Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="299"/>
-      <source>Free Space: </source>
-      <translation type="unfinished">Free Space: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="305"/>
-      <source>Battery: </source>
-      <translation type="unfinished">Battery: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="316"/>
-      <source>Settings</source>
-      <translation type="unfinished">Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="331"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
-      <source>Video Stream</source>
-      <translation type="unfinished">Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
-      <source>Thermal View Mode</source>
-      <translation type="unfinished">Thermal View Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
-      <source>Blend Opacity</source>
-      <translation type="unfinished">Blend Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="364"/>
-      <source>Photo Mode</source>
-      <translation type="unfinished">Photo Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
-      <source>Photo Interval (seconds)</source>
-      <translation type="unfinished">Photo Interval (seconds)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
-      <source>Video Screen Fit</source>
-      <translation type="unfinished">Video Screen Fit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
-      <source>Reset Camera Defaults</source>
-      <translation type="unfinished">Reset Camera Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Blend</source>
-      <translation type="unfinished">Blend</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Full</source>
-      <translation type="unfinished">Full</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Picture In Picture</source>
-      <translation type="unfinished">Picture In Picture</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Time Lapse</source>
-      <translation type="unfinished">Time Lapse</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="533"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
-      <source>Reset Camera to Factory Settings</source>
-      <translation type="unfinished">Reset Camera to Factory Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
-      <source>Confirm resetting all settings?</source>
-      <translation type="unfinished">Confirm resetting all settings?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="551"/>
-      <source>Format</source>
-      <translation type="unfinished">Format</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="556"/>
-      <source>Format Camera Storage</source>
-      <translation type="unfinished">Format Camera Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="557"/>
-      <source>Confirm erasing all files?</source>
-      <translation type="unfinished">Confirm erasing all files?</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanManager</name>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="178"/>
-      <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
-      <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="183"/>
-      <source>Mission request list failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="187"/>
-      <source>Retrying %1 REQUEST_LIST retry Count</source>
-      <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="194"/>
-      <source>Mission read failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="198"/>
-      <source>Retrying %1 MISSION_REQUEST retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="206"/>
-      <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
-      <source>Mission write mission count failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="220"/>
-      <source>Vehicle did not request all items from ground station: %1</source>
-      <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="228"/>
-      <source>Mission remove all, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="232"/>
-      <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="239"/>
-      <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="350"/>
-      <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="500"/>
-      <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="615"/>
-      <source>Vehicle remove all failed. Error: %1</source>
-      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="690"/>
-      <source>Item #%1 Command: %2</source>
-      <translation type="unfinished">Item #%1 Command: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="694"/>
-      <source>Frame: %1</source>
-      <translation type="unfinished">Frame: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="700"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="703"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="706"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="709"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="712"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="715"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="718"/>
-      <source>Value: %1</source>
-      <translation type="unfinished">Value: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="737"/>
-      <source>Mission accepted.</source>
-      <translation type="unfinished">Mission accepted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="740"/>
-      <source>Unspecified error.</source>
-      <translation type="unfinished">Unspecified error.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="743"/>
-      <source>Coordinate frame is not supported.</source>
-      <translation type="unfinished">Coordinate frame is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="746"/>
-      <source>Command is not supported.</source>
-      <translation type="unfinished">Command is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="749"/>
-      <source>Mission item exceeds storage space.</source>
-      <translation type="unfinished">Mission item exceeds storage space.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="752"/>
-      <source>One of the parameters has an invalid value.</source>
-      <translation type="unfinished">One of the parameters has an invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="755"/>
-      <source>Param 1 invalid value.</source>
-      <translation type="unfinished">Param 1 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="758"/>
-      <source>Param 2 invalid value.</source>
-      <translation type="unfinished">Param 2 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="761"/>
-      <source>Param 3 invalid value.</source>
-      <translation type="unfinished">Param 3 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="764"/>
-      <source>Param 4 invalid value.</source>
-      <translation type="unfinished">Param 4 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="767"/>
-      <source>Param 5 invalid value.</source>
-      <translation type="unfinished">Param 5 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="770"/>
-      <source>Param 6 invalid value.</source>
-      <translation type="unfinished">Param 6 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="773"/>
-      <source>Param 7 invalid value.</source>
-      <translation type="unfinished">Param 7 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="776"/>
-      <source>Received mission item out of sequence.</source>
-      <translation type="unfinished">Received mission item out of sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="779"/>
-      <source>Not accepting any mission commands.</source>
-      <translation type="unfinished">Not accepting any mission commands.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-      <source>Unknown error: %1.</source>
-      <translation type="unfinished">Unknown error: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="626"/>
-      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanMasterController</name>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="223"/>
-      <source>Download not supported on high latency links.</source>
-      <translation type="unfinished">Download not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="337"/>
-      <source>Upload not supported on high latency links.</source>
-      <translation type="unfinished">Upload not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="357"/>
-      <source>Error loading Plan file (%1). %2</source>
-      <translation type="unfinished">Error loading Plan file (%1). %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="481"/>
-      <source>Plan save error %1 : %2</source>
-      <translation type="unfinished">Plan save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="513"/>
-      <source>KML save error %1 : %2</source>
-      <translation type="unfinished">KML save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="584"/>
-      <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
-      <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="585"/>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>Plan Files (*.%1)</source>
-      <translation type="unfinished">Plan Files (*.%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanToolBarIndicators</name>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="138"/>
-      <source>Selected Waypoint</source>
-      <translation type="unfinished">Selected Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="143"/>
-      <source>Alt diff:</source>
-      <translation type="unfinished">Alt diff:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="152"/>
-      <source>Azimuth:</source>
-      <translation type="unfinished">Azimuth:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="161"/>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="197"/>
-      <source>Distance:</source>
-      <translation type="unfinished">Distance:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="168"/>
-      <source>Gradient:</source>
-      <translation type="unfinished">Gradient:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="177"/>
-      <source>Heading:</source>
-      <translation type="unfinished">Heading:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="192"/>
-      <source>Total Mission</source>
-      <translation type="unfinished">Total Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="206"/>
-      <source>Max telem dist:</source>
-      <translation type="unfinished">Max telem dist:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="213"/>
-      <source>Time:</source>
-      <translation type="unfinished">Time:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="229"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="234"/>
-      <source>Batteries required:</source>
-      <translation type="unfinished">Batteries required:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload Required</source>
-      <translation type="unfinished">Upload Required</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="308"/>
-      <source>Syncing Mission</source>
-      <translation type="unfinished">Syncing Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="316"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanView</name>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="62"/>
-      <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation type="unfinished">Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="129"/>
-      <source>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</source>
-      <translation type="unfinished">You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="209"/>
-      <source>You need at least one item to create a KML.</source>
-      <translation type="unfinished">You need at least one item to create a KML.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Plan is waiting on terrain data from server for correct altitude values.</source>
-      <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="263"/>
-      <source>Plan Upload</source>
-      <translation type="unfinished">Plan Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="269"/>
-      <source>Select Plan File</source>
-      <translation type="unfinished">Select Plan File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="280"/>
-      <source>Save Plan</source>
-      <translation type="unfinished">Save Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="295"/>
-      <source>Save KML</source>
-      <translation type="unfinished">Save KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="401"/>
-      <source>Move the selected mission item to the be after following mission item:</source>
-      <translation type="unfinished">Move the selected mission item to the be after following mission item:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="642"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="685"/>
-      <source>Pattern</source>
-      <translation type="unfinished">Pattern</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="708"/>
-      <source>Center</source>
-      <translation type="unfinished">Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="619"/>
-      <location filename="../src/PlanView/PlanView.qml" line="785"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="121"/>
-      <source>Apply new altitude</source>
-      <translation type="unfinished">Apply new altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Disconnected</source>
-      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Changed</source>
-      <translation type="unfinished">Plan View - Vehicle Changed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="148"/>
-      <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="149"/>
-      <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="156"/>
-      <source>Discard Unsaved Changes</source>
-      <translation type="unfinished">Discard Unsaved Changes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="157"/>
-      <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="158"/>
-      <source>Load New Plan From Vehicle</source>
-      <translation type="unfinished">Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="169"/>
-      <source>Keep Current Plan</source>
-      <translation type="unfinished">Keep Current Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="170"/>
-      <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="187"/>
-      <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Send To Vehicle</source>
-      <translation type="unfinished">Send To Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="637"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="651"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>Cancel ROI</source>
-      <translation type="unfinished">Cancel ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="817"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="820"/>
-      <source>Fence</source>
-      <translation type="unfinished">Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="824"/>
-      <source>Rally</source>
-      <translation type="unfinished">Rally</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="942"/>
-      <source>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="954"/>
-      <source>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1228"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="978"/>
-      <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1004"/>
-      <source>Create complex pattern:</source>
-      <translation type="unfinished">Create complex pattern:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Mission overwrite</source>
-      <translation type="unfinished">Mission overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>GeoFence overwrite</source>
-      <translation type="unfinished">GeoFence overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Rally Points overwrite</source>
-      <translation type="unfinished">Rally Points overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1037"/>
-      <source>You have unsaved changes.</source>
-      <translation type="unfinished">You have unsaved changes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1136"/>
-      <source>Open...</source>
-      <translation type="unfinished">Open...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1150"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Unable to %1</source>
-      <translation type="unfinished">Unable to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <source>Plan has incomplete items. Complete all items and %1 again.</source>
-      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="967"/>
-      <source>Are you sure you want to remove current plan and create a new plan? </source>
-      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1036"/>
-      <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1044"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1096"/>
-      <source>Create Plan</source>
-      <translation type="unfinished">Create Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1115"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1164"/>
-      <source>Save As...</source>
-      <translation type="unfinished">Save As...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1176"/>
-      <source>Save Mission Waypoints As KML...</source>
-      <translation type="unfinished">Save Mission Waypoints As KML...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1181"/>
-      <source>KML</source>
-      <translation type="unfinished">KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1202"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1193"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1213"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-  </context>
-  <context>
-    <name>PolygonEditor</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>Click to add point %1</source>
-      <translation type="unfinished">Click to add point %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>- Right Click to end polygon</source>
-      <translation type="unfinished">- Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="185"/>
-      <source>Click to add point</source>
-      <translation type="unfinished">Click to add point</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="192"/>
-      <source>Click to add point - Right Click to end polygon</source>
-      <translation type="unfinished">Click to add point - Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="198"/>
-      <source>Adjust polygon by dragging corners</source>
-      <translation type="unfinished">Adjust polygon by dragging corners</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <source>Performing calibration. This will take a few seconds..</source>
-      <translation type="unfinished">Performing calibration. This will take a few seconds..</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>ESC Calibration failed</source>
-      <translation type="unfinished">ESC Calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <source>ESC Calibration failed. </source>
-      <translation type="unfinished">ESC Calibration failed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <source>Calibration complete. You can disconnect your battery now if you like.</source>
-      <translation type="unfinished">Calibration complete. You can disconnect your battery now if you like.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source> Connect the battery now and calibration will begin.</source>
-      <translation type="unfinished"> Connect the battery now and calibration will begin.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</source>
-      <translation type="unfinished">You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <source>Battery </source>
-      <translation type="unfinished">Battery </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <source>Voltage divider:</source>
-      <translation type="unfinished">Voltage divider:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <source>Number of Cells (in Series)</source>
-      <translation type="unfinished">Number of Cells (in Series)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <source>Full Voltage (per cell)</source>
-      <translation type="unfinished">Full Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <source>Battery Max:</source>
-      <translation type="unfinished">Battery Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <source>Empty Voltage (per cell)</source>
-      <translation type="unfinished">Empty Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <source>Battery Min:</source>
-      <translation type="unfinished">Battery Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <source>Voltage divider</source>
-      <translation type="unfinished">Voltage divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <source>Calculate Voltage Divider</source>
-      <translation type="unfinished">Calculate Voltage Divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <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. </source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <source>Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <source>Amps per volt</source>
-      <translation type="unfinished">Amps per volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <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. </source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <source>ESC PWM Minimum and Maximum Calibration</source>
-      <translation type="unfinished">ESC PWM Minimum and Maximum Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <source>You must use USB connection for this operation.</source>
-      <translation type="unfinished">You must use USB connection for this operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <source>Show UAVCAN Settings</source>
-      <translation type="unfinished">Show UAVCAN Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <source>UAVCAN Bus Configuration</source>
-      <translation type="unfinished">UAVCAN Bus Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <source>Change required restart</source>
-      <translation type="unfinished">Change required restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <source>UAVCAN Motor Index and Direction Assignment</source>
-      <translation type="unfinished">UAVCAN Motor Index and Direction Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <source>ESC parameters will only be accessible in the editor after assignment.</source>
-      <translation type="unfinished">ESC parameters will only be accessible in the editor after assignment.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <source>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</source>
-      <translation type="unfinished">Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <source>Start Assignment</source>
-      <translation type="unfinished">Start Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <source>Stop Assignment</source>
-      <translation type="unfinished">Stop Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <source>Show Advanced Settings</source>
-      <translation type="unfinished">Show Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <source>Voltage Drop on Full Load (per cell)</source>
-      <translation type="unfinished">Voltage Drop on Full Load (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <source>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </source>
-      <translation type="unfinished">Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <source>throttle, divided by the number of battery cells. Leave at the default if unsure. </source>
-      <translation type="unfinished">throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <source>If this value is set too high, the battery might be deep discharged and damaged.</source>
-      <translation type="unfinished">If this value is set too high, the battery might be deep discharged and damaged.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <source>Compensated Minimum Voltage:</source>
-      <translation type="unfinished">Compensated Minimum Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <source> V</source>
-      <translation type="unfinished"> V</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="19"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="30"/>
-      <source>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</source>
-      <translation type="unfinished">Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <source>Battery Full</source>
-      <translation type="unfinished">Battery Full</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <source>Battery Empty</source>
-      <translation type="unfinished">Battery Empty</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <source>Number of Cells</source>
-      <translation type="unfinished">Number of Cells</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightBatteryCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="18"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="19"/>
-      <source>Battery connector firmly plugged?</source>
-      <translation type="unfinished">Battery connector firmly plugged?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="22"/>
-      <source>Warning - Battery charge below %1%.</source>
-      <translation type="unfinished">Warning - Battery charge below %1%.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="23"/>
-      <source>Battery charge below %1%. Please recharge.</source>
-      <translation type="unfinished">Battery charge below %1%. Please recharge.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckButton</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="54"/>
-      <source>Passed</source>
-      <translation type="unfinished">Passed</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckGroup</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
-      <source> (passed)</source>
-      <translation type="unfinished"> (passed)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckList</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>Pre-Flight Checklist %1</source>
-      <translation type="unfinished">Pre-Flight Checklist %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>(passed)</source>
-      <translation type="unfinished">(passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="93"/>
-      <source>Reset the checklist (e.g. after a vehicle reboot)</source>
-      <translation type="unfinished">Reset the checklist (e.g. after a vehicle reboot)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>(Passed)</source>
-      <translation type="unfinished">(Passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>In Progress</source>
-      <translation type="unfinished">In Progress</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckListShowAction</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
-      <source>Checklist</source>
-      <translation type="unfinished">Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightGPSCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="17"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="20"/>
-      <source>Waiting for 3D lock.</source>
-      <translation type="unfinished">Waiting for 3D lock.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Warning - Sat count below %1.</source>
-      <translation type="unfinished">Warning - Sat count below %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Waiting for sat count above %1.</source>
-      <translation type="unfinished">Waiting for sat count above %1.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightRCCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="17"/>
-      <source>Radio Control</source>
-      <translation type="unfinished">Radio Control</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="18"/>
-      <source>Receiving signal. Perform range test &amp; confirm.</source>
-      <translation type="unfinished">Receiving signal. Perform range test &amp; confirm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="19"/>
-      <source>No signal or invalid autopilot-RC config. Check RC and console.</source>
-      <translation type="unfinished">No signal or invalid autopilot-RC config. Check RC and console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSensorsHealthCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="17"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="35"/>
-      <source>Failure. Magnetometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Magnetometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="36"/>
-      <source>Failure. Accelerometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Accelerometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="37"/>
-      <source>Failure. Gyroscope issues. Check console.</source>
-      <translation type="unfinished">Failure. Gyroscope issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="38"/>
-      <source>Failure. Barometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Barometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="39"/>
-      <source>Failure. Airspeed sensor issues. Check console.</source>
-      <translation type="unfinished">Failure. Airspeed sensor issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="40"/>
-      <source>Failure. AHRS issues. Check console.</source>
-      <translation type="unfinished">Failure. AHRS issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="41"/>
-      <source>Failure. GPS issues. Check console.</source>
-      <translation type="unfinished">Failure. GPS issues. Check console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSoundCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="16"/>
-      <source>Sound output</source>
-      <translation type="unfinished">Sound output</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="17"/>
-      <source>QGC audio output enabled. System audio output enabled, too?</source>
-      <translation type="unfinished">QGC audio output enabled. System audio output enabled, too?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="18"/>
-      <source>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</source>
-      <translation type="unfinished">QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
-    </message>
-  </context>
-  <context>
-    <name>ProximityRadarValues</name>
-    <message>
-      <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCApplication</name>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="198"/>
-      <source>You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="214"/>
-      <source>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="580"/>
-      <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
-      <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="588"/>
-      <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
-      <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="656"/>
-      <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
-      <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="714"/>
-      <source>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</source>
-      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>New Version Available</source>
-      <translation type="unfinished">New Version Available</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="673"/>
-      <source>Unable to save telemetry log. Application save directory is not set.</source>
-      <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="680"/>
-      <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
-      <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCControlDebug</name>
-    <message>
-      <location filename="../src/QmlControls/QGCControlDebug.qml" line="22"/>
-      <source>%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</source>
-      <comment>Do not translate</comment>
-      <translation type="unfinished">%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCCorePlugin</name>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="134"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="138"/>
-      <source>Comm Links</source>
-      <translation type="unfinished">Comm Links</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="142"/>
-      <source>Offline Maps</source>
-      <translation type="unfinished">Offline Maps</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="147"/>
-      <source>Taisync</source>
-      <translation type="unfinished">Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="153"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="159"/>
-      <source>AirMap</source>
-      <translation type="unfinished">AirMap</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="164"/>
-      <source>MAVLink</source>
-      <translation type="unfinished">MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="168"/>
-      <source>Console</source>
-      <translation type="unfinished">Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="171"/>
-      <source>Help</source>
-      <translation type="unfinished">Help</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="176"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="179"/>
-      <source>Debug</source>
-      <translation type="unfinished">Debug</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="182"/>
-      <source>Palette Test</source>
-      <translation type="unfinished">Palette Test</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="201"/>
-      <source>Vibration</source>
-      <translation type="unfinished">Vibration</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
-      <source>Log Download</source>
-      <translation type="unfinished">Log Download</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
-      <source>GeoTag Images</source>
-      <translation type="unfinished">GeoTag Images</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="197"/>
-      <source>MAVLink Console</source>
-      <translation type="unfinished">MAVLink Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="199"/>
-      <source>MAVLink Inspector</source>
-      <translation type="unfinished">MAVLink Inspector</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="286"/>
-      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
-      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFenceCircle</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
-      <source>GeoFence Circle only supports version %1</source>
-      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFencePolygon</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
-      <source>GeoFence Polygon only supports version %1</source>
-      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="123"/>
-      <source>Path: %1</source>
-      <translation type="unfinished">Path: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="154"/>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="267"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="165"/>
-      <source>No files</source>
-      <translation type="unfinished">No files</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="206"/>
-      <source>New file name:</source>
-      <translation type="unfinished">New file name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="219"/>
-      <source>File names must end with .%1 file extension. If missing it will be added.</source>
-      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="227"/>
-      <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="235"/>
-      <source>Save to existing file:</source>
-      <translation type="unfinished">Save to existing file:</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDownload</name>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="102"/>
-      <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="112"/>
-      <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="135"/>
-      <source>Download cancelled</source>
-      <translation type="unfinished">Download cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="138"/>
-      <source>Error: File Not Found</source>
-      <translation type="unfinished">Error: File Not Found</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="141"/>
-      <source>Error during download. Error: %1</source>
-      <translation type="unfinished">Error during download. Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCLogEntry</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-      <source>Pending</source>
-      <translation type="unfinished">Pending</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMAVLinkSystem</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="587"/>
-      <source>Comp All</source>
-      <translation type="unfinished">Comp All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="592"/>
-      <source>Comp %1</source>
-      <translation type="unfinished">Comp %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolygonVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
-      <source>Polygon Tools</source>
-      <translation type="unfinished">Polygon Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="51"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
-      <source>Set radius...</source>
-      <translation type="unfinished">Set radius...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
-      <source>Edit Center Position</source>
-      <translation type="unfinished">Edit Center Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
-      <source>Edit Vertex Position</source>
-      <translation type="unfinished">Edit Vertex Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
-      <source>Circular</source>
-      <translation type="unfinished">Circular</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolylineVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
-      <source>Polyline Tools</source>
-      <translation type="unfinished">Polyline Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="41"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
-      <source>Select KML File</source>
-      <translation type="unfinished">Select KML File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="335"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="359"/>
-      <source>Load KML...</source>
-      <translation type="unfinished">Load KML...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCOptionsComboBox</name>
-    <message>
-      <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPluginHost</name>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
-      <source>Loaded Plugins</source>
-      <translation type="unfinished">Loaded Plugins</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
-      <source>Plugin Log</source>
-      <translation type="unfinished">Plugin Log</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPopupDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCTextField</name>
-    <message>
-      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-      <source>?</source>
-      <translation type="unfinished">?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCViewDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="34"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="37"/>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="46"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="40"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="43"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="49"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="52"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="55"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="58"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="61"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="64"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="67"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="73"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="76"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="79"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="82"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="85"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGroundControlQmlGlobal</name>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="254"/>
-      <source>32 bit</source>
-      <translation type="unfinished">32 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="256"/>
-      <source>64 bit</source>
-      <translation type="unfinished">64 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="270"/>
-      <source>(AMSL)</source>
-      <translation type="unfinished">(AMSL)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="272"/>
-      <source>(CalcT)</source>
-      <translation type="unfinished">(CalcT)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="292"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="294"/>
-      <source>Calc Above Terrain</source>
-      <translation type="unfinished">Calc Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="298"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="274"/>
-      <source>(TerrF)</source>
-      <translation type="unfinished">(TerrF)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="290"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="296"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-  </context>
-  <context>
-    <name>QMap3D</name>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="20"/>
-      <source>Map</source>
-      <translation type="unfinished">Map</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="30"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>QObject</name>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
-      <source>OpenPilot</source>
-      <translation type="unfinished">OpenPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="68"/>
-      <source>Guided mode not supported by Vehicle.</source>
-      <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="32"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="46"/>
-      <source>The following required keys are missing: %1</source>
-      <translation type="unfinished">The following required keys are missing: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="60"/>
-      <source>value for coordinate is not array</source>
-      <translation type="unfinished">value for coordinate is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="67"/>
-      <source>Coordinate array must contain %1 values</source>
-      <translation type="unfinished">Coordinate array must contain %1 values</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="73"/>
-      <source>Coordinate array may only contain double values, found: %1</source>
-      <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="151"/>
-      <source>Incorrect value type - key:type:expected %1:%2:%3</source>
-      <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="209"/>
-      <source>Incorrect file type key expected:%1 actual:%2</source>
-      <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="216"/>
-      <source>File version %1 is no longer supported</source>
-      <translation type="unfinished">File version %1 is no longer supported</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="220"/>
-      <source>File version %1 is newer than current supported version %2</source>
-      <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="379"/>
-      <source>value for coordinate array is not array</source>
-      <translation type="unfinished">value for coordinate array is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="488"/>
-      <source>Unknown type: %1</source>
-      <translation type="unfinished">Unknown type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="252"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="253"/>
-      <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
-      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QmlTest</name>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
-      <source>Window Color</source>
-      <translation type="unfinished">Window Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
-      <source>Import/Export</source>
-      <translation type="unfinished">Import/Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
-      <source>Light</source>
-      <translation type="unfinished">Light</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
-      <source>Dark</source>
-      <translation type="unfinished">Dark</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
-      <source>QGC name</source>
-      <translation type="unfinished">QGC name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</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>
-      <translation type="unfinished">Button</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
-      <source>Hover Button</source>
-      <translation type="unfinished">Hover Button</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>
-      <translation type="unfinished">Item 1</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>
-      <translation type="unfinished">Item 2</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>
-      <translation type="unfinished">Item 3</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
-      <source>Check Box</source>
-      <translation type="unfinished">Check Box</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
-      <source>SUB MENU</source>
-      <translation type="unfinished">SUB MENU</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Status</source>
-      <translation type="unfinished">RC RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Data Unavailable</source>
-      <translation type="unfinished">RC RSSI Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>N/A</source>
-      <comment>No data available</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
-      <source>RSSI:</source>
-      <translation type="unfinished">RSSI:</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCToParamDialog</name>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
-      <source>RC To Param</source>
-      <translation type="unfinished">RC To Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="44"/>
-      <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
-      <source>Waiting on parameter update from Vehicle.</source>
-      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
-      <source>Parameter</source>
-      <translation type="unfinished">Parameter</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
-      <source>Tuning ID</source>
-      <translation type="unfinished">Tuning ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
-      <source>Scale</source>
-      <translation type="unfinished">Scale</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
-      <source>Center Value</source>
-      <translation type="unfinished">Center Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
-      <source>Min Value</source>
-      <translation type="unfinished">Min Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
-      <source>Max Value</source>
-      <translation type="unfinished">Max Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
-      <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ROIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="53"/>
-      <source>ROI Disabled</source>
-      <translation type="unfinished">ROI Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="62"/>
-      <source>Disable ROI</source>
-      <translation type="unfinished">Disable ROI</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-      <source>Reboot required</source>
-      <translation type="unfinished">Reboot required</translation>
-    </message>
-    <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>
-      <translation type="unfinished">Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-      <source>Throttle channel reversed</source>
-      <translation type="unfinished">Throttle channel reversed</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>
-      <translation type="unfinished">Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</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>
-      <translation type="unfinished">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.</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>
-      <translation type="unfinished">Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
-
-%1</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>
-      <translation type="unfinished">Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>Please turn on transmitter.</source>
-      <translation type="unfinished">Please turn on transmitter.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>%1 channels or more are needed to fly.</source>
-      <translation type="unfinished">%1 channels or more are needed to fly.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="110"/>
-      <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
-      <translation type="unfinished">Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
-      <source>DSM2 Mode</source>
-      <translation type="unfinished">DSM2 Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
-      <source>DSMX (7 channels or less)</source>
-      <translation type="unfinished">DSMX (7 channels or less)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
-      <source>DSMX (8 channels or more)</source>
-      <translation type="unfinished">DSMX (8 channels or more)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
-      <source>Attitude Controls</source>
-      <translation type="unfinished">Attitude Controls</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="246"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="275"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="304"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="332"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="338"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="348"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="371"/>
-      <source>Additional Radio setup:</source>
-      <translation type="unfinished">Additional Radio setup:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="408"/>
-      <source>Spektrum Bind</source>
-      <translation type="unfinished">Spektrum Bind</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="413"/>
-      <source>Copy Trims</source>
-      <translation type="unfinished">Copy Trims</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="437"/>
-      <source>Mode 1</source>
-      <translation type="unfinished">Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="443"/>
-      <source>Mode 2</source>
-      <translation type="unfinished">Mode 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="118"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
-      <source>Move the Throttle stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="125"/>
-      <source>Move the Throttle stick all the way down and leave it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="126"/>
-      <source>Move the Yaw stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
-      <source>Move the Yaw stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
-      <source>Move the Roll stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
-      <source>Move the Roll stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
-      <source>Move the Pitch stick all the way down and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
-      <source>Move the Pitch stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
-      <source>Allow the Pitch stick to move back to center...</source>
-      <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
-      <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-      <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
-      <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-      <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="201"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="804"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="826"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="850"/>
-      <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">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.</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointController</name>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
-      <source>Rally: %1</source>
-      <translation type="unfinished">Rally: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
-      <source>Rally Points supports version %1</source>
-      <translation type="unfinished">Rally Points supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointEditorHeader</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
-      <source>Rally Points</source>
-      <translation type="unfinished">Rally Points</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">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-  </context>
-  <context>
-    <name>RoverChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
-      <source>Rover Initial Checks</source>
-      <translation type="unfinished">Rover Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
-      <source>Battery mounted and secured?</source>
-      <translation type="unfinished">Battery mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
-      <source>Mission area</source>
-      <translation type="unfinished">Mission area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
-      <source>Mission area and path free of obstacles/people?</source>
-      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SHPFileHelper</name>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="18"/>
-      <source>SHP file load failed. %1</source>
-      <translation type="unfinished">SHP file load failed. %1</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">UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="54"/>
-      <source>Only WGS84 or UTM projections are supported.</source>
-      <translation type="unfinished">Only WGS84 or UTM projections are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="57"/>
-      <source>PRJ file open failed: %1</source>
-      <translation type="unfinished">PRJ file open failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="60"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="63"/>
-      <source>File is not a .shp file: %1</source>
-      <translation type="unfinished">File is not a .shp file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="79"/>
-      <source>SHPOpen failed.</source>
-      <translation type="unfinished">SHPOpen failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="101"/>
-      <source>More than one entity found.</source>
-      <translation type="unfinished">More than one entity found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="105"/>
-      <source>No supported types found.</source>
-      <translation type="unfinished">No supported types found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="133"/>
-      <source>File does not contain a polygon.</source>
-      <translation type="unfinished">File does not contain a polygon.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="139"/>
-      <source>Only single part polygons are supported.</source>
-      <translation type="unfinished">Only single part polygons are supported.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <source>Low Battery Failsafe Trigger</source>
-      <translation type="unfinished">Low Battery Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <source>Battery Warn Level:</source>
-      <translation type="unfinished">Battery Warn Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <source>Battery Failsafe Level:</source>
-      <translation type="unfinished">Battery Failsafe Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <source>Battery Emergency Level:</source>
-      <translation type="unfinished">Battery Emergency Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <source>Object Detection</source>
-      <translation type="unfinished">Object Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <source>Collision Prevention:</source>
-      <translation type="unfinished">Collision Prevention:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <source>Obstacle Avoidance:</source>
-      <translation type="unfinished">Obstacle Avoidance:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <source>Minimum Distance: (</source>
-      <translation type="unfinished">Minimum Distance: (</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <source>Show obstacle distance overlay</source>
-      <translation type="unfinished">Show obstacle distance overlay</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <source>RC Loss Failsafe Trigger</source>
-      <translation type="unfinished">RC Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <source>RC Loss Timeout:</source>
-      <translation type="unfinished">RC Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <source>Data Link Loss Failsafe Trigger</source>
-      <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <source>Data Link Loss Timeout:</source>
-      <translation type="unfinished">Data Link Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <source>Geofence Failsafe Trigger</source>
-      <translation type="unfinished">Geofence Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <source>Action on breach:</source>
-      <translation type="unfinished">Action on breach:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <source>Max Radius:</source>
-      <translation type="unfinished">Max Radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <source>Max Altitude:</source>
-      <translation type="unfinished">Max Altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <source>Return To Launch Settings</source>
-      <translation type="unfinished">Return To Launch Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <source>Return to launch, then:</source>
-      <translation type="unfinished">Return to launch, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <source>Telemetry logging to vehicle storage:</source>
-      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <source>Climb to altitude of:</source>
-      <translation type="unfinished">Climb to altitude of:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <source>Loiter Altitude</source>
-      <translation type="unfinished">Loiter Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <source>Land Mode Settings</source>
-      <translation type="unfinished">Land Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <source>Landing Descent Rate:</source>
-      <translation type="unfinished">Landing Descent Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <source>Disarm After:</source>
-      <translation type="unfinished">Disarm After:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <source>Vehicle Telemetry Logging</source>
-      <translation type="unfinished">Vehicle Telemetry Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <source>Hardware in the Loop Simulation</source>
-      <translation type="unfinished">Hardware in the Loop Simulation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <source>HITL Enabled:</source>
-      <translation type="unfinished">HITL Enabled:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="19"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <source>Low Battery Failsafe</source>
-      <translation type="unfinished">Low Battery Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <source>RC Loss Failsafe</source>
-      <translation type="unfinished">RC Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <source>RC Loss Timeout</source>
-      <translation type="unfinished">RC Loss Timeout</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <source>Data Link Loss Failsafe</source>
-      <translation type="unfinished">Data Link Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <source>RTL Climb To</source>
-      <translation type="unfinished">RTL Climb To</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <source>RTL, Then</source>
-      <translation type="unfinished">RTL, Then</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <source>Loiter Alt</source>
-      <translation type="unfinished">Loiter Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <source>Land Delay</source>
-      <translation type="unfinished">Land Delay</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="27"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="39"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="173"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="190"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="276"/>
-      <source>Unsupported calibration firmware version, using log</source>
-      <translation type="unfinished">Unsupported calibration firmware version, using log</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="308"/>
-      <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
-      <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation type="unfinished">Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="395"/>
-      <source>Hold still in the current orientation</source>
-      <translation type="unfinished">Hold still in the current orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="433"/>
-      <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation type="unfinished">Place you vehicle into one of the orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="442"/>
-      <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="502"/>
-      <source>Reset successful</source>
-      <translation type="unfinished">Reset successful</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="509"/>
-      <source>Reset failed</source>
-      <translation type="unfinished">Reset failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <source>Compass 0</source>
-      <translation type="unfinished">Compass 0</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <source>Compass 1</source>
-      <translation type="unfinished">Compass 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <source>Compass 2</source>
-      <translation type="unfinished">Compass 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummaryFixedWing</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <source>Compass:</source>
-      <translation type="unfinished">Compass:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <source>Gyro:</source>
-      <translation type="unfinished">Gyro:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <source>Accelerometer:</source>
-      <translation type="unfinished">Accelerometer:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <source>Airspeed:</source>
-      <translation type="unfinished">Airspeed:</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsSetup</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <source>If the orientation is in the direction of flight, select ROTATION_NONE.</source>
-      <translation type="unfinished">If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <source>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <source>Compass Calibration Complete</source>
-      <translation type="unfinished">Compass Calibration Complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Sensor Calibration</source>
-      <translation type="unfinished">Sensor Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</source>
-      <translation type="unfinished">Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <source>Set autopilot orientation before calibrating.</source>
-      <translation type="unfinished">Set autopilot orientation before calibrating.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <source>Autopilot Orientation</source>
-      <translation type="unfinished">Autopilot Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <source>Click Ok to start calibration.</source>
-      <translation type="unfinished">Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <source>Reboot the vehicle prior to flight.</source>
-      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <source>Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <source>Mag %1 Orientation</source>
-      <translation type="unfinished">Mag %1 Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <source>Gyroscope</source>
-      <translation type="unfinished">Gyroscope</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <source>Airspeed</source>
-      <translation type="unfinished">Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <source>Calibrate Airspeed</source>
-      <translation type="unfinished">Calibrate Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <source>Orientations</source>
-      <translation type="unfinished">Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <source>Set Orientations</source>
-      <translation type="unfinished">Set Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <source>Factory reset</source>
-      <translation type="unfinished">Factory reset</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialConfiguration</name>
-    <message>
-      <location filename="../src/comm/SerialLink.h" line="83"/>
-      <source>Serial Link Settings</source>
-      <translation type="unfinished">Serial Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialLink</name>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="75"/>
-      <source>Could not send data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not send data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="121"/>
-      <source>Error connecting: Could not create port. %1</source>
-      <translation type="unfinished">Error connecting: Could not create port. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="244"/>
-      <source>Could not read data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not read data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="282"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="92"/>
-      <source>Baud rate name not in combo box</source>
-      <translation type="unfinished">Baud rate name not in combo box</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="114"/>
-      <source>Enable Flow Control</source>
-      <translation type="unfinished">Enable Flow Control</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="31"/>
-      <source>Serial Port</source>
-      <translation type="unfinished">Serial Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="65"/>
-      <source>None Available</source>
-      <translation type="unfinished">None Available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="73"/>
-      <source>Baud Rate</source>
-      <translation type="unfinished">Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="102"/>
-      <source>Advanced Settings</source>
-      <translation type="unfinished">Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="119"/>
-      <source>Parity</source>
-      <translation type="unfinished">Parity</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Even</source>
-      <translation type="unfinished">Even</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Odd</source>
-      <translation type="unfinished">Odd</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="157"/>
-      <source>Data Bits</source>
-      <translation type="unfinished">Data Bits</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="165"/>
-      <source>Stop Bits</source>
-      <translation type="unfinished">Stop Bits</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupPage</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>flying</source>
-      <translation type="unfinished">flying</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="44"/>
-      <source>%1 Setup</source>
-      <translation type="unfinished">%1 Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="66"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="77"/>
-      <source> (Disabled while the vehicle is %1)</source>
-      <translation type="unfinished"> (Disabled while the vehicle is %1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupView</name>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="35"/>
-      <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation type="unfinished">This operation cannot be performed while the vehicle is armed.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="38"/>
-      <source>missing message panel text</source>
-      <translation type="unfinished">missing message panel text</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="80"/>
-      <source>%1 setup must be completed prior to %2 setup.</source>
-      <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="132"/>
-      <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="150"/>
-      <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="171"/>
-      <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="172"/>
-      <source>As a result, the full set of vehicle setup options are not available.</source>
-      <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="231"/>
-      <source>Summary</source>
-      <translation type="unfinished">Summary</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="243"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="254"/>
-      <source>PX4Flow</source>
-      <translation type="unfinished">PX4Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="266"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="293"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>ShapeFileHelper</name>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="17"/>
-      <source>Shape file load failed. %1</source>
-      <translation type="unfinished">Shape file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="40"/>
-      <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
-      <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="93"/>
-      <source>Polyline not support from SHP files.</source>
-      <translation type="unfinished">Polyline not support from SHP files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="102"/>
-      <source>KML Files (*.%1)</source>
-      <translation type="unfinished">KML Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="107"/>
-      <source>KML/SHP Files (*.%1 *.%2)</source>
-      <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="76"/>
-      <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="157"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="38"/>
-      <source>Internal Error</source>
-      <translation type="unfinished">Internal Error</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="65"/>
-      <source>Provides advanced access to all commands/parameters. Be very careful!</source>
-      <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="77"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>desired</source>
-      <translation type="unfinished">desired</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>climbout</source>
-      <translation type="unfinished">climbout</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
-      <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
-      <source>Ensure clear of obstacles and into the wind.</source>
-      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="105"/>
-      <source>Click in map to set planned Takeoff location.</source>
-      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="106"/>
-      <source>Click in map to set planned Launch location.</source>
-      <translation type="unfinished">Click in map to set planned Launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="129"/>
-      <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="183"/>
-      <source>Actual AMSL alt sent: %1 %2</source>
-      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="243"/>
-      <source>Flight Speed</source>
-      <translation type="unfinished">Flight Speed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="406"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="410"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="412"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="414"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="416"/>
-      <source>VTOL Land</source>
-      <translation type="unfinished">VTOL Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="419"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-  </context>
-  <context>
-    <name>StructureScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="235"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="241"/>
-      <source>%1 version %2 not supported</source>
-      <translation type="unfinished">%1 version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="26"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</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">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
-      <source>Grid</source>
-      <translation type="unfinished">Grid</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
-      <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
-      <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="121"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
-      <source>Scan Distance</source>
-      <translation type="unfinished">Scan Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="131"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="222"/>
-      <source>Layer Height</source>
-      <translation type="unfinished">Layer Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="132"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="237"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="139"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Bottom</source>
-      <translation type="unfinished">Start Scan From Bottom</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Top</source>
-      <translation type="unfinished">Start Scan From Top</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="164"/>
-      <source>Structure Height</source>
-      <translation type="unfinished">Structure Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="171"/>
-      <source>Scan Bottom Alt</source>
-      <translation type="unfinished">Scan Bottom Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="178"/>
-      <source>Entrance/Exit Alt</source>
-      <translation type="unfinished">Entrance/Exit Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="186"/>
-      <source>Gimbal Pitch</source>
-      <translation type="unfinished">Gimbal Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="202"/>
-      <source>Rotate entry point</source>
-      <translation type="unfinished">Rotate entry point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="211"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="219"/>
-      <source>Layers</source>
-      <translation type="unfinished">Layers</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="225"/>
-      <source>Top Layer Alt</source>
-      <translation type="unfinished">Top Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="228"/>
-      <source>Bottom Layer Alt</source>
-      <translation type="unfinished">Bottom Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="231"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="234"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="235"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-  </context>
-  <context>
-    <name>SubChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
-      <source>Submarine Initial checks</source>
-      <translation type="unfinished">Submarine Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
-      <source>All seals in place?</source>
-      <translation type="unfinished">All seals in place?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="169"/>
-      <source>Survey items do not support version %1</source>
-      <translation type="unfinished">Survey items do not support version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="226"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="282"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="330"/>
-      <source>%1 but %2 object is missing</source>
-      <translation type="unfinished">%1 but %2 object is missing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="58"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="59"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="60"/>
-      <source>S</source>
-      <translation type="unfinished">S</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="18"/>
-      <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="19"/>
-      <source>Transects</source>
-      <translation type="unfinished">Transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="39"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="61"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="77"/>
-      <source>Hover and capture image</source>
-      <translation type="unfinished">Hover and capture image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="83"/>
-      <source>Refly at 90 deg offset</source>
-      <translation type="unfinished">Refly at 90 deg offset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="89"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="95"/>
-      <source>Fly alternate transects</source>
-      <translation type="unfinished">Fly alternate transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="107"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>SysStatusSensorInfo</name>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="103"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="111"/>
-      <source>Normal</source>
-      <translation type="unfinished">Normal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="119"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>SyslinkComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="43"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="61"/>
-      <source>Channel</source>
-      <translation type="unfinished">Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="86"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="112"/>
-      <source>Data Rate</source>
-      <translation type="unfinished">Data Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="16"/>
-      <source>Syslink</source>
-      <translation type="unfinished">Syslink</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="28"/>
-      <source>The Syslink Component is used to setup the radio connection on Crazyflies.</source>
-      <translation type="unfinished">The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPConfiguration</name>
-    <message>
-      <location filename="../src/comm/TCPLink.h" line="58"/>
-      <source>TCP Link Settings</source>
-      <translation type="unfinished">TCP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPLink</name>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <source>Error on link %1. Connection failed</source>
-      <translation type="unfinished">Error on link %1. Connection failed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Error on link %1. Error on socket: %2.</source>
-      <translation type="unfinished">Error on link %1. Error on socket: %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncManager</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="127"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="128"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="150"/>
-      <source>Stream</source>
-      <translation type="unfinished">Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="151"/>
-      <source>HDMI Port</source>
-      <translation type="unfinished">HDMI Port</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="172"/>
-      <source>Low</source>
-      <translation type="unfinished">Low</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="173"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="174"/>
-      <source>High</source>
-      <translation type="unfinished">High</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncSettings</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="56"/>
-      <source>Reboot ground unit for changes to take effect.</source>
-      <translation type="unfinished">Reboot ground unit for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="71"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="88"/>
-      <source>Enable Taisync</source>
-      <translation type="unfinished">Enable Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="94"/>
-      <source>Enable Taisync Video</source>
-      <translation type="unfinished">Enable Taisync Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="112"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="134"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="143"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="150"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="156"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="174"/>
-      <source>Device Info</source>
-      <translation type="unfinished">Device Info</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="196"/>
-      <source>Serial Number:</source>
-      <translation type="unfinished">Serial Number:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="200"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="204"/>
-      <source>Firmware Version:</source>
-      <translation type="unfinished">Firmware Version:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="222"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="244"/>
-      <source>Radio Mode:</source>
-      <translation type="unfinished">Radio Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="254"/>
-      <source>Radio Frequency:</source>
-      <translation type="unfinished">Radio Frequency:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="275"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="297"/>
-      <source>Video Output:</source>
-      <translation type="unfinished">Video Output:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="307"/>
-      <source>Encoder:</source>
-      <translation type="unfinished">Encoder:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="316"/>
-      <source>Bit Rate:</source>
-      <translation type="unfinished">Bit Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="337"/>
-      <source>Streaming Settings</source>
-      <translation type="unfinished">Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="359"/>
-      <source>RTSP URI:</source>
-      <translation type="unfinished">RTSP URI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="370"/>
-      <source>Account:</source>
-      <translation type="unfinished">Account:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="379"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="406"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="512"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="415"/>
-      <source>Set Streaming Settings</source>
-      <translation type="unfinished">Set Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="416"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="438"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="460"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="471"/>
-      <source>Ground Unit IP Address:</source>
-      <translation type="unfinished">Ground Unit IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="481"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="521"/>
-      <source>Set Network Settings</source>
-      <translation type="unfinished">Set Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="522"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</translation>
-    </message>
-  </context>
-  <context>
-    <name>TakeoffItemMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>TcpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="29"/>
-      <source>Server Address</source>
-      <translation type="unfinished">Server Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="36"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-  </context>
-  <context>
-    <name>TelemetryRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
-      <source>Telemetry RSSI Status</source>
-      <translation type="unfinished">Telemetry RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
-      <source>Local RSSI:</source>
-      <translation type="unfinished">Local RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
-      <source>Remote RSSI:</source>
-      <translation type="unfinished">Remote RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
-      <source>RX Errors:</source>
-      <translation type="unfinished">RX Errors:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
-      <source>Errors Fixed:</source>
-      <translation type="unfinished">Errors Fixed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
-      <source>TX Buffer:</source>
-      <translation type="unfinished">TX Buffer:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
-      <source>Local Noise:</source>
-      <translation type="unfinished">Local Noise:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
-      <source>Remote Noise:</source>
-      <translation type="unfinished">Remote Noise:</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainProgress</name>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
-      <source>Terrain Load Progress</source>
-      <translation type="unfinished">Terrain Load Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainStatus</name>
-    <message>
-      <location filename="../src/PlanView/TerrainStatus.qml" line="45"/>
-      <source>Height AMSL (%1)</source>
-      <translation type="unfinished">Height AMSL (%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="233"/>
-      <source>TransectStyleComplexItem version %2 not supported</source>
-      <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="101"/>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="102"/>
-      <source>Transect</source>
-      <translation type="unfinished">Transect</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="36"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="92"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="102"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="103"/>
-      <source>Trigger Dist</source>
-      <translation type="unfinished">Trigger Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="104"/>
-      <source>Spacing</source>
-      <translation type="unfinished">Spacing</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="123"/>
-      <source>Rotate Entry Point</source>
-      <translation type="unfinished">Rotate Entry Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="131"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="234"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="163"/>
-      <source>Presets</source>
-      <translation type="unfinished">Presets</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="178"/>
-      <source>Apply Preset</source>
-      <translation type="unfinished">Apply Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="185"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="193"/>
-      <source>Delete Preset</source>
-      <translation type="unfinished">Delete Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="196"/>
-      <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="212"/>
-      <source>Save Settings As New Preset</source>
-      <translation type="unfinished">Save Settings As New Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="249"/>
-      <source>Save Preset</source>
-      <translation type="unfinished">Save Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="265"/>
-      <source>Save the current settings as a named preset.</source>
-      <translation type="unfinished">Save the current settings as a named preset.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="270"/>
-      <source>Preset Name</source>
-      <translation type="unfinished">Preset Name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="276"/>
-      <source>Enter preset name</source>
-      <translation type="unfinished">Enter preset name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="283"/>
-      <source>Preset name cannot be blank.</source>
-      <translation type="unfinished">Preset name cannot be blank.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="286"/>
-      <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemStats</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
-      <source>Survey Area</source>
-      <translation type="unfinished">Survey Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemTerrainFollow</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
-      <source>Tolerance</source>
-      <translation type="unfinished">Tolerance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
-      <source>Max Climb Rate</source>
-      <translation type="unfinished">Max Climb Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
-      <source>Max Descent Rate</source>
-      <translation type="unfinished">Max Descent Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>UAS</name>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="318"/>
-      <source>UNINIT</source>
-      <translation type="unfinished">UNINIT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="319"/>
-      <source>Unitialized, booting up.</source>
-      <translation type="unfinished">Unitialized, booting up.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="322"/>
-      <source>BOOT</source>
-      <translation type="unfinished">BOOT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="323"/>
-      <source>Booting system, please wait.</source>
-      <translation type="unfinished">Booting system, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="326"/>
-      <source>CALIBRATING</source>
-      <translation type="unfinished">CALIBRATING</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="327"/>
-      <source>Calibrating sensors, please wait.</source>
-      <translation type="unfinished">Calibrating sensors, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="330"/>
-      <source>ACTIVE</source>
-      <translation type="unfinished">ACTIVE</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="331"/>
-      <source>Active, normal operation.</source>
-      <translation type="unfinished">Active, normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="334"/>
-      <source>STANDBY</source>
-      <translation type="unfinished">STANDBY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="335"/>
-      <source>Standby mode, ready for launch.</source>
-      <translation type="unfinished">Standby mode, ready for launch.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="338"/>
-      <source>CRITICAL</source>
-      <translation type="unfinished">CRITICAL</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="339"/>
-      <source>FAILURE: Continuing operation.</source>
-      <translation type="unfinished">FAILURE: Continuing operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="342"/>
-      <source>EMERGENCY</source>
-      <translation type="unfinished">EMERGENCY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="343"/>
-      <source>EMERGENCY: Land Immediately!</source>
-      <translation type="unfinished">EMERGENCY: Land Immediately!</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="351"/>
-      <source>SHUTDOWN</source>
-      <translation type="unfinished">SHUTDOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="352"/>
-      <source>Powering off system.</source>
-      <translation type="unfinished">Powering off system.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="356"/>
-      <source>UNKNOWN</source>
-      <translation type="unfinished">UNKNOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="357"/>
-      <source>Unknown system state</source>
-      <translation type="unfinished">Unknown system state</translation>
-    </message>
-  </context>
-  <context>
-    <name>UASMessageHandler</name>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
-      <source> EMERGENCY:</source>
-      <translation type="unfinished"> EMERGENCY:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
-      <source> ALERT:</source>
-      <translation type="unfinished"> ALERT:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
-      <source> Critical:</source>
-      <translation type="unfinished"> Critical:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
-      <source> Error:</source>
-      <translation type="unfinished"> Error:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
-      <source> Warning:</source>
-      <translation type="unfinished"> Warning:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
-      <source> Notice:</source>
-      <translation type="unfinished"> Notice:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
-      <source> Info:</source>
-      <translation type="unfinished"> Info:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
-      <source> Debug:</source>
-      <translation type="unfinished"> Debug:</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPConfiguration</name>
-    <message>
-      <location filename="../src/comm/UDPLink.h" line="79"/>
-      <source>UDP Link Settings</source>
-      <translation type="unfinished">UDP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPLink</name>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>UDP Link Error</source>
-      <translation type="unfinished">UDP Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <source>Error binding UDP port: %1</source>
-      <translation type="unfinished">Error binding UDP port: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>Error registering Zeroconf</source>
-      <translation type="unfinished">Error registering Zeroconf</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>
-      <translation type="unfinished">Could not detect ULog file header magic</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
-      <source>Could not detect camera_capture packets in ULog</source>
-      <translation type="unfinished">Could not detect camera_capture packets in ULog</translation>
-    </message>
-  </context>
-  <context>
-    <name>UdpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="31"/>
-      <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="37"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="48"/>
-      <source>Server Addresses (optional)</source>
-      <translation type="unfinished">Server Addresses (optional)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="62"/>
-      <source>Remove</source>
-      <translation type="unfinished">Remove</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="74"/>
-      <source>Example: 127.0.0.1:14550</source>
-      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="77"/>
-      <source>Add Server</source>
-      <translation type="unfinished">Add Server</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
-      <source>Measurement Units</source>
-      <translation type="unfinished">Measurement Units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="64"/>
-      <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
-      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
-      <source>System of units</source>
-      <translation type="unfinished">System of units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Metric System</source>
-      <translation type="unfinished">Metric System</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Imperial System</source>
-      <translation type="unfinished">Imperial System</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsSettings</name>
-    <message>
-      <location filename="../src/Settings/UnitsSettings.cc" line="196"/>
-      <source>Weight units</source>
-      <translation type="unfinished">Weight units</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
-      <source>VTOL Initial Checks</source>
-      <translation type="unfinished">VTOL Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="23"/>
-      <source>VTOL Landing</source>
-      <translation type="unfinished">VTOL Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="82"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="150"/>
-      <source>Landing Dist</source>
-      <translation type="unfinished">Landing Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="180"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="218"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="227"/>
-      <source>* Avoid tailwind on approach to land.</source>
-      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="236"/>
-      <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="262"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="269"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="301"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="305"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="259"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLModeIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: FW</source>
-      <translation type="unfinished">VTOL: FW</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: MR</source>
-      <translation type="unfinished">VTOL: MR</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle</name>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="558"/>
-      <source>MAVLink Generic</source>
-      <translation type="unfinished">MAVLink Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="565"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="567"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="569"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="571"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="573"/>
-      <source>Rover</source>
-      <translation type="unfinished">Rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="575"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="577"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="866"/>
-      <source> ... </source>
-      <comment>Indicates missing chunk from chunked STATUS_TEXT</comment>
-      <translation type="unfinished"> ... </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2168"/>
-      <source>Mission transfer failed. Error: %1</source>
-      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2174"/>
-      <source>GeoFence transfer failed. Error: %1</source>
-      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2180"/>
-      <source>Rally Point transfer failed. Error: %1</source>
-      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1423"/>
-      <source>battery %1 level low</source>
-      <translation type="unfinished">battery %1 level low</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1429"/>
-      <source>battery %1 level is critical</source>
-      <translation type="unfinished">battery %1 level is critical</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1435"/>
-      <source>battery %1 level emergency</source>
-      <translation type="unfinished">battery %1 level emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1441"/>
-      <source>battery %1 failed</source>
-      <translation type="unfinished">battery %1 failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1447"/>
-      <source>battery %1 unhealthy</source>
-      <translation type="unfinished">battery %1 unhealthy</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1459"/>
-      <source>warning</source>
-      <translation type="unfinished">warning</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2391"/>
-      <source>Generic micro air vehicle</source>
-      <translation type="unfinished">Generic micro air vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2392"/>
-      <source>Fixed wing aircraft</source>
-      <translation type="unfinished">Fixed wing aircraft</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2393"/>
-      <source>Quadrotor</source>
-      <translation type="unfinished">Quadrotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2394"/>
-      <source>Coaxial helicopter</source>
-      <translation type="unfinished">Coaxial helicopter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2395"/>
-      <source>Normal helicopter with tail rotor.</source>
-      <translation type="unfinished">Normal helicopter with tail rotor.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2396"/>
-      <source>Ground installation</source>
-      <translation type="unfinished">Ground installation</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2397"/>
-      <source>Operator control unit / ground control station</source>
-      <translation type="unfinished">Operator control unit / ground control station</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2398"/>
-      <source>Airship, controlled</source>
-      <translation type="unfinished">Airship, controlled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2399"/>
-      <source>Free balloon, uncontrolled</source>
-      <translation type="unfinished">Free balloon, uncontrolled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2400"/>
-      <source>Rocket</source>
-      <translation type="unfinished">Rocket</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2401"/>
-      <source>Ground rover</source>
-      <translation type="unfinished">Ground rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2402"/>
-      <source>Surface vessel, boat, ship</source>
-      <translation type="unfinished">Surface vessel, boat, ship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2403"/>
-      <source>Submarine</source>
-      <translation type="unfinished">Submarine</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2404"/>
-      <source>Hexarotor</source>
-      <translation type="unfinished">Hexarotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2405"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2406"/>
-      <source>Octorotor</source>
-      <translation type="unfinished">Octorotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2407"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2408"/>
-      <source>Flapping wing</source>
-      <translation type="unfinished">Flapping wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2409"/>
-      <source>Onboard companion controller</source>
-      <translation type="unfinished">Onboard companion controller</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2410"/>
-      <source>Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</source>
-      <translation type="unfinished">Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2411"/>
-      <source>Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</source>
-      <translation type="unfinished">Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2412"/>
-      <source>Tiltrotor VTOL</source>
-      <translation type="unfinished">Tiltrotor VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2413"/>
-      <source>VTOL reserved 2</source>
-      <translation type="unfinished">VTOL reserved 2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2414"/>
-      <source>VTOL reserved 3</source>
-      <translation type="unfinished">VTOL reserved 3</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2415"/>
-      <source>VTOL reserved 4</source>
-      <translation type="unfinished">VTOL reserved 4</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2416"/>
-      <source>VTOL reserved 5</source>
-      <translation type="unfinished">VTOL reserved 5</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2417"/>
-      <source>Onboard gimbal</source>
-      <translation type="unfinished">Onboard gimbal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2418"/>
-      <source>Onboard ADSB peripheral</source>
-      <translation type="unfinished">Onboard ADSB peripheral</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2427"/>
-      <source>Vehicle %1 </source>
-      <translation type="unfinished">Vehicle %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3224"/>
-      <source>Vehicle reboot failed.</source>
-      <translation type="unfinished">Vehicle reboot failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2435"/>
-      <source>%1 %2 flight mode</source>
-      <translation type="unfinished">%1 %2 flight mode</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>disarmed</source>
-      <translation type="unfinished">disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Unable to send command: %1.</source>
-      <translation type="unfinished">Unable to send command: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Waiting on previous response to same command.</source>
-      <translation type="unfinished">Waiting on previous response to same command.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2886"/>
-      <source>Vehicle did not respond to command: %1</source>
-      <translation type="unfinished">Vehicle did not respond to command: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2997"/>
-      <source>Bootloader flash succeeded</source>
-      <translation type="unfinished">Bootloader flash succeeded</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3012"/>
-      <source>%1 command temporarily rejected</source>
-      <translation type="unfinished">%1 command temporarily rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3015"/>
-      <source>%1 command denied</source>
-      <translation type="unfinished">%1 command denied</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3018"/>
-      <source>%1 command not supported</source>
-      <translation type="unfinished">%1 command not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3021"/>
-      <source>%1 command failed</source>
-      <translation type="unfinished">%1 command failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="149"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="151"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="153"/>
-      <source>Rover-Boat</source>
-      <translation type="unfinished">Rover-Boat</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="155"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="157"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="159"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="161"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="163"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleLinkManager</name>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <source>%1Communication regained on %2 link</source>
-      <translation type="unfinished">%1Communication regained on %2 link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>primary</source>
-      <translation type="unfinished">primary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>secondary</source>
-      <translation type="unfinished">secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="64"/>
-      <source>%1Communication regained</source>
-      <translation type="unfinished">%1Communication regained</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="69"/>
-      <source>%1Switching communication to new primary link</source>
-      <translation type="unfinished">%1Switching communication to new primary link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>%1Communication lost on %2 link.</source>
-      <translation type="unfinished">%1Communication lost on %2 link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="126"/>
-      <source>%1Switching communication to secondary link.</source>
-      <translation type="unfinished">%1Switching communication to secondary link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="146"/>
-      <source>%1Communication lost</source>
-      <translation type="unfinished">%1Communication lost</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="392"/>
-      <source>Comm Lost</source>
-      <translation type="unfinished">Comm Lost</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleMapItem</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/VehicleMapItem.qml" line="89"/>
-      <source>Vehicle %1</source>
-      <translation type="unfinished">Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleRotationCal</name>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="26"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Incomplete</source>
-      <translation type="unfinished">Incomplete</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleSummary</name>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="87"/>
-      <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation type="unfinished">Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="88"/>
-      <source>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</source>
-      <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleWarnings</name>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
-      <source>No GPS Lock for Vehicle</source>
-      <translation type="unfinished">No GPS Lock for Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
-      <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
-      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VibrationPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
-      <source>Analyze vibration associated with your vehicle.</source>
-      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="74"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="96"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="118"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="139"/>
-      <source>Clip count</source>
-      <translation type="unfinished">Clip count</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="143"/>
-      <source>Accel 1: </source>
-      <translation type="unfinished">Accel 1: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="147"/>
-      <source>Accel 2: </source>
-      <translation type="unfinished">Accel 2: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="151"/>
-      <source>Accel 3: </source>
-      <translation type="unfinished">Accel 3: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="165"/>
-      <source>Not Available</source>
-      <translation type="unfinished">Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoManager</name>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="288"/>
-      <source>Video receiver is not ready.</source>
-      <translation type="unfinished">Video receiver is not ready.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="295"/>
-      <source>Invalid video format defined.</source>
-      <translation type="unfinished">Invalid video format defined.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="306"/>
-      <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoSettings</name>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="22"/>
-      <source>No Video Available</source>
-      <translation type="unfinished">No Video Available</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="23"/>
-      <source>Video Stream Disabled</source>
-      <translation type="unfinished">Video Stream Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="24"/>
-      <source>RTSP Video Stream</source>
-      <translation type="unfinished">RTSP Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="25"/>
-      <source>UDP h.264 Video Stream</source>
-      <translation type="unfinished">UDP h.264 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="26"/>
-      <source>UDP h.265 Video Stream</source>
-      <translation type="unfinished">UDP h.265 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="27"/>
-      <source>TCP-MPEG2 Video Stream</source>
-      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="28"/>
-      <source>MPEG-TS (h.264) Video Stream</source>
-      <translation type="unfinished">MPEG-TS (h.264) Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="29"/>
-      <source>3DR Solo (requires restart)</source>
-      <translation type="unfinished">3DR Solo (requires restart)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="30"/>
-      <source>Parrot Discovery</source>
-      <translation type="unfinished">Parrot Discovery</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="31"/>
-      <source>Yuneec Mantis G</source>
-      <translation type="unfinished">Yuneec Mantis G</translation>
-    </message>
-  </context>
-</TS>
diff --git a/translations/qgc_source_az_AZ.ts b/translations/qgc_source_az_AZ.ts
index 74c76cc93202..37b9f1374478 100644
--- a/translations/qgc_source_az_AZ.ts
+++ b/translations/qgc_source_az_AZ.ts
@@ -3739,57 +3739,57 @@ Zəhmət olmasa aparatınızı suya qoyun, düyməni vurun və gözləyin. Diqq
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,61 +4058,61 @@ Zəhmət olmasa aparatınızı suya qoyun, düyməni vurun və gözləyin. Diqq
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
-      <translation>Axtarış:</translation>
+      <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
-      <translation>Aydındır</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
-      <translation>Hamısını sil</translation>
+      <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
-      <translation>Giriş sənədləri (* .txt)</translation>
+      <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
-      <translation>Bütün Fayllar (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
-      <translation>Fayl qeydini seçin</translation>
+      <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
-      <translation>Proqram Girişini qeyd edin</translation>
+      <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
-      <translation>Ən sonuncunu göstər</translation>
+      <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
-      <translation>Giriş qurun</translation>
+      <translation type="unfinished">Set Logging</translation>
     </message>
   </context>
   <context>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation>Düymə tapşırığı</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11494,12 +11494,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation>Deaktiv</translation>
     </message>
@@ -11716,13 +11716,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15900,12 +15900,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15976,37 +15976,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_bg_BG.ts b/translations/qgc_source_bg_BG.ts
index d0c55ef8e333..6654c927f3e3 100644
--- a/translations/qgc_source_bg_BG.ts
+++ b/translations/qgc_source_bg_BG.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_de_DE.ts b/translations/qgc_source_de_DE.ts
index 981f96fb3112..869c491bdfb4 100644
--- a/translations/qgc_source_de_DE.ts
+++ b/translations/qgc_source_de_DE.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_el_GR.ts b/translations/qgc_source_el_GR.ts
index 28ad0af8fe7f..f4eba0659781 100644
--- a/translations/qgc_source_el_GR.ts
+++ b/translations/qgc_source_el_GR.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_es_ES.ts b/translations/qgc_source_es_ES.ts
index 2f0a444f98b1..53f0e7fadb27 100644
--- a/translations/qgc_source_es_ES.ts
+++ b/translations/qgc_source_es_ES.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_fi_FI.ts b/translations/qgc_source_fi_FI.ts
index 87862d6708a3..b2075b494267 100644
--- a/translations/qgc_source_fi_FI.ts
+++ b/translations/qgc_source_fi_FI.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_fr_FR.ts b/translations/qgc_source_fr_FR.ts
index e6f4db0536d9..ee154e7848bd 100644
--- a/translations/qgc_source_fr_FR.ts
+++ b/translations/qgc_source_fr_FR.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_he_IL.ts b/translations/qgc_source_he_IL.ts
index 2f028a7c4bcf..89cd121e8229 100644
--- a/translations/qgc_source_he_IL.ts
+++ b/translations/qgc_source_he_IL.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_it_IT.ts b/translations/qgc_source_it_IT.ts
index 4a2630559762..87eb6636e1ff 100644
--- a/translations/qgc_source_it_IT.ts
+++ b/translations/qgc_source_it_IT.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_ja_JP.ts b/translations/qgc_source_ja_JP.ts
index d78c5e2401bd..76c24acad899 100644
--- a/translations/qgc_source_ja_JP.ts
+++ b/translations/qgc_source_ja_JP.ts
@@ -12,7 +12,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
       <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation>現在フレームクラスに設定されています &apos;%1&apos;</translation>
+      <translation>現在のフレームクラスは &apos;%1&amp;apos に設定されています;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
@@ -100,7 +100,7 @@
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="30"/>
       <source>- disabled</source>
-      <translation type="unfinished">- disabled</translation>
+      <translation>- 無効</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="34"/>
@@ -111,7 +111,7 @@
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="38"/>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="68"/>
       <source>Vehicle Action</source>
-      <translation type="unfinished">Vehicle Action</translation>
+      <translation>機体アクション</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="45"/>
@@ -419,132 +419,132 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="79"/>
       <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
+      <translation>スタビライズ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="80"/>
       <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
+      <translation>アクロ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="81"/>
       <source>Altitude Hold</source>
-      <translation type="unfinished">Altitude Hold</translation>
+      <translation>高度ホールド</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="82"/>
       <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
+      <translation>自動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="83"/>
       <source>Guided</source>
-      <translation type="unfinished">Guided</translation>
+      <translation>ガイド補助</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="84"/>
       <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
+      <translation>ロイター</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="85"/>
       <source>RTL</source>
-      <translation type="unfinished">RTL</translation>
+      <translation>RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="86"/>
       <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
+      <translation>サークル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="87"/>
       <source>Land</source>
-      <translation type="unfinished">Land</translation>
+      <translation>着陸</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="88"/>
       <source>Drift</source>
-      <translation type="unfinished">Drift</translation>
+      <translation>ドリフト</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="89"/>
       <source>Sport</source>
-      <translation type="unfinished">Sport</translation>
+      <translation>スポーツ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="90"/>
       <source>Flip</source>
-      <translation type="unfinished">Flip</translation>
+      <translation>フリップ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="91"/>
       <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
+      <translation>自動調整</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="92"/>
       <source>Position Hold</source>
-      <translation type="unfinished">Position Hold</translation>
+      <translation>ポジションホールド</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="93"/>
       <source>Brake</source>
-      <translation type="unfinished">Brake</translation>
+      <translation>ブレーキ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="94"/>
       <source>Throw</source>
-      <translation type="unfinished">Throw</translation>
+      <translation>スロー</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="95"/>
       <source>Avoid ADSB</source>
-      <translation type="unfinished">Avoid ADSB</translation>
+      <translation>ADSBを回避</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="96"/>
       <source>Guided No GPS</source>
-      <translation type="unfinished">Guided No GPS</translation>
+      <translation>ガイド補助なし GPS</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="97"/>
       <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
+      <translation>Smart RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="98"/>
       <source>Flow Hold</source>
-      <translation type="unfinished">Flow Hold</translation>
+      <translation>光学フローホールド</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="99"/>
       <source>Follow</source>
-      <translation type="unfinished">Follow</translation>
+      <translation>追跡</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="100"/>
       <source>ZigZag</source>
-      <translation type="unfinished">ZigZag</translation>
+      <translation>ジグザグ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="101"/>
       <source>SystemID</source>
-      <translation type="unfinished">SystemID</translation>
+      <translation>システムID</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="102"/>
       <source>AutoRotate</source>
-      <translation type="unfinished">AutoRotate</translation>
+      <translation>自動回転</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="103"/>
       <source>AutoRTL</source>
-      <translation type="unfinished">AutoRTL</translation>
+      <translation>自動RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="104"/>
       <source>Turtle</source>
-      <translation type="unfinished">Turtle</translation>
+      <translation>タートル</translation>
     </message>
   </context>
   <context>
@@ -552,22 +552,22 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.h" line="102"/>
       <source>Guided</source>
-      <translation type="unfinished">Guided</translation>
+      <translation>ガイド補助</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.h" line="103"/>
       <source>RTL</source>
-      <translation type="unfinished">RTL</translation>
+      <translation>RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.h" line="104"/>
       <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
+      <translation/>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.h" line="105"/>
       <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
+      <translation>自動</translation>
     </message>
   </context>
   <context>
@@ -575,7 +575,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="695"/>
       <source>Error during Solo video link setup: %1</source>
-      <translation>Soloビデオリンク設定エラー: %1</translation>
+      <translation>Solo動画リンク設定エラー: %1</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="852"/>
@@ -590,7 +590,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="933"/>
       <source>Vehicle does not support guided rotate</source>
-      <translation type="unfinished">Vehicle does not support guided rotate</translation>
+      <translation>機体はガイド補助回転をサポートしていません</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="987"/>
@@ -615,17 +615,17 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1026"/>
       <source>Unable to start takeoff: Vehicle is already in the air.</source>
-      <translation type="unfinished">Unable to start takeoff: Vehicle is already in the air.</translation>
+      <translation>離陸を開始できません: 機体はすでに空中にいます。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1032"/>
       <source>Unable to start takeoff: Vehicle failed to change to Takeoff mode.</source>
-      <translation type="unfinished">Unable to start takeoff: Vehicle failed to change to Takeoff mode.</translation>
+      <translation>離陸を開始できません: 離陸モードに変更できませんでした。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1037"/>
       <source>Unable to start takeoff: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to start takeoff: Vehicle failed to arm.</translation>
+      <translation>離陸を開始できません: 機体はアームできませんでした。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1048"/>
@@ -916,7 +916,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.h" line="34"/>
       <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
+      <translation>フォローミー</translation>
     </message>
   </context>
   <context>
@@ -924,47 +924,47 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="29"/>
       <source>Follow Enabled</source>
-      <translation type="unfinished">Follow Enabled</translation>
+      <translation>フォローが有効化されました</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="30"/>
       <source>Follow System ID</source>
-      <translation type="unfinished">Follow System ID</translation>
+      <translation>システムIDをフォロー</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="31"/>
       <source>Max Distance</source>
-      <translation type="unfinished">Max Distance</translation>
+      <translation>最大距離</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="32"/>
       <source>Offset X</source>
-      <translation type="unfinished">Offset X</translation>
+      <translation>オフセット X</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="33"/>
       <source>Offset Y</source>
-      <translation type="unfinished">Offset Y</translation>
+      <translation>オフセット Y</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="34"/>
       <source>Offset Z</source>
-      <translation type="unfinished">Offset Z</translation>
+      <translation>オフセット Z</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="35"/>
       <source>Offset Type</source>
-      <translation type="unfinished">Offset Type</translation>
+      <translation>オフセット タイプ</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
       <source>Altitude Type</source>
-      <translation type="unfinished">Altitude Type</translation>
+      <translation>高度タイプ</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="37"/>
       <source>Yaw Behavior</source>
-      <translation type="unfinished">Yaw Behavior</translation>
+      <translation>ヨーの動作</translation>
     </message>
   </context>
   <context>
@@ -1206,17 +1206,17 @@
     <message>
       <location filename="../src/UI/toolbar/APMMainStatusIndicatorContentItem.qml" line="28"/>
       <source>Ground Control Comm Loss Failsafe</source>
-      <translation type="unfinished">Ground Control Comm Loss Failsafe</translation>
+      <translation>地上局 通信喪失時フェイルセーフ</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMMainStatusIndicatorContentItem.qml" line="32"/>
       <source>Vehicle Action</source>
-      <translation type="unfinished">Vehicle Action</translation>
+      <translation>機体アクション</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMMainStatusIndicatorContentItem.qml" line="40"/>
       <source>Loss Timeout</source>
-      <translation type="unfinished">Loss Timeout</translation>
+      <translation>損失タイムアウト</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMMainStatusIndicatorContentItem.qml" line="47"/>
@@ -1245,132 +1245,132 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="67"/>
       <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
+      <translation>手動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="68"/>
       <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
+      <translation>サークル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="69"/>
       <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
+      <translation>スタビライズ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="70"/>
       <source>Training</source>
-      <translation type="unfinished">Training</translation>
+      <translation>トレーニング</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="71"/>
       <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
+      <translation>アクロ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="72"/>
       <source>FBW A</source>
-      <translation type="unfinished">FBW A</translation>
+      <translation>FBW A</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="73"/>
       <source>FBW B</source>
-      <translation type="unfinished">FBW B</translation>
+      <translation>FBW B</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="74"/>
       <source>Cruise</source>
-      <translation type="unfinished">Cruise</translation>
+      <translation>クルーズ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="75"/>
       <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
+      <translation>自動調整</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="76"/>
       <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
+      <translation>自動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="77"/>
       <source>RTL</source>
-      <translation type="unfinished">RTL</translation>
+      <translation>RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="78"/>
       <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
+      <translation>ロイター</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="79"/>
       <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
+      <translation>離陸</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="80"/>
       <source>Avoid ADSB</source>
-      <translation type="unfinished">Avoid ADSB</translation>
+      <translation>ADSBを回避</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="81"/>
       <source>Guided</source>
-      <translation type="unfinished">Guided</translation>
+      <translation>ガイド補助</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="82"/>
       <source>Initializing</source>
-      <translation type="unfinished">Initializing</translation>
+      <translation>初期化中</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="83"/>
       <source>QuadPlane Stabilize</source>
-      <translation type="unfinished">QuadPlane Stabilize</translation>
+      <translation>クワッドプレーン スタビライズ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="84"/>
       <source>QuadPlane Hover</source>
-      <translation type="unfinished">QuadPlane Hover</translation>
+      <translation>クワッドプレーン ホバー</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="85"/>
       <source>QuadPlane Loiter</source>
-      <translation type="unfinished">QuadPlane Loiter</translation>
+      <translation>クワッドプレーン ロイター</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="86"/>
       <source>QuadPlane Land</source>
-      <translation type="unfinished">QuadPlane Land</translation>
+      <translation>クワッドプレーン 着陸</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="87"/>
       <source>QuadPlane RTL</source>
-      <translation type="unfinished">QuadPlane RTL</translation>
+      <translation>クワッドプレーン RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="88"/>
       <source>QuadPlane AutoTune</source>
-      <translation type="unfinished">QuadPlane AutoTune</translation>
+      <translation>クワッドプレーン 自動調整</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="89"/>
       <source>QuadPlane Acro</source>
-      <translation type="unfinished">QuadPlane Acro</translation>
+      <translation>クワッドプレーン アクロ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="90"/>
       <source>Thermal</source>
-      <translation type="unfinished">Thermal</translation>
+      <translation>サーマル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="91"/>
       <source>Loiter to QLand</source>
-      <translation type="unfinished">Loiter to QLand</translation>
+      <translation>ロイターしてQLand(垂直)着陸</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="92"/>
       <source>Autoland</source>
-      <translation type="unfinished">Autoland</translation>
+      <translation>自動着陸</translation>
     </message>
   </context>
   <context>
@@ -1736,77 +1736,77 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="58"/>
       <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
+      <translation>手動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="59"/>
       <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
+      <translation>アクロ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="60"/>
       <source>Learning</source>
-      <translation type="unfinished">Learning</translation>
+      <translation>学習</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="61"/>
       <source>Steering</source>
-      <translation type="unfinished">Steering</translation>
+      <translation>ステアリング</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="62"/>
       <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
+      <translation>ホールド</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="63"/>
       <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
+      <translation>ロイター</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="64"/>
       <source>Follow</source>
-      <translation type="unfinished">Follow</translation>
+      <translation>追跡</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="65"/>
       <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
+      <translation>シンプル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="66"/>
       <source>Dock</source>
-      <translation type="unfinished">Dock</translation>
+      <translation>ドック</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="67"/>
       <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
+      <translation>サークル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="68"/>
       <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
+      <translation>自動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="69"/>
       <source>RTL</source>
-      <translation type="unfinished">RTL</translation>
+      <translation>RTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="70"/>
       <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
+      <translation>スマートRTL</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="71"/>
       <source>Guided</source>
-      <translation type="unfinished">Guided</translation>
+      <translation>ガイド補助</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="72"/>
       <source>Initializing</source>
-      <translation type="unfinished">Initializing</translation>
+      <translation>初期化中</translation>
     </message>
   </context>
   <context>
@@ -1824,7 +1824,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="85"/>
       <source>Critical action:</source>
-      <translation>重大アクション:</translation>
+      <translation>限界時アクション:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="92"/>
@@ -1834,7 +1834,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="100"/>
       <source>Critical voltage threshold:</source>
-      <translation>重大な電圧しきい値:</translation>
+      <translation>限界電圧しきい値:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="107"/>
@@ -1844,7 +1844,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="114"/>
       <source>Critical mAh threshold:</source>
-      <translation>重大な容量(mAh)しきい値:</translation>
+      <translation>限界容量(mAh)しきい値:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="135"/>
@@ -2036,7 +2036,7 @@
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="113"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="185"/>
       <source>Battery critical action:</source>
-      <translation>バッテリー重大アクション:</translation>
+      <translation>バッテリー限界時アクション:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="124"/>
@@ -2272,7 +2272,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
       <source>Failsafe Actions</source>
-      <translation>フェイルセーフ 動作</translation>
+      <translation>フェイルセーフ アクション</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
@@ -2398,7 +2398,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
       <source>Batt1 critical failsafe:</source>
-      <translation>Batt1重大フェイルセーフ:</translation>
+      <translation>Batt1 限界フェイルセーフ:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
@@ -2408,7 +2408,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
       <source>Batt2 critical failsafe:</source>
-      <translation>Batt2重大フェイルセーフ:</translation>
+      <translation>Batt2 限界フェイルセーフ:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
@@ -2494,7 +2494,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
       <source>Batt1 critical failsafe:</source>
-      <translation>Batt1重大フェイルセーフ:</translation>
+      <translation>Batt1 限界フェイルセーフ:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
@@ -2504,7 +2504,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
       <source>Batt2 critical failsafe:</source>
-      <translation>Batt2重大フェイルセーフ:</translation>
+      <translation>Batt2 限界フェイルセーフ:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
@@ -3352,57 +3352,57 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="125"/>
       <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
+      <translation>手動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="126"/>
       <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
+      <translation>スタビライズ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="127"/>
       <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
+      <translation>アクロ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="128"/>
       <source>Depth Hold</source>
-      <translation type="unfinished">Depth Hold</translation>
+      <translation>深度ホールド</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="129"/>
       <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
+      <translation>自動</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="130"/>
       <source>Guided</source>
-      <translation type="unfinished">Guided</translation>
+      <translation>ガイド補助</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="131"/>
       <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
+      <translation>サークル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="132"/>
       <source>Surface</source>
-      <translation type="unfinished">Surface</translation>
+      <translation>サーフェス</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="133"/>
       <source>Position Hold</source>
-      <translation type="unfinished">Position Hold</translation>
+      <translation>ポジションホールド</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="134"/>
       <source>Motor Detection</source>
-      <translation type="unfinished">Motor Detection</translation>
+      <translation>モーター検出</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="135"/>
       <source>Surftrak</source>
-      <translation type="unfinished">Surftrak</translation>
+      <translation>サーフトラック</translation>
     </message>
   </context>
   <context>
@@ -3735,57 +3735,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation>ジオメトリー</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation>アクチュエータのテスト</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation>いくつかの出力を設定してテストします。</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation>注意: モータースライダーは有効です</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation>プロペラが取り外されました - スライダーを有効にします</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation>アクチュエータ 出力</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation>1つ以上のアクチュエータを出力に割り当てる必要があります。</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation>モーターの識別と割り当て</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation>モーター注文の識別と割り当て</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation>エラー</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation>もう一度スピンモーター</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation>中止</translation>
     </message>
@@ -3836,7 +3836,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Comms/AirLink/AirLinkLink.h" line="37"/>
       <source>AirLink Link Settings</source>
-      <translation type="unfinished">AirLink Link Settings</translation>
+      <translation>エアリンクの設定</translation>
     </message>
   </context>
   <context>
@@ -4053,59 +4053,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation>GStreamer デバッグレベル</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation>ログカテゴリ</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
-      <translation>検索: </translation>
+      <translation>検索:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation>消去</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation>すべて消去</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation>ログファイル (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation>すべてのファイル (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation>ログ保存ファイルを選択</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation>アプリログを保存</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation>最新情報を表示</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation>ログの設定</translation>
     </message>
@@ -4135,7 +4135,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.h" line="111"/>
       <source>Video</source>
-      <translation>ビデオ</translation>
+      <translation>動画</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="112"/>
@@ -4150,7 +4150,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.h" line="114"/>
       <source>MavlinkActions</source>
-      <translation type="unfinished">MavlinkActions</translation>
+      <translation>MavLink アクション</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="117"/>
@@ -4201,7 +4201,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Utilities/Audio/AudioOutput.cc" line="159"/>
       <source>%1</source>
-      <translation type="unfinished">%1</translation>
+      <translation>%1</translation>
     </message>
   </context>
   <context>
@@ -4388,22 +4388,22 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="296"/>
       <source>Value</source>
-      <translation type="unfinished">Value</translation>
+      <translation>値</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="304"/>
       <source>Coloring</source>
-      <translation type="unfinished">Coloring</translation>
+      <translation>カラーリング</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="377"/>
       <source>Low</source>
-      <translation type="unfinished">Low</translation>
+      <translation>低</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="390"/>
       <source>Critical</source>
-      <translation type="unfinished">Critical</translation>
+      <translation>限界 [Critical]</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="406"/>
@@ -4447,7 +4447,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="431"/>
       <source>Link %1: (Device: %2) %3</source>
-      <translation type="unfinished">Link %1: (Device: %2) %3</translation>
+      <translation>リンク %1: (デバイス: %2) %3</translation>
     </message>
   </context>
   <context>
@@ -4483,27 +4483,27 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="265"/>
       <source>Data to Send is Empty</source>
-      <translation type="unfinished">Data to Send is Empty</translation>
+      <translation>送信するデータが空です</translation>
     </message>
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="270"/>
       <source>Socket is not connected</source>
-      <translation type="unfinished">Socket is not connected</translation>
+      <translation>ソケットが接続されていません</translation>
     </message>
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="275"/>
       <source>Socket is not Writable</source>
-      <translation type="unfinished">Socket is not Writable</translation>
+      <translation>ソケットは書き込みできません</translation>
     </message>
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="283"/>
       <source>Could Not Send Data - Write Failed: %1</source>
-      <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
+      <translation>データを送信できませんでした - 書き込みに失敗しました: %1</translation>
     </message>
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="286"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
-      <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
+      <translation>データを送信できません - 書き込み結果は 0 Byteでした</translation>
     </message>
   </context>
   <context>
@@ -4607,7 +4607,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="615"/>
       <source>Unable to set read start address: 0x%2</source>
-      <translation>読み取り開始アドレスを設定できません: 0x%2</translation>
+      <translation>読み込み開始アドレスを設定できません: 0x%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="691"/>
@@ -4951,152 +4951,152 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="37"/>
       <source>Qt Platform:</source>
-      <translation type="unfinished">Qt Platform:</translation>
+      <translation>Qt  プラットフォーム:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="47"/>
       <source>Font Point Size 10</source>
-      <translation type="unfinished">Font Point Size 10</translation>
+      <translation>フォントサイズ 10</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="53"/>
       <source>Default font width:</source>
-      <translation type="unfinished">Default font width:</translation>
+      <translation>既定フォント幅:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="63"/>
       <source>Font Point Size 10.5</source>
-      <translation type="unfinished">Font Point Size 10.5</translation>
+      <translation>フォントサイズ 10.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="69"/>
       <source>Default font height:</source>
-      <translation type="unfinished">Default font height:</translation>
+      <translation>既定フォント高さ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="79"/>
       <source>Font Point Size 11</source>
-      <translation type="unfinished">Font Point Size 11</translation>
+      <translation>フォントサイズ 11</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="85"/>
       <source>Default font pixel size:</source>
-      <translation type="unfinished">Default font pixel size:</translation>
+      <translation>既定フォントサイズ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="95"/>
       <source>Font Point Size 11.5</source>
-      <translation type="unfinished">Font Point Size 11.5</translation>
+      <translation>フォントサイズ 11.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="101"/>
       <source>Default font point size:</source>
-      <translation type="unfinished">Default font point size:</translation>
+      <translation>既定フォントサイズ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="111"/>
       <source>Font Point Size 12</source>
-      <translation type="unfinished">Font Point Size 12</translation>
+      <translation>フォントサイズ 12</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="117"/>
       <source>QML Screen Desktop:</source>
-      <translation type="unfinished">QML Screen Desktop:</translation>
+      <translation>QML 画面デスクトップ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="127"/>
       <source>Font Point Size 12.5</source>
-      <translation type="unfinished">Font Point Size 12.5</translation>
+      <translation>フォントサイズ 12.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="133"/>
       <source>QML Screen Size:</source>
-      <translation type="unfinished">QML Screen Size:</translation>
+      <translation>QML 画面サイズ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="143"/>
       <source>Font Point Size 13</source>
-      <translation type="unfinished">Font Point Size 13</translation>
+      <translation>フォントサイズ 13</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="149"/>
       <source>QML Pixel Density:</source>
-      <translation type="unfinished">QML Pixel Density:</translation>
+      <translation>QML ピクセル密度:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="159"/>
       <source>Font Point Size 13.5</source>
-      <translation type="unfinished">Font Point Size 13.5</translation>
+      <translation>フォントサイズ 13.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="165"/>
       <source>QML Pixel Ratio:</source>
-      <translation type="unfinished">QML Pixel Ratio:</translation>
+      <translation>QML ピクセル比:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="175"/>
       <source>Font Point Size 14</source>
-      <translation type="unfinished">Font Point Size 14</translation>
+      <translation>フォントサイズ 14</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="181"/>
       <source>Default Point:</source>
-      <translation type="unfinished">Default Point:</translation>
+      <translation>既定サイズ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="191"/>
       <source>Font Point Size 14.5</source>
-      <translation type="unfinished">Font Point Size 14.5</translation>
+      <translation>フォントサイズ 14.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="197"/>
       <source>Computed Font Height:</source>
-      <translation type="unfinished">Computed Font Height:</translation>
+      <translation>計算されたフォント高さ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="207"/>
       <source>Font Point Size 15</source>
-      <translation type="unfinished">Font Point Size 15</translation>
+      <translation>フォントサイズ 15</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="213"/>
       <source>Computed Screen Height:</source>
-      <translation type="unfinished">Computed Screen Height:</translation>
+      <translation>計算されたスクリーン高さ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="223"/>
       <source>Font Point Size 15.5</source>
-      <translation type="unfinished">Font Point Size 15.5</translation>
+      <translation>フォントサイズ 15.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="229"/>
       <source>Computed Screen Width:</source>
-      <translation type="unfinished">Computed Screen Width:</translation>
+      <translation>計算されたスクリーン幅:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="239"/>
       <source>Font Point Size 16</source>
-      <translation type="unfinished">Font Point Size 16</translation>
+      <translation>フォントサイズ 16</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="245"/>
       <source>Desktop Available Width:</source>
-      <translation type="unfinished">Desktop Available Width:</translation>
+      <translation>利用可能なデスクトップ幅:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="255"/>
       <source>Font Point Size 16.5</source>
-      <translation type="unfinished">Font Point Size 16.5</translation>
+      <translation>フォントサイズ 16.5</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="261"/>
       <source>Desktop Available Height:</source>
-      <translation type="unfinished">Desktop Available Height:</translation>
+      <translation>利用可能なデスクトップ高さ:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/DebugWindow.qml" line="271"/>
       <source>Font Point Size 17</source>
-      <translation type="unfinished">Font Point Size 17</translation>
+      <translation>フォントサイズ 17</translation>
     </message>
   </context>
   <context>
@@ -5512,7 +5512,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="107"/>
       <source>Flight Speed</source>
-      <translation type="unfinished">Flight Speed</translation>
+      <translation>飛行速度</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="118"/>
@@ -5787,7 +5787,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="214"/>
       <source>Supplied file is not a valid JSON document</source>
-      <translation>指定されたファイルは有効なJSONドキュメントではありません</translation>
+      <translation>指定されたファイルは有効なJsonドキュメントではありません</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="225"/>
@@ -5914,7 +5914,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="46"/>
       <source>%1 can upgrade the firmware on Pixhawk devices and SiK Radios.</source>
-      <translation type="unfinished">%1 can upgrade the firmware on Pixhawk devices and SiK Radios.</translation>
+      <translation>%1 はPixhawkデバイスとSiK送信機のファームウェアをアップグレードできます。</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="48"/>
@@ -6375,7 +6375,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/FlightModeIndicator.qml" line="222"/>
       <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
+      <translation>飛行モード</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FlightModeIndicator.qml" line="223"/>
@@ -6452,7 +6452,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/FlyViewAdditionalActionsButton.qml" line="21"/>
       <source>Actions</source>
-      <translation type="unfinished">Actions</translation>
+      <translation>アクション</translation>
     </message>
   </context>
   <context>
@@ -6509,7 +6509,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="740"/>
       <source>Set Heading</source>
-      <translation type="unfinished">Set Heading</translation>
+      <translation>ヘッディング設定</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="750"/>
@@ -6608,7 +6608,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="78"/>
       <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <translation>複数機体パネルを有効</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="85"/>
@@ -6633,7 +6633,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="119"/>
       <source>Guided Commands</source>
-      <translation>ガイド付きコマンド</translation>
+      <translation>ガイド補助コマンド</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="126"/>
@@ -6653,32 +6653,32 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="147"/>
       <source>Loiter Radius in Forward Flight Guided Mode</source>
-      <translation type="unfinished">Loiter Radius in Forward Flight Guided Mode</translation>
+      <translation>ガイド補助モード [前進飛行] 時のロイター半径</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="154"/>
       <source>Require Confirmation for Go To Location in Guided Mode</source>
-      <translation type="unfinished">Require Confirmation for Go To Location in Guided Mode</translation>
+      <translation>ガイド補助モードでの移動操作に確認を要求</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="163"/>
       <source>MAVLink Actions</source>
-      <translation type="unfinished">MAVLink Actions</translation>
+      <translation>MAVLink アクション</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="164"/>
       <source>Action JSON files should be created in the &apos;%1&apos; folder.</source>
-      <translation type="unfinished">Action JSON files should be created in the &apos;%1&apos; folder.</translation>
+      <translation>アクションJsonファイルは、&apos;%1&apos; フォルダに作成する必要があります。</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="168"/>
       <source>Fly View Actions</source>
-      <translation type="unfinished">Fly View Actions</translation>
+      <translation>飛行ビュー アクション</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="181"/>
       <source>Joystick Actions</source>
-      <translation type="unfinished">Joystick Actions</translation>
+      <translation>ジョイスティック アクション</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="195"/>
@@ -6699,7 +6699,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="215"/>
       <source>Left-Handed Mode (swap sticks)</source>
-      <translation type="unfinished">Left-Handed Mode (swap sticks)</translation>
+      <translation>左利きモード (スティック入れ替え)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/FlyViewSettings.qml" line="224"/>
@@ -6794,47 +6794,47 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="66"/>
       <source>Selected: </source>
-      <translation type="unfinished">Selected: </translation>
+      <translation>新しい保存先: </translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="138"/>
       <source>Multi Vehicle Selection</source>
-      <translation type="unfinished">Multi Vehicle Selection</translation>
+      <translation>複数機体の選択</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="147"/>
       <source>Select All</source>
-      <translation type="unfinished">Select All</translation>
+      <translation>すべて選択</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="153"/>
       <source>Deselect All</source>
-      <translation type="unfinished">Deselect All</translation>
+      <translation>すべての選択を解除</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="162"/>
       <source>Multi Vehicle Actions</source>
-      <translation type="unfinished">Multi Vehicle Actions</translation>
+      <translation>複数機体 アクション</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="171"/>
       <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
+      <translation>アーム</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="180"/>
       <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
+      <translation>ディスアーム</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="189"/>
       <source>Start</source>
-      <translation type="unfinished">Start</translation>
+      <translation>スタート</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="198"/>
       <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
+      <translation>一時停止</translation>
     </message>
   </context>
   <context>
@@ -6850,113 +6850,113 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="110"/>
       <source>GCS </source>
-      <translation type="unfinished">GCS </translation>
+      <translation>GCS </translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="110"/>
       <source> is requesting control</source>
-      <translation type="unfinished"> is requesting control</translation>
+      <translation> 制御を要求しています</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="115"/>
       <source>Allow &lt;br&gt; takeover</source>
-      <translation type="unfinished">Allow &lt;br&gt; takeover</translation>
+      <translation>&lt;br&gt; のテイクオーバーを許可</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="132"/>
       <source>Ignoring automatically in </source>
-      <translation type="unfinished">Ignoring automatically in </translation>
+      <translation>自動的に無視 </translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="132"/>
       <source> seconds</source>
-      <translation type="unfinished"> seconds</translation>
+      <translation> 秒</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="136"/>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="193"/>
       <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
+      <translation>無視</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="187"/>
       <source>Reverting back to takeover not allowed if GCS </source>
-      <translation type="unfinished">Reverting back to takeover not allowed if GCS </translation>
+      <translation>GCSの場合はテイクオーバーに復帰することはできません</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="188"/>
       <source> doesn&apos;t take control in </source>
-      <translation type="unfinished"> doesn&apos;t take control in </translation>
+      <translation> 制御を取得しません </translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="189"/>
       <source> seconds ...</source>
-      <translation type="unfinished"> seconds ...</translation>
+      <translation> 秒...</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="238"/>
       <source>System in control: </source>
-      <translation type="unfinished">System in control: </translation>
+      <translation>システム制御: </translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="242"/>
       <source>This GCS</source>
-      <translation type="unfinished">This GCS</translation>
+      <translation>この GCS</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="250"/>
       <source>Takeover allowed</source>
-      <translation type="unfinished">Takeover allowed</translation>
+      <translation>テイクオーバー許可</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="250"/>
       <source>Takeover NOT allowed</source>
-      <translation type="unfinished">Takeover NOT allowed</translation>
+      <translation>テイクオーバー禁止</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="266"/>
       <source>Send Control Request:</source>
-      <translation type="unfinished">Send Control Request:</translation>
+      <translation>制御リクエストを送信:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="271"/>
       <source>Change takeover condition:</source>
-      <translation type="unfinished">Change takeover condition:</translation>
+      <translation>テイクオーバー条件を変更:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="277"/>
       <source>Request sent: </source>
-      <translation type="unfinished">Request sent: </translation>
+      <translation>リクエスト送信済み: </translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="282"/>
       <source>Allow takeover</source>
-      <translation type="unfinished">Allow takeover</translation>
+      <translation>テイクオーバー許可</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="287"/>
       <source>Adquire Control</source>
-      <translation type="unfinished">Adquire Control</translation>
+      <translation>制御権を取得</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="287"/>
       <source>Send Request</source>
-      <translation type="unfinished">Send Request</translation>
+      <translation>リクエストを送信</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="301"/>
       <source>Request Timeout (sec):</source>
-      <translation type="unfinished">Request Timeout (sec):</translation>
+      <translation>リクエスト タイムアウト (秒):</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="311"/>
       <source>Change</source>
-      <translation type="unfinished">Change</translation>
+      <translation>変更</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GCSControlIndicator.qml" line="328"/>
       <source>This GCS Mavlink System ID: </source>
-      <translation type="unfinished">This GCS Mavlink System ID: </translation>
+      <translation>このGCS上のMavLink システムID: </translation>
     </message>
   </context>
   <context>
@@ -6964,7 +6964,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/GPSIndicator.qml" line="44"/>
       <source>RTK</source>
-      <translation type="unfinished">RTK</translation>
+      <translation>RTK</translation>
     </message>
   </context>
   <context>
@@ -7055,22 +7055,22 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="110"/>
       <source>Survey-In</source>
-      <translation type="unfinished">Survey-In</translation>
+      <translation>測位調査 (サーベイイン)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="116"/>
       <source>Specify position</source>
-      <translation type="unfinished">Specify position</translation>
+      <translation>位置を指定</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="125"/>
       <source>Accuracy (u-blox only)</source>
-      <translation type="unfinished">Accuracy (u-blox only)</translation>
+      <translation>測位精度  (u-blox専用)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="134"/>
       <source>Min Duration</source>
-      <translation type="unfinished">Min Duration</translation>
+      <translation>最小時間</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="165"/>
@@ -7342,12 +7342,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="76"/>
       <source>Empty Filename.</source>
-      <translation type="unfinished">Empty Filename.</translation>
+      <translation>ファイル名が空です。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="82"/>
       <source>Invalid Filename.</source>
-      <translation type="unfinished">Invalid Filename.</translation>
+      <translation>無効なファイル名です。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="95"/>
@@ -7355,12 +7355,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="122"/>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="128"/>
       <source>Invalid Directory.</source>
-      <translation type="unfinished">Invalid Directory.</translation>
+      <translation>無効なディレクトリです。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="111"/>
       <source>Images have already been tagged. Existing images will be removed.</source>
-      <translation type="unfinished">Images have already been tagged. Existing images will be removed.</translation>
+      <translation>画像は既にタグ付けされています。既存の画像は削除されます。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="144"/>
@@ -7458,33 +7458,33 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="106"/>
       <source>Geotagging failed. Couldn&apos;t open image: %1</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open image: %1</translation>
+      <translation>ジオタグ処理に失敗しました。画像を開くことができませんでした: %1</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="115"/>
       <source>Geotagging failed. Couldn&apos;t extract time from image: %1</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t extract time from image: %1</translation>
+      <translation>ジオタグ処理に失敗しました。画像から時刻を読み取れませんでした: %1</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="172"/>
       <source>Calibration failed: No triggers or images available.</source>
-      <translation type="unfinished">Calibration failed: No triggers or images available.</translation>
+      <translation>キャリブレーションに失敗しました: トリガーまたは画像がありません。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="194"/>
       <source>Calibration failed: No matching triggers found for images.</source>
-      <translation type="unfinished">Calibration failed: No matching triggers found for images.</translation>
+      <translation>キャリブレーションに失敗しました: 画像に対応するトリガーが見つかりません。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="221"/>
       <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation>ジオタグ付けに失敗しました。画像を開くことができません。</translation>
+      <translation>ジオタグ処理に失敗しました。単一画像を開くことができませんでした。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="229"/>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="241"/>
       <source>Geotagging failed. Couldn&apos;t write to image: %1</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image: %1</translation>
+      <translation>ジオタグ処理に失敗しました。画像への書き込みができませんでした: %1</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="55"/>
@@ -7496,7 +7496,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="133"/>
       <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation>ジオタグ付けに失敗しました。ログファイルを開くことができません。</translation>
+      <translation>ジオタグ処理に失敗しました。ログファイルを開くことができませんでした。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="149"/>
@@ -7506,7 +7506,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="214"/>
       <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation>ジオタグ付けに失敗しました。画像 #%1 をリクエストしていますが、存在する画像は %2 だけです。</translation>
+      <translation>ジオタグ処理に失敗しました。画像 #%1 をリクエストしていますが、存在する画像は %2 だけです。</translation>
     </message>
   </context>
   <context>
@@ -7600,7 +7600,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/toolbar/GimbalIndicator.qml" line="300"/>
       <source>Joystick buttons speed:</source>
-      <translation type="unfinished">Joystick buttons speed:</translation>
+      <translation>ジョイスティックボタンの速度:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GimbalIndicator.qml" line="321"/>
@@ -7610,7 +7610,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/toolbar/GimbalIndicator.qml" line="330"/>
       <source>Use Azimuth instead of local yaw on top toolbar indicator</source>
-      <translation>上部のツールバーインジケータで、ローカル・ヨーの代わりに方位を使用する</translation>
+      <translation>トップツールバーのインジケータにローカル・ヨーの代わりに方位角を使用する</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/GimbalIndicator.qml" line="339"/>
@@ -7676,7 +7676,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
       <source>Arm (MV)</source>
-      <translation type="unfinished">Arm (MV)</translation>
+      <translation>アーム (MV)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
@@ -7686,7 +7686,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
       <source>Disarm (MV)</source>
-      <translation type="unfinished">Disarm (MV)</translation>
+      <translation>ディスアーム (MV)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
@@ -7781,7 +7781,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
       <source>Change Loiter Radius</source>
-      <translation type="unfinished">Change Loiter Radius</translation>
+      <translation>ロイター半径を変更</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
@@ -7811,12 +7811,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
       <source>Set Flight Mode</source>
-      <translation>フライトモード設定</translation>
+      <translation>飛行モード設定</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
       <source>Change Heading</source>
-      <translation type="unfinished">Change Heading</translation>
+      <translation>ヘッディング 変更</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
@@ -7826,7 +7826,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
       <source>Arm selected vehicles.</source>
-      <translation type="unfinished">Arm selected vehicles.</translation>
+      <translation>機体を選択してアームします。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
@@ -7841,7 +7841,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
       <source>Disarm selected vehicles.</source>
-      <translation type="unfinished">Disarm selected vehicles.</translation>
+      <translation>機体を選択してディスアームします。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
@@ -7866,7 +7866,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
       <source>Takeoff from ground and start the current mission for selected vehicles.</source>
-      <translation type="unfinished">Takeoff from ground and start the current mission for selected vehicles.</translation>
+      <translation>選択した機体を離陸させ、現在のミッションを開始します。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
@@ -7891,7 +7891,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="81"/>
       <source>Change the forward flight loiter radius.</source>
-      <translation type="unfinished">Change the forward flight loiter radius.</translation>
+      <translation>前進飛行時のロイター [旋回待機] 半径を変更します。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="82"/>
@@ -7901,7 +7901,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="83"/>
       <source>Change the equivalent airspeed setpoint.</source>
-      <translation type="unfinished">Change the equivalent airspeed setpoint.</translation>
+      <translation>等価対気速度 [EAS] の設定値を変更します。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="84"/>
@@ -7931,7 +7931,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="89"/>
       <source>Pause selected vehicles at their current position.</source>
-      <translation type="unfinished">Pause selected vehicles at their current position.</translation>
+      <translation>選択した機体を現在位置で一時停止します。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="90"/>
@@ -7961,12 +7961,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="95"/>
       <source>Set the vehicle flight mode to %1</source>
-      <translation>機体フライトモードを %1 に設定</translation>
+      <translation>機体の飛行トモードを %1 に設定</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="96"/>
       <source>Set the vehicle heading towards the specified location.</source>
-      <translation type="unfinished">Set the vehicle heading towards the specified location.</translation>
+      <translation>機体のヘッディングを指定位置の方向に設定します。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="221"/>
@@ -7996,7 +7996,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="497"/>
       <source>Smart RTL</source>
-      <translation>スマートRTL</translation>
+      <translation>Smart RTL</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="736"/>
@@ -8100,27 +8100,27 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
       <source>Telemetry Display</source>
-      <translation type="unfinished">Telemetry Display</translation>
+      <translation>テレメトリー表示</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="55"/>
       <source>Telemetry</source>
-      <translation type="unfinished">Telemetry</translation>
+      <translation>テレメトリー</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="59"/>
       <source>Group</source>
-      <translation type="unfinished">Group</translation>
+      <translation>グループ</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="75"/>
       <source>Value</source>
-      <translation type="unfinished">Value</translation>
+      <translation>値</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="136"/>
       <source>Change</source>
-      <translation type="unfinished">Change</translation>
+      <translation>変更</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="173"/>
@@ -8135,12 +8135,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="190"/>
       <source>Value range</source>
-      <translation type="unfinished">Value range</translation>
+      <translation>値の範囲</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="201"/>
       <source>Type</source>
-      <translation type="unfinished">Type</translation>
+      <translation>タイプ</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="293"/>
@@ -8238,17 +8238,17 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Joystick/Joystick.h" line="352"/>
       <source>Start Recording Video</source>
-      <translation>ビデオ録画を開始</translation>
+      <translation>録画を開始</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="353"/>
       <source>Stop Recording Video</source>
-      <translation>ビデオ録画を停止</translation>
+      <translation>録画を停止</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="354"/>
       <source>Toggle Recording Video</source>
-      <translation>ビデオ録画 切替</translation>
+      <translation>録画を切り替え</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="355"/>
@@ -8313,22 +8313,22 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Joystick/Joystick.h" line="367"/>
       <source>Motor Interlock enable</source>
-      <translation type="unfinished">Motor Interlock enable</translation>
+      <translation>モーターインターロック 有効</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="368"/>
       <source>Motor Interlock disable</source>
-      <translation type="unfinished">Motor Interlock disable</translation>
+      <translation>モーターインターロック 無効</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="347"/>
       <source>Next Video Stream</source>
-      <translation>次のビデオ ストリーム</translation>
+      <translation>次のビデオストリーム</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="348"/>
       <source>Previous Video Stream</source>
-      <translation>前のビデオ ストリーム</translation>
+      <translation>前のビデオストリーム</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="349"/>
@@ -8355,8 +8355,8 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation>ボタンの割り当て</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -8605,38 +8605,38 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="28"/>
       <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
+      <translation>ファイルが見つかりません: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="33"/>
       <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
+      <translation>ファイルを開くことができません: %1 エラー: $%2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="40"/>
       <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
+      <translation>KMLファイルを解析できません: %1 エラー: %2 行: %3</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="66"/>
       <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
+      <translation>KMLファイルにサポートされているタイプが見つかりません。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="82"/>
       <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
+      <translation>KML内にポリゴンノードが見つかりません。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="88"/>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="143"/>
       <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
+      <translation>内部エラー: KML内で座標ノードが見つかりません</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="137"/>
       <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
+      <translation>KML内にLineStringノードが見つかりません</translation>
     </message>
   </context>
   <context>
@@ -8652,7 +8652,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
       <source>Select File</source>
-      <translation type="unfinished">Select File</translation>
+      <translation>ファイル選択</translation>
     </message>
   </context>
   <context>
@@ -8718,7 +8718,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="561"/>
       <source>Bluetooth</source>
-      <translation type="unfinished">Bluetooth</translation>
+      <translation>Bluetooth</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="564"/>
@@ -8787,37 +8787,37 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="53"/>
       <source>NMEA GPS</source>
-      <translation type="unfinished">NMEA GPS</translation>
+      <translation>NMEA GPS</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="58"/>
       <source>Device</source>
-      <translation type="unfinished">Device</translation>
+      <translation>デバイス</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="71"/>
       <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
+      <translation>無効</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="72"/>
       <source>UDP Port</source>
-      <translation type="unfinished">UDP Port</translation>
+      <translation>UDPポート</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="75"/>
       <source>Serial &lt;none available&gt;</source>
-      <translation type="unfinished">Serial &lt;none available&gt;</translation>
+      <translation>シリアル &lt;none available&gt;</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="91"/>
       <source>Baudrate</source>
-      <translation type="unfinished">Baudrate</translation>
+      <translation>伝送速度</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="108"/>
       <source>NMEA stream UDP port</source>
-      <translation type="unfinished">NMEA stream UDP port</translation>
+      <translation>NMEA stream UDPポート</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="114"/>
@@ -8998,7 +8998,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/LogReplayLink.h" line="42"/>
       <source>Log Replay Link Settings</source>
-      <translation type="unfinished">Log Replay Link Settings</translation>
+      <translation>ログ再生リンクの設定</translation>
     </message>
   </context>
   <context>
@@ -9006,12 +9006,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="455"/>
       <source>Log Replay Link Error</source>
-      <translation type="unfinished">Log Replay Link Error</translation>
+      <translation>ログ再生リンクエラー</translation>
     </message>
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="455"/>
       <source>Link: %1, %2.</source>
-      <translation type="unfinished">Link: %1, %2.</translation>
+      <translation>リンク: %1, %2.</translation>
     </message>
   </context>
   <context>
@@ -9095,33 +9095,33 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="117"/>
       <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
+      <translation>ログを再生する前にすべての接続を閉じる必要があります。</translation>
     </message>
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="152"/>
       <source>Connect not allowed during Flight Data replay.</source>
-      <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
+      <translation>飛行データの再生中は接続できません。</translation>
     </message>
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="197"/>
       <location filename="../src/Comms/LogReplayLink.cc" line="209"/>
       <source>Unable to seek to new position</source>
-      <translation type="unfinished">Unable to seek to new position</translation>
+      <translation>新しいポジションを探すことができません</translation>
     </message>
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="272"/>
       <source>Attempt to load new log while log being played</source>
-      <translation type="unfinished">Attempt to load new log while log being played</translation>
+      <translation>ログ再生中に新しいログを読み込もうとしています</translation>
     </message>
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="279"/>
       <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
+      <translation>ログファイルを開けません: &apos;%1&apos;, エラー: %2</translation>
     </message>
     <message>
       <location filename="../src/Comms/LogReplayLink.cc" line="291"/>
       <source>The log file &apos;%1&apos; is corrupt or empty.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
+      <translation>ログ ファイル &apos;%1&apos; が破損もしくは空です。</translation>
     </message>
   </context>
   <context>
@@ -9544,17 +9544,17 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Comms/MAVLinkProtocol.cc" line="415"/>
       <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
-      <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
+      <translation>テレメトリーログを保存できません。&apos;%1&apos;にテレメトリーをコピー中にエラーが発生しました: &apos;%2&apos;</translation>
     </message>
     <message>
       <location filename="../src/Comms/MAVLinkProtocol.cc" line="427"/>
       <source>Unable to save telemetry log. Application save directory is not set.</source>
-      <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
+      <translation>テレメトリーログを保存できません。アプリケーションの保存ディレクトリが設定されていません。</translation>
     </message>
     <message>
       <location filename="../src/Comms/MAVLinkProtocol.cc" line="434"/>
       <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
-      <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
+      <translation>テレメトリーログを保存できません。テレメトリー保存ディレクトリ &quot;%1&quot; が存在しません。</translation>
     </message>
   </context>
   <context>
@@ -9607,7 +9607,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="45"/>
       <source>Comms Lost</source>
-      <translation type="unfinished">Comms Lost</translation>
+      <translation>通信損失</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="48"/>
@@ -9627,7 +9627,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="218"/>
       <source>Vehicle Messages</source>
-      <translation type="unfinished">Vehicle Messages</translation>
+      <translation>機体メッセージ</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="251"/>
@@ -9653,7 +9653,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="369"/>
       <source>Vehicle Configuration</source>
-      <translation type="unfinished">Vehicle Configuration</translation>
+      <translation>機体設定</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="388"/>
@@ -9737,89 +9737,89 @@ OKをクリックして、自動調整プロセスを開始します。</transla
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
-      <translation type="unfinished">Analyze Tools</translation>
+      <translation>解析ツール</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
-      <translation type="unfinished">Vehicle Configuration</translation>
+      <translation>機体設定</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
-      <translation type="unfinished">Application Settings</translation>
+      <translation>アプリケーション設定</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
-      <translation type="unfinished">Close %1</translation>
+      <translation>%1 を閉じる</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
+      <translation>編集中のミッションは保存 / 送信されていません。このまま閉じると変更が失われます。閉じてもよろしいですか？</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
+      <translation>機体へのパラメータ更新が保留中です。このまま閉じると変更が失われます。閉じてもよろしいですか？</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
-      <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
+      <translation>機体への接続がまだ有効です。本当に終了してもよろしいですか？</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
-      <translation type="unfinished">Debug Touch Areas</translation>
+      <translation>タッチエリアのデバッグ</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
-      <translation type="unfinished">Touch Area display toggled</translation>
+      <translation>タッチエリアの表示切り替え</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
+      <translation>詳細設定モード</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
-      <translation type="unfinished">Turn off Advanced Mode?</translation>
+      <translation>詳細設定モードをOFFにしますか？</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
-      <translation type="unfinished">Plan Flight</translation>
+      <translation>飛行計画</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
+      <translation>%1 バージョン</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
-      <translation type="unfinished">Exit</translation>
+      <translation>終了</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
-      <translation type="unfinished">Vehicle Error</translation>
+      <translation>機体エラー</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
-      <translation type="unfinished">Additional errors received</translation>
+      <translation>追加エラーを受信しました</translation>
     </message>
   </context>
   <context>
@@ -9875,7 +9875,7 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/MapSettings.qml" line="91"/>
       <source>Elevation Provider</source>
-      <translation type="unfinished">Elevation Provider</translation>
+      <translation>標高プロバイダ</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MapSettings.qml" line="106"/>
@@ -10033,18 +10033,18 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/QmlControls/MavlinkActionManager.cc" line="82"/>
       <source>Failed to load custom actions file: `%1` error: `%2`</source>
-      <translation type="unfinished">Failed to load custom actions file: `%1` error: `%2`</translation>
+      <translation>カスタムアクションファイルのロードに失敗しました: `%1` エラー: `%2`</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MavlinkActionManager.cc" line="90"/>
       <location filename="../src/QmlControls/MavlinkActionManager.cc" line="119"/>
       <source>Custom actions file - incorrect format: %1</source>
-      <translation type="unfinished">Custom actions file - incorrect format: %1</translation>
+      <translation>カスタムアクションファイル - 不正なフォーマット: %1</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MavlinkActionManager.cc" line="97"/>
       <source>Custom actions file - incorrect format: JsonValue not an object</source>
-      <translation type="unfinished">Custom actions file - incorrect format: JsonValue not an object</translation>
+      <translation>カスタムアクションファイル - 不正なフォーマット: Json値がオブジェクトではありません</translation>
     </message>
   </context>
   <context>
@@ -10052,12 +10052,12 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/Settings/MavlinkActionsSettings.cc" line="29"/>
       <source>Support for Fly View custom actions has changed. The location of the files has changed. You will need to setup up your settings again from Fly View Settings.</source>
-      <translation type="unfinished">Support for Fly View custom actions has changed. The location of the files has changed. You will need to setup up your settings again from Fly View Settings.</translation>
+      <translation>飛行ビューのカスタムアクションのサポートが変更されました。ファイルの場所が変更されました。飛行ビューの設定から再度設定を行う必要があります。</translation>
     </message>
     <message>
       <location filename="../src/Settings/MavlinkActionsSettings.cc" line="35"/>
       <source>Support for Joystick custom actions has changed. The format and location of the files has changed. New setting is available from Fly View Settings. File format is documented in user guide. Delete the %1 file to disable this warning</source>
-      <translation type="unfinished">Support for Joystick custom actions has changed. The format and location of the files has changed. New setting is available from Fly View Settings. File format is documented in user guide. Delete the %1 file to disable this warning</translation>
+      <translation>ジョイスティックのカスタムアクションのサポートが変更されました。ファイルの形式と場所が変更されました。新しい設定は【飛行ビュー設定】から利用できます。ファイルの形式はユーザガイドに記載されています。この警告を無効にするには %1 ファイルを削除してください。</translation>
     </message>
   </context>
   <context>
@@ -10350,42 +10350,42 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="43"/>
       <source>Send status text + voice</source>
-      <translation type="unfinished">Send status text + voice</translation>
+      <translation>ステータステキスト + 音声を送信</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="46"/>
       <source>PX4 Vehicle</source>
-      <translation type="unfinished">PX4 Vehicle</translation>
+      <translation>PX4 機体</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="51"/>
       <source>APM ArduCopter Vehicle</source>
-      <translation type="unfinished">APM ArduCopter Vehicle</translation>
+      <translation>APM ArduCopter機体</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="57"/>
       <source>APM ArduPlane Vehicle</source>
-      <translation type="unfinished">APM ArduPlane Vehicle</translation>
+      <translation>APM ArduPlane機体</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="63"/>
       <source>APM ArduSub Vehicle</source>
-      <translation type="unfinished">APM ArduSub Vehicle</translation>
+      <translation>APM ArduSub機体</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="69"/>
       <source>APM ArduRover Vehicle</source>
-      <translation type="unfinished">APM ArduRover Vehicle</translation>
+      <translation>APM ArduRover機体</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="75"/>
       <source>Generic Vehicle</source>
-      <translation type="unfinished">Generic Vehicle</translation>
+      <translation>汎用機体</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLink.qml" line="80"/>
       <source>Stop One MockLink</source>
-      <translation type="unfinished">Stop One MockLink</translation>
+      <translation>疑似リンク 停止</translation>
     </message>
   </context>
   <context>
@@ -10393,47 +10393,47 @@ OKをクリックして、自動調整プロセスを開始します。</transla
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="73"/>
       <source>Send Status Text and Voice</source>
-      <translation type="unfinished">Send Status Text and Voice</translation>
+      <translation>文字と音声で状態を送信します</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="80"/>
       <source>Increment Vehicle Id</source>
-      <translation type="unfinished">Increment Vehicle Id</translation>
+      <translation>機体IDの追加</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="84"/>
       <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
+      <translation>ファームウェア</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="88"/>
       <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
+      <translation> PX4 Pro</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="88"/>
       <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
+      <translation>ArduPilot</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="88"/>
       <source>Generic MAVLink</source>
-      <translation type="unfinished">Generic MAVLink</translation>
+      <translation>汎用 MAVLink</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="94"/>
       <source>Vehicle Type</source>
-      <translation type="unfinished">Vehicle Type</translation>
+      <translation>機体タイプ</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="100"/>
       <source>ArduCopter</source>
-      <translation type="unfinished">ArduCopter</translation>
+      <translation>ArduCopter</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/MockLinkSettings.qml" line="100"/>
       <source>ArduPlane</source>
-      <translation type="unfinished">ArduPlane</translation>
+      <translation>ArduPlane</translation>
     </message>
   </context>
   <context>
@@ -10501,17 +10501,17 @@ Do you wish to proceed?</source>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="63"/>
       <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
+      <translation>スロットル</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="68"/>
       <source>%</source>
-      <translation type="unfinished">%</translation>
+      <translation>%</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="76"/>
       <source>Make sure you remove all props.</source>
-      <translation type="unfinished">Make sure you remove all props.</translation>
+      <translation>必ずすべてのプロペラを取り外してください。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="100"/>
@@ -10521,17 +10521,17 @@ Do you wish to proceed?</source>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="110"/>
       <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
+      <translation>停止</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="134"/>
       <source>Careful : Motors are enabled</source>
-      <translation type="unfinished">Careful : Motors are enabled</translation>
+      <translation>注意: モーターは有効です</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="134"/>
       <source>Propellers are removed - Enable slider and motors</source>
-      <translation type="unfinished">Propellers are removed - Enable slider and motors</translation>
+      <translation>プロペラが取り外されました - スライダーとモーターを有効にします</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
@@ -10659,12 +10659,12 @@ Do you wish to proceed?</source>
     <message>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="52"/>
       <source>N/A</source>
-      <translation type="unfinished">N/A</translation>
+      <translation>N/A</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="97"/>
       <source>Enable Multi-Vehicle Panel</source>
-      <translation type="unfinished">Enable Multi-Vehicle Panel</translation>
+      <translation>複数機体パネルを有効</translation>
     </message>
   </context>
   <context>
@@ -10861,7 +10861,7 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/OpticalFlowSensor.qml" line="21"/>
       <source>Optical Flow Camera</source>
-      <translation type="unfinished">Optical Flow Camera</translation>
+      <translation>オプティカルフローカメラ</translation>
     </message>
   </context>
   <context>
@@ -10945,12 +10945,12 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml" line="28"/>
       <source>Low Battery Failsafe</source>
-      <translation type="unfinished">Low Battery Failsafe</translation>
+      <translation>低バッテリーフェイルセーフ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml" line="33"/>
       <source>Vehicle Action</source>
-      <translation type="unfinished">Vehicle Action</translation>
+      <translation>機体アクション</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml" line="40"/>
@@ -10960,7 +10960,7 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml" line="47"/>
       <source>Critical Level</source>
-      <translation type="unfinished">Critical Level</translation>
+      <translation>限界レベル</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4BatteryIndicator.qml" line="54"/>
@@ -11093,17 +11093,17 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="555"/>
       <source>Vehicle does not support guided rotate</source>
-      <translation type="unfinished">Vehicle does not support guided rotate</translation>
+      <translation>機体はガイド補助回転をサポートしていません。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="577"/>
       <source>Unable to start takeoff: Vehicle rejected arming.</source>
-      <translation type="unfinished">Unable to start takeoff: Vehicle rejected arming.</translation>
+      <translation>離陸を開始できません: 機体がアーミングを拒否しました。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="581"/>
       <source>Unable to start takeoff: Vehicle not changing to %1 flight mode.</source>
-      <translation type="unfinished">Unable to start takeoff: Vehicle not changing to %1 flight mode.</translation>
+      <translation>離陸を開始できません: 機体が %1 飛行モードに切り替わりません。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="589"/>
@@ -11240,22 +11240,22 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml" line="57"/>
       <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
+      <translation>ジオフェンス</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml" line="61"/>
       <source>Breach Action</source>
-      <translation type="unfinished">Breach Action</translation>
+      <translation>違反時アクション</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml" line="68"/>
       <source>Max Distance</source>
-      <translation type="unfinished">Max Distance</translation>
+      <translation>最大距離</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FlightModeIndicator.qml" line="96"/>
       <source>Max Altitude</source>
-      <translation type="unfinished">Max Altitude</translation>
+      <translation>最大高度</translation>
     </message>
   </context>
   <context>
@@ -11472,28 +11472,28 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml" line="28"/>
       <source>Ground Control Comm Loss Failsafe</source>
-      <translation type="unfinished">Ground Control Comm Loss Failsafe</translation>
+      <translation>地上局 通信喪失時フェイルセーフ</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml" line="37"/>
       <source>Vehicle Action</source>
-      <translation type="unfinished">Vehicle Action</translation>
+      <translation>機体アクション</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4MainStatusIndicatorContentItem.qml" line="49"/>
       <source>Loss Timeout</source>
-      <translation type="unfinished">Loss Timeout</translation>
+      <translation>損失タイムアウト</translation>
     </message>
   </context>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation>有効</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation>無効</translation>
     </message>
@@ -11710,13 +11710,13 @@ Is this really what you want?</source>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation>エアモード (チューニング中は無効) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation>エアモード (チューニング中は無効) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation>スラストカーブ &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation>スラストカーブ &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -12176,7 +12176,7 @@ Is this really what you want?</source>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="150"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>検索</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="60"/>
@@ -12190,7 +12190,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
       <source>Load from file for review...</source>
-      <translation type="unfinished">Load from file for review...</translation>
+      <translation>確認のためにファイルから読み込む…</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="95"/>
@@ -12252,7 +12252,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="25"/>
       <source>Value Editor</source>
-      <translation type="unfinished">Value Editor</translation>
+      <translation>値の編集</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="210"/>
@@ -12395,12 +12395,12 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
       <source>Video Grid Lines</source>
-      <translation>ビデオグリッド線</translation>
+      <translation>動画グリッド線</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
       <source>Video Screen Fit</source>
-      <translation>ビデオ画面に合わせる</translation>
+      <translation>動画画面に合わせる</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
@@ -12649,7 +12649,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="640"/>
       <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation>機体はエラーを返しました: %1。%2 機体はガイド補助された項目を受け入れませんでした。</translation>
+      <translation>機体がエラーを返しました: %1。%2 機体がガイド補助項目を受け付けませんでした。</translation>
     </message>
   </context>
   <context>
@@ -12939,7 +12939,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="637"/>
       <source>Alt Land</source>
-      <translation type="unfinished">Alt Land</translation>
+      <translation>着陸高度</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="638"/>
@@ -13091,7 +13091,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/UI/AppSettings/PlanViewSettings.qml" line="29"/>
       <source>Default Mission Altitude</source>
-      <translation>既定のミッション高度</translation>
+      <translation>既定ミッション高度</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/PlanViewSettings.qml" line="36"/>
@@ -13106,12 +13106,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/UI/AppSettings/PlanViewSettings.qml" line="50"/>
       <source>Missions do not require takeoff item</source>
-      <translation type="unfinished">Missions do not require takeoff item</translation>
+      <translation>ミッションで離陸項目は不要</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/PlanViewSettings.qml" line="57"/>
       <source>Allow configuring multiple landing sequences</source>
-      <translation type="unfinished">Allow configuring multiple landing sequences</translation>
+      <translation>複数の着陸シーケンスの設定を許可</translation>
     </message>
   </context>
   <context>
@@ -13119,7 +13119,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QmlControls/PlanViewToolBar.qml" line="58"/>
       <source>Exit Plan</source>
-      <translation type="unfinished">Exit Plan</translation>
+      <translation>プラン終了</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanViewToolBar.qml" line="131"/>
@@ -13615,7 +13615,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QGCApplication.cc" line="377"/>
       <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>現在のユーザはシリアルデバイスにアクセスするための適切な権限を持っていません。また、modemmanagerも干渉するため削除する必要があります。&lt;br/&gt;&lt;br/&gt;Ubuntuを使用している場合は、以下のコマンドを実行してこれらの問題を解決してください。&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
+      <translation>現在のユーザはシリアルデバイスにアクセスするための適切な権限を持っていません。また、モデムマネージャーも干渉するため削除する必要があります。&lt;br/&gt;&lt;br/&gt;Ubuntuを使用している場合は、以下のコマンドを実行してこれらの問題を解決してください。&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
     </message>
     <message>
       <location filename="../src/QGCApplication.cc" line="403"/>
@@ -13643,7 +13643,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QtLocationPlugin/QGCTileCacheWorker.cpp" line="51"/>
       <source>Database Not Initialized</source>
-      <translation type="unfinished">Database Not Initialized</translation>
+      <translation>データベースが初期化されていません</translation>
     </message>
   </context>
   <context>
@@ -13684,7 +13684,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="152"/>
       <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>警告: 詳細モードに入ろうとしています。誤った設定をすると機体が故障し保証が受けられなくなることがあります。カスタマーサポートからの指示があった場合のみ実施してください。詳細モードを有効にしてもよろしいですか？</translation>
+      <translation>警告: 詳細設定モードに入ろうとしています。誤った設定をすると機体が故障し保証が受けられなくなることがあります。カスタマーサポートからの指示があった場合のみ実施してください。詳細設定モードを有効にしてもよろしいですか？</translation>
     </message>
   </context>
   <context>
@@ -13770,12 +13770,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/Utilities/QGCLogging.cc" line="146"/>
       <source>Unable to reopen log file %1: %2</source>
-      <translation type="unfinished">Unable to reopen log file %1: %2</translation>
+      <translation>ログファイル %1 を再開できませんでした: %2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/QGCLogging.cc" line="170"/>
       <source>Open console log output file failed %1 : %2</source>
-      <translation type="unfinished">Open console log output file failed %1 : %2</translation>
+      <translation>コンソールログ出力ファイル %1 を開けませんでした: %2</translation>
     </message>
   </context>
   <context>
@@ -13843,7 +13843,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="330"/>
       <source>Submarine</source>
-      <translation>潜水艦</translation>
+      <translation>サブマリン</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="331"/>
@@ -14018,7 +14018,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="127"/>
       <source>Select Polyline File</source>
-      <translation type="unfinished">Select Polyline File</translation>
+      <translation>ポリラインファイルの選択</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="148"/>
@@ -14048,7 +14048,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="356"/>
       <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
+      <translation>KML / SHPの読み込み...</translation>
     </message>
   </context>
   <context>
@@ -14156,7 +14156,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoFileTileCacheQGC.cpp" line="220"/>
       <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
-      <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
+      <translation>オフライン地図キャッシュのデータベースがアップグレードされました。以前の地図キャッシュ設定はリセットされました。</translation>
     </message>
   </context>
   <context>
@@ -14164,47 +14164,47 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="82"/>
       <source>Unexpected Error</source>
-      <translation type="unfinished">Unexpected Error</translation>
+      <translation>予期しないエラー</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="92"/>
       <source>Empty Reply</source>
-      <translation type="unfinished">Empty Reply</translation>
+      <translation>応答がありません</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="104"/>
       <source>Image is Empty</source>
-      <translation type="unfinished">Image is Empty</translation>
+      <translation>画像が空です</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="112"/>
       <source>Bing Tile Above Zoom Level</source>
-      <translation type="unfinished">Bing Tile Above Zoom Level</translation>
+      <translation>Bingタイルがズームレベルを超えています</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="120"/>
       <source>Failed to Serialize Terrain Tile</source>
-      <translation type="unfinished">Failed to Serialize Terrain Tile</translation>
+      <translation>地形タイルの変換に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="128"/>
       <source>Unknown Format</source>
-      <translation type="unfinished">Unknown Format</translation>
+      <translation>不明なフォーマット</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="143"/>
       <source>Invalid Reply</source>
-      <translation type="unfinished">Invalid Reply</translation>
+      <translation>無効な応答です</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="176"/>
       <source>Invalid Cache Tile</source>
-      <translation type="unfinished">Invalid Cache Tile</translation>
+      <translation>キャッシュタイルが無効です</translation>
     </message>
     <message>
       <location filename="../src/QtLocationPlugin/QGeoMapReplyQGC.cpp" line="187"/>
       <source>Network Not Available</source>
-      <translation type="unfinished">Network Not Available</translation>
+      <translation>ネットワークが利用できません</translation>
     </message>
   </context>
   <context>
@@ -14296,7 +14296,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="183"/>
       <source>File open failed: file:error %1 %2</source>
-      <translation type="unfinished">File open failed: file:error %1 %2</translation>
+      <translation>ファイルを開けませんでした: ファイル:エラー %1 %2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="206"/>
@@ -14316,22 +14316,22 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="326"/>
       <source>Unable to open file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
+      <translation>ファイルを開けません: &apos;%1&apos;, エラー: %2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="335"/>
       <source>Unable to parse json file: %1 error: %2 offset: %3</source>
-      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
+      <translation>Jsonファイルを解析できません: %1 エラー: %2 オフセット: %3</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="340"/>
       <source>Root of json file is not object: %1</source>
-      <translation type="unfinished">Root of json file is not object: %1</translation>
+      <translation>JsonファイルのRootがオブジェクトではありません: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="347"/>
       <source>Json file: &apos;%1&apos;. %2</source>
-      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
+      <translation>Jsonファイル: &apos;%1&apos;. %2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="366"/>
@@ -14365,142 +14365,142 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="25"/>
       <source>No error</source>
-      <translation type="unfinished">No error</translation>
+      <translation>エラーなし</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="28"/>
       <source>Device is already open</source>
-      <translation type="unfinished">Device is already open</translation>
+      <translation>デバイスは既に使用中です</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="31"/>
       <source>Device is not open</source>
-      <translation type="unfinished">Device is not open</translation>
+      <translation>デバイスは使用中ではありません</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="34"/>
       <source>Operation timed out</source>
-      <translation type="unfinished">Operation timed out</translation>
+      <translation>操作がタイムアウトしました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="37"/>
       <source>Error reading from device</source>
-      <translation type="unfinished">Error reading from device</translation>
+      <translation>デバイスからの読み込みエラー</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="40"/>
       <source>Error writing to device</source>
-      <translation type="unfinished">Error writing to device</translation>
+      <translation>デバイスへの書き込みエラー</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="43"/>
       <source>Device disappeared from the system</source>
-      <translation type="unfinished">Device disappeared from the system</translation>
+      <translation>デバイスがシステムから切断されました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport.cpp" line="454"/>
       <source>Unsupported open mode</source>
-      <translation type="unfinished">Unsupported open mode</translation>
+      <translation>サポートされていないオープンモード</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="77"/>
       <source>Closing device failed</source>
-      <translation type="unfinished">Closing device failed</translation>
+      <translation>デバイスの終了に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="100"/>
       <source>Failed to start async read</source>
-      <translation type="unfinished">Failed to start async read</translation>
+      <translation>非同期読み込みの開始に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="128"/>
       <source>Failed to stop async read</source>
-      <translation type="unfinished">Failed to stop async read</translation>
+      <translation>非同期読み込みの停止に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="185"/>
       <source>Timeout while waiting for ready read</source>
-      <translation type="unfinished">Timeout while waiting for ready read</translation>
+      <translation>読み込み待機中にタイムアウトしました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="195"/>
       <source>Timeout while waiting for bytes written</source>
-      <translation type="unfinished">Timeout while waiting for bytes written</translation>
+      <translation>データ書き込み待機中にタイムアウトしました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="248"/>
       <source>Invalid data or size</source>
-      <translation type="unfinished">Invalid data or size</translation>
+      <translation>無効なデータまたはサイズ</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="254"/>
       <source>Failed to write data</source>
-      <translation type="unfinished">Failed to write data</translation>
+      <translation>データの書き込みに失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="265"/>
       <source>Failed to flush</source>
-      <translation type="unfinished">Failed to flush</translation>
+      <translation>フラッシュに失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="307"/>
       <source>Failed to set DTR</source>
-      <translation type="unfinished">Failed to set DTR</translation>
+      <translation>DTRの設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="318"/>
       <source>Failed to set RTS</source>
-      <translation type="unfinished">Failed to set RTS</translation>
+      <translation>RTSの設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="329"/>
       <source>Failed to set parameters</source>
-      <translation type="unfinished">Failed to set parameters</translation>
+      <translation>パラメータの設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="344"/>
       <source>Invalid baud rate value</source>
-      <translation type="unfinished">Invalid baud rate value</translation>
+      <translation>伝送速度の値が無効です</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="350"/>
       <source>Custom baud rate direction is unsupported</source>
-      <translation type="unfinished">Custom baud rate direction is unsupported</translation>
+      <translation>カスタム伝送速度の方向設定には対応していません</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="357"/>
       <source>Invalid Baud Rate</source>
-      <translation type="unfinished">Invalid Baud Rate</translation>
+      <translation>無効な伝送速度</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="366"/>
       <source>Failed to set baud rate</source>
-      <translation type="unfinished">Failed to set baud rate</translation>
+      <translation>伝送速度の設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="395"/>
       <source>Failed to set data bits</source>
-      <translation type="unfinished">Failed to set data bits</translation>
+      <translation>データビットの設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="425"/>
       <source>Failed to set parity</source>
-      <translation type="unfinished">Failed to set parity</translation>
+      <translation>パリティ設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="451"/>
       <source>Failed to set StopBits</source>
-      <translation type="unfinished">Failed to set StopBits</translation>
+      <translation>ストップビットの設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="477"/>
       <source>Failed to set Flow Control</source>
-      <translation type="unfinished">Failed to set Flow Control</translation>
+      <translation>フロー制御の設定に失敗しました</translation>
     </message>
     <message>
       <location filename="../src/Android/qtandroidserialport/qserialport_android.cpp" line="487"/>
       <source>Failed to set Break Enabled</source>
-      <translation type="unfinished">Failed to set Break Enabled</translation>
+      <translation>ブレーク有効の設定に失敗しました</translation>
     </message>
   </context>
   <context>
@@ -14526,7 +14526,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/UI/toolbar/RCRSSIIndicator.qml" line="42"/>
       <source>RSSI</source>
-      <translation type="unfinished">RSSI</translation>
+      <translation>RSSI</translation>
     </message>
   </context>
   <context>
@@ -14539,7 +14539,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="41"/>
       <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation>送信機チャンネルをパラメータ値にバインドします。チューニングIDは送信機設定ページから送信機チャンネルにマッピングすることができます。</translation>
+      <translation>送信機チャンネルをパラメータ値に割り当てします。チューニングIDは送信機設定ページから送信機チャンネルにマッピングすることができます。</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="47"/>
@@ -14618,12 +14618,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="392"/>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="393"/>
       <source>CRSF Bind</source>
-      <translation type="unfinished">CRSF Bind</translation>
+      <translation>CRSF バインド</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="394"/>
       <source>Click Ok to place your CRSF receiver in the bind mode.</source>
-      <translation type="unfinished">Click Ok to place your CRSF receiver in the bind mode.</translation>
+      <translation>OKをクリックし、CRSF受信機をバインドモードにします。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="402"/>
@@ -14739,7 +14739,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</source>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="60"/>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="387"/>
       <source>Spektrum Bind</source>
-      <translation>Spektrumバインド</translation>
+      <translation>Spektrum バインド</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="400"/>
@@ -14961,7 +14961,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="206"/>
       <source>OPERATOR ID</source>
-      <translation>オペレータ ID</translation>
+      <translation>オペレータID</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="232"/>
@@ -14986,37 +14986,37 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="335"/>
       <source>Arm Status Error</source>
-      <translation type="unfinished">Arm Status Error</translation>
+      <translation>アーム状態エラー</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="342"/>
       <source>Self ID</source>
-      <translation type="unfinished">Self ID</translation>
+      <translation>セルフID</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="343"/>
       <source>If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.</source>
-      <translation type="unfinished">If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.</translation>
+      <translation>緊急事態が宣言されると、ブロードキャスト設定が無効でも緊急通報テキストが配信されます。</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="349"/>
       <source>Broadcast</source>
-      <translation type="unfinished">Broadcast</translation>
+      <translation>ブロードキャスト</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="359"/>
       <source>Broadcast Message</source>
-      <translation type="unfinished">Broadcast Message</translation>
+      <translation>ブロードキャストメッセージ</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="412"/>
       <source>Remote ID</source>
-      <translation type="unfinished">Remote ID</translation>
+      <translation>リモートID</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="414"/>
       <source>Configure</source>
-      <translation type="unfinished">Configure</translation>
+      <translation>設定</translation>
     </message>
   </context>
   <context>
@@ -15049,53 +15049,53 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="235"/>
       <source>OPERATOR ID</source>
-      <translation>オペレータ ID</translation>
+      <translation>オペレータID</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="281"/>
       <source>Arm Status Error</source>
-      <translation type="unfinished">Arm Status Error</translation>
+      <translation>アーム状態エラー</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="289"/>
       <source>Basic ID</source>
-      <translation type="unfinished">Basic ID</translation>
+      <translation>ベーシックID</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="290"/>
       <source>If Basic ID is already set on the RID device, this will be registered as Basic ID 2</source>
-      <translation type="unfinished">If Basic ID is already set on the RID device, this will be registered as Basic ID 2</translation>
+      <translation>RIDデバイスにすでにベーシックIDが設定されている場合、これはベーシックID 2として登録されます。</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="298"/>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="422"/>
       <source>Broadcast</source>
-      <translation type="unfinished">Broadcast</translation>
+      <translation>ブロードキャスト</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="416"/>
       <source>If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.</source>
-      <translation type="unfinished">If an emergency is declared, Emergency Text will be broadcast even if Broadcast setting is not enabled.</translation>
+      <translation>緊急事態が宣言されると、ブロードキャスト設定が無効でも緊急通報テキストが配信されます。</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="432"/>
       <source>Broadcast Message</source>
-      <translation type="unfinished">Broadcast Message</translation>
+      <translation>ブロードキャストメッセージ</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="483"/>
       <source>GroundStation Location</source>
-      <translation type="unfinished">GroundStation Location</translation>
+      <translation>グランドステーションの場所</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="603"/>
       <source>EU Vehicle Info</source>
-      <translation type="unfinished">EU Vehicle Info</translation>
+      <translation>EU 機体情報</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="609"/>
       <source>Provide Information</source>
-      <translation type="unfinished">Provide Information</translation>
+      <translation>情報の提供</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="539"/>
@@ -15115,22 +15115,22 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="343"/>
       <source>Operator ID</source>
-      <translation>オペレータ ID</translation>
+      <translation>オペレータID</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="347"/>
       <source>Broadcast%1</source>
-      <translation type="unfinished">Broadcast%1</translation>
+      <translation>ブロードキャスト%1</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="372"/>
       <source> (%1)</source>
-      <translation type="unfinished"> (%1)</translation>
+      <translation> (%1)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="388"/>
       <source>Invalid Operator ID</source>
-      <translation type="unfinished">Invalid Operator ID</translation>
+      <translation>無効なオペレータID</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="415"/>
@@ -15211,72 +15211,72 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="41"/>
       <source>File is not a .shp file: %1</source>
-      <translation type="unfinished">File is not a .shp file: %1</translation>
+      <translation>ファイルは .shp形式ではありません: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="48"/>
       <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
+      <translation>ファイルが見つかりません: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="53"/>
       <source>PRJ file open failed: %1</source>
-      <translation type="unfinished">PRJ file open failed: %1</translation>
+      <translation>PRJファイルを開けませんでした: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="75"/>
       <source>UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</source>
-      <translation type="unfinished">UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</translation>
+      <translation>UTMプロジェクションはサポートされているフォーマットではありません。[&quot;WGS_1984_UTM_Zone_##N/S でなければなりません。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="78"/>
       <source>Only WGS84 or UTM projections are supported.</source>
-      <translation type="unfinished">Only WGS84 or UTM projections are supported.</translation>
+      <translation>WGS84またはUTM投影のみ対応しています</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="101"/>
       <source>SHPOpen failed.</source>
-      <translation type="unfinished">SHPOpen failed.</translation>
+      <translation>SHPファイルを開けませんでした。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="125"/>
       <source>More than one entity found.</source>
-      <translation type="unfinished">More than one entity found.</translation>
+      <translation>複数の対象が見つかりました</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="131"/>
       <source>No supported types found.</source>
-      <translation type="unfinished">No supported types found.</translation>
+      <translation>サポートされているタイプが見つかりません。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="161"/>
       <source>File does not contain a polygon.</source>
-      <translation type="unfinished">File does not contain a polygon.</translation>
+      <translation>ファイルにポリゴンが含まれていません。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="167"/>
       <source>Failed to read polygon object.</source>
-      <translation type="unfinished">Failed to read polygon object.</translation>
+      <translation>ポリゴンオブジェクトの読み込みに失敗しました。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="172"/>
       <source>Only single part polygons are supported.</source>
-      <translation type="unfinished">Only single part polygons are supported.</translation>
+      <translation>単一パートのポリゴンのみサポートされています。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="235"/>
       <source>File does not contain a polyline.</source>
-      <translation type="unfinished">File does not contain a polyline.</translation>
+      <translation>ファイルにポリラインが含まれていません。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="241"/>
       <source>Failed to read polyline object.</source>
-      <translation type="unfinished">Failed to read polyline object.</translation>
+      <translation>ポリラインオブジェクトの読み込みに失敗しました。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="246"/>
       <source>Only single part polylines are supported.</source>
-      <translation type="unfinished">Only single part polylines are supported.</translation>
+      <translation>単一パートのポリラインのみサポートされています。</translation>
     </message>
   </context>
   <context>
@@ -15894,14 +15894,14 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
-      <translation type="unfinished">Serial Link Error</translation>
+      <translation>シリアルリンクエラー</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
-      <translation type="unfinished">Link %1: (Port: %2) %3</translation>
+      <translation>リンク %1: (ポート: %2) %3</translation>
     </message>
   </context>
   <context>
@@ -15970,39 +15970,39 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
-      <translation type="unfinished">Not connecting to a bootloader</translation>
+      <translation>ブートローダーに接続していません</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
-      <translation type="unfinished">Could not open port: %1</translation>
+      <translation>ポートを開けませんでした: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
-      <translation type="unfinished">Data to Send is Empty</translation>
+      <translation>送信するデータが空です</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
-      <translation type="unfinished">Port is not Connected</translation>
+      <translation>ポートが接続されていません</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
-      <translation type="unfinished">Port is not Writable</translation>
+      <translation>ポートは書き込みできません</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
-      <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
+      <translation>データを送信できませんでした - 書き込みに失敗しました: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
-      <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
+      <translation>データを送信できません - 書き込み結果は 0 Byteでした</translation>
     </message>
   </context>
   <context>
@@ -16025,7 +16025,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/UI/AppSettings/SettingsPagesModel.qml" line="38"/>
       <source>Video</source>
-      <translation>ビデオ</translation>
+      <translation>動画</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SettingsPagesModel.qml" line="45"/>
@@ -16098,7 +16098,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="44"/>
       <source>%1 Config</source>
-      <translation type="unfinished">%1 Config</translation>
+      <translation>%1 設定</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="67"/>
@@ -16161,7 +16161,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="223"/>
       <source>Optical Flow</source>
-      <translation type="unfinished">Optical Flow</translation>
+      <translation>オプティカルフロー</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="233"/>
@@ -16189,17 +16189,17 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Utilities/Shape/ShapeFileHelper.cc" line="33"/>
       <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
-      <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
+      <translation>サポートされないファイルタイプです。サポートされているのは .%1 と .%2 だけです。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/ShapeFileHelper.cc" line="88"/>
       <source>KML Files (*.%1)</source>
-      <translation type="unfinished">KML Files (*.%1)</translation>
+      <translation>KMLファイル (*.%1)</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/ShapeFileHelper.cc" line="94"/>
       <source>KML/SHP Files (*.%1 *.%2)</source>
-      <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
+      <translation>KML / SHPファイル (*.%1 *.%2)</translation>
     </message>
   </context>
   <context>
@@ -16356,7 +16356,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/MAVLink/StatusTextHandler.cc" line="202"/>
       <source>Critical</source>
-      <translation>重大</translation>
+      <translation>限界 [Critical]</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/StatusTextHandler.cc" line="206"/>
@@ -16560,7 +16560,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
       <source>Move all control surfaces. Did they work properly?</source>
-      <translation>すべてのコントロールサーフェスを移動します。うまく動作しましたか？</translation>
+      <translation>すべてのコントロールサーフェスを稼働させます。うまく動作しましたか？</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
@@ -16751,12 +16751,12 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="296"/>
       <source>TCP Link Error</source>
-      <translation type="unfinished">TCP Link Error</translation>
+      <translation>TCPリンクエラー</translation>
     </message>
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="296"/>
       <source>Link %1: (Host: %2 Port: %3) %4</source>
-      <translation type="unfinished">Link %1: (Host: %2 Port: %3) %4</translation>
+      <translation>リンク %1: (ホスト: %2 ポート: %3) %4</translation>
     </message>
   </context>
   <context>
@@ -16764,27 +16764,27 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="142"/>
       <source>Connection Failed: %1</source>
-      <translation type="unfinished">Connection Failed: %1</translation>
+      <translation>接続に失敗しました: %1</translation>
     </message>
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="167"/>
       <source>Data to Send is Empty</source>
-      <translation type="unfinished">Data to Send is Empty</translation>
+      <translation>送信するデータが空です</translation>
     </message>
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="172"/>
       <source>Socket is not connected</source>
-      <translation type="unfinished">Socket is not connected</translation>
+      <translation>ソケットが接続されていません</translation>
     </message>
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="180"/>
       <source>Could Not Send Data - Write Failed: %1</source>
-      <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
+      <translation>データを送信できませんでした - 書き込みに失敗しました: %1</translation>
     </message>
     <message>
       <location filename="../src/Comms/TCPLink.cc" line="183"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
-      <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
+      <translation>データを送信できません - 書き込み結果は 0 Byteでした</translation>
     </message>
   </context>
   <context>
@@ -16885,7 +16885,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="41"/>
       <source>MAVLink System ID</source>
-      <translation type="unfinished">MAVLink System ID</translation>
+      <translation>MAVLink システムID</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="55"/>
@@ -17230,7 +17230,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="625"/>
       <source>Link %1: %2</source>
-      <translation type="unfinished">Link %1: %2</translation>
+      <translation>リンク %1: %2</translation>
     </message>
   </context>
   <context>
@@ -17238,42 +17238,42 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="340"/>
       <source>Failed to bind UDP socket to port</source>
-      <translation type="unfinished">Failed to bind UDP socket to port</translation>
+      <translation>UDPソケットをポートに割り当てできませんでした</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="380"/>
       <source>Could Not Send Data - Link is Disconnected!</source>
-      <translation type="unfinished">Could Not Send Data - Link is Disconnected!</translation>
+      <translation>データを送信できませんでした - リンクが切断されました！</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="426"/>
       <source>Could Not Read Data - Link is Disconnected!</source>
-      <translation type="unfinished">Could Not Read Data - Link is Disconnected!</translation>
+      <translation>データを読み取れませんでした - リンクが切断されました！</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="432"/>
       <source>Could Not Read Data - No Data Available!</source>
-      <translation type="unfinished">Could Not Read Data - No Data Available!</translation>
+      <translation>データを読み取れませんでした - 利用可能なデータがありません！</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="500"/>
       <source>Zeroconf Register Error: %1</source>
-      <translation type="unfinished">Zeroconf Register Error: %1</translation>
+      <translation>Zeroconf 登録エラー: %1</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="530"/>
       <source>Error Registering Zeroconf: %1</source>
-      <translation type="unfinished">Error Registering Zeroconf: %1</translation>
+      <translation>Zeroconfの登録エラー: %1</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="536"/>
       <source>Invalid sockfd</source>
-      <translation type="unfinished">Invalid sockfd</translation>
+      <translation>sockfd が無効です</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="544"/>
       <source>DNSServiceProcessResult Error: %1</source>
-      <translation type="unfinished">DNSServiceProcessResult Error: %1</translation>
+      <translation>DNSServiceProcessResult エラー: %1</translation>
     </message>
   </context>
   <context>
@@ -17298,7 +17298,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/UTMSP/UTMSPAdapterEditor.qml" line="163"/>
       <source>Logout</source>
-      <translation type="unfinished">Logout</translation>
+      <translation>ログアウト</translation>
     </message>
     <message>
       <location filename="../src/UTMSP/UTMSPAdapterEditor.qml" line="234"/>
@@ -17656,7 +17656,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
       <source>Move all control surfaces. Did they work properly?</source>
-      <translation>すべてのコントロールサーフェスを移動します。うまく動作しましたか？</translation>
+      <translation>すべてのコントロールサーフェスを稼働させます。うまく動作しましたか？</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
@@ -17864,7 +17864,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1062"/>
       <source>battery %1 level is critical</source>
-      <translation>バッテリー %1 重大レベル</translation>
+      <translation>バッテリー %1 限界レベル</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1068"/>
@@ -17914,12 +17914,12 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="4060"/>
       <source>Waiting for previous operator control request</source>
-      <translation type="unfinished">Waiting for previous operator control request</translation>
+      <translation>前回のオペレータ制御リクエスト処理中のため待機しています</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="4063"/>
       <source>No response to operator control request</source>
-      <translation type="unfinished">No response to operator control request</translation>
+      <translation>オペレータ制御リクエストに応答がありません</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2008"/>
@@ -17949,7 +17949,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2311"/>
       <source>Change Heading not supported by Vehicle.</source>
-      <translation type="unfinished">Change Heading not supported by Vehicle.</translation>
+      <translation>機体はヘッディング変更をサポートしていません。</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
@@ -18002,7 +18002,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="203"/>
       <source>Airship</source>
-      <translation>飛行艇</translation>
+      <translation>飛行船</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="205"/>
@@ -18103,12 +18103,12 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/QmlControls/VehicleMessageList.qml" line="28"/>
       <source>No Messages</source>
-      <translation type="unfinished">No Messages</translation>
+      <translation>メッセージはありません</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VehicleMessageList.qml" line="76"/>
       <source>Edit Parameter</source>
-      <translation type="unfinished">Edit Parameter</translation>
+      <translation>パラメータを編集</translation>
     </message>
   </context>
   <context>
@@ -18213,7 +18213,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/VideoManager/VideoManager.cc" line="178"/>
       <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation>ビデオ録画できませんでした。ビデオ保存パスは設定で指定する必要があります。</translation>
+      <translation>録画できませんでした。動画の保存パスは設定で指定する必要があります。</translation>
     </message>
   </context>
   <context>
@@ -18221,12 +18221,12 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="55"/>
       <source>No Video Available</source>
-      <translation>利用可能なビデオはありません</translation>
+      <translation>利用可能な動画はありません</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="56"/>
       <source>Video Stream Disabled</source>
-      <translation>ビデオストリームは無効です</translation>
+      <translation>ビデオストリーム 無効</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="57"/>
@@ -18251,7 +18251,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="61"/>
       <source>MPEG-TS Video Stream</source>
-      <translation type="unfinished">MPEG-TS Video Stream</translation>
+      <translation>MPEG-TS Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="62"/>
@@ -18311,7 +18311,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/UI/AppSettings/VideoSettings.qml" line="77"/>
       <source>UDP URL</source>
-      <translation type="unfinished">UDP URL</translation>
+      <translation>UDP URL</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/VideoSettings.qml" line="85"/>
@@ -18336,7 +18336,7 @@ ROTATION_NONEは、コンポーネントが飛行方向を向いていること
     <message>
       <location filename="../src/UI/AppSettings/VideoSettings.qml" line="111"/>
       <source>Video decode priority</source>
-      <translation>ビデオデコード優先度</translation>
+      <translation>動画デコード優先度</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/VideoSettings.qml" line="120"/>
diff --git a/translations/qgc_source_ko_KR.ts b/translations/qgc_source_ko_KR.ts
index 39f0d34e9d06..72e821345463 100644
--- a/translations/qgc_source_ko_KR.ts
+++ b/translations/qgc_source_ko_KR.ts
@@ -586,7 +586,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="857"/>
       <source>Unable to pause vehicle.</source>
-      <translation>Unable to pause vehicle.</translation>
+      <translation type="unfinished">Unable to pause vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="933"/>
@@ -862,32 +862,32 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
       <source>Specify Offsets</source>
-      <translation>Specify Offsets</translation>
+      <translation type="unfinished">Specify Offsets</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
       <source>Point Vehicle</source>
-      <translation>Point Vehicle</translation>
+      <translation type="unfinished">Point Vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
       <source>Maintain current vehicle orientation</source>
-      <translation>Maintain current vehicle orientation</translation>
+      <translation type="unfinished">Maintain current vehicle orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
       <source>Point at ground station location</source>
-      <translation>Point at ground station location</translation>
+      <translation type="unfinished">Point at ground station location</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
       <source>Same direction as ground station movement</source>
-      <translation>Same direction as ground station movement</translation>
+      <translation type="unfinished">Same direction as ground station movement</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
       <source>Vehicle Offsets</source>
-      <translation>Vehicle Offsets</translation>
+      <translation type="unfinished">Vehicle Offsets</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
@@ -1068,7 +1068,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="419"/>
       <source>* Stabilize Collective Curve *</source>
-      <translation>* Stabilize Collective Curve *</translation>
+      <translation type="unfinished">* Stabilize Collective Curve *</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
@@ -1078,7 +1078,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="434"/>
       <source>* Tail &amp; Gyros *</source>
-      <translation>* Tail &amp; Gyros *</translation>
+      <translation type="unfinished">* Tail &amp; Gyros *</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.h" line="33"/>
@@ -1575,7 +1575,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="515"/>
       <source>Amps Offset:</source>
-      <translation>Amps Offset:</translation>
+      <translation type="unfinished">Amps Offset:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="530"/>
@@ -2293,7 +2293,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
       <source>Logic when Dry:</source>
-      <translation>Logic when Dry:</translation>
+      <translation type="unfinished">Logic when Dry:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
@@ -2328,7 +2328,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="267"/>
       <source>Timeout:</source>
-      <translation>Timeout:</translation>
+      <translation type="unfinished">Timeout:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="290"/>
@@ -2915,12 +2915,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="494"/>
       <source>Magnetic Declination</source>
-      <translation>Magnetic Declination</translation>
+      <translation type="unfinished">Magnetic Declination</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="506"/>
       <source>Manual Magnetic Declination</source>
-      <translation>Manual Magnetic Declination</translation>
+      <translation type="unfinished">Manual Magnetic Declination</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="528"/>
@@ -3296,12 +3296,12 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.h" line="24"/>
       <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
+      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="202"/>
       <source>Frame selection</source>
-      <translation>Frame selection</translation>
+      <translation type="unfinished">Frame selection</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="211"/>
@@ -3316,17 +3316,17 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="218"/>
       <source>Yes, Load default parameter set for %1</source>
-      <translation>Yes, Load default parameter set for %1</translation>
+      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="231"/>
       <source>No, set frame only</source>
-      <translation>No, set frame only</translation>
+      <translation type="unfinished">No, set frame only</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="232"/>
       <source>Confirm frame %1</source>
-      <translation>Confirm frame %1</translation>
+      <translation type="unfinished">Confirm frame %1</translation>
     </message>
   </context>
   <context>
@@ -3447,7 +3447,7 @@ Blue Robotics 추진기는 물로 윤활되고 대기에서 작동하도록 설
       <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>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
+      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
 Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
     </message>
   </context>
@@ -4007,17 +4007,17 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
       <source>Select Altitude Mode</source>
-      <translation>Select Altitude Mode</translation>
+      <translation type="unfinished">Select Altitude Mode</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="51"/>
       <source>Relative To Launch</source>
-      <translation>Relative To Launch</translation>
+      <translation type="unfinished">Relative To Launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
       <source>Specified altitudes are relative to launch position height.</source>
-      <translation>Specified altitudes are relative to launch position height.</translation>
+      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="56"/>
@@ -4027,95 +4027,95 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
       <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation>Specified altitudes are Above Mean Sea Level.</translation>
+      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="61"/>
       <source>Calculated Above Terrain</source>
-      <translation>Calculated Above Terrain</translation>
+      <translation type="unfinished">Calculated Above Terrain</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
       <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
+      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="66"/>
       <source>Terrain Frame</source>
-      <translation>Terrain Frame</translation>
+      <translation type="unfinished">Terrain Frame</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
       <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
+      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="71"/>
       <source>Mixed Modes</source>
-      <translation>Mixed Modes</translation>
+      <translation type="unfinished">Mixed Modes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="72"/>
       <source>The altitude mode can differ for each individual item.</source>
-      <translation>The altitude mode can differ for each individual item.</translation>
+      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
-      <translation>GStreamer 디버그 레벨</translation>
+      <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
-      <translation>로깅 카테고리</translation>
+      <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
-      <translation>검색:</translation>
+      <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
-      <translation>지우기</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
-      <translation>모두 지우기</translation>
+      <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
-      <translation>로그 파일 (*.txt)</translation>
+      <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
-      <translation>모든 파일 (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
-      <translation>로그 저장파일 선택</translation>
+      <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
-      <translation>응용프로그램 로그 저장</translation>
+      <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
-      <translation>최신 보기</translation>
+      <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
-      <translation>로그 설정</translation>
+      <translation type="unfinished">Set Logging</translation>
     </message>
   </context>
   <context>
@@ -4173,7 +4173,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="204"/>
       <source> (Partial)</source>
-      <translation> (Partial)</translation>
+      <translation type="unfinished"> (Partial)</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="212"/>
@@ -4225,72 +4225,72 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="31"/>
       <source>Autotune: In progress</source>
-      <translation>Autotune: In progress</translation>
+      <translation type="unfinished">Autotune: In progress</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="85"/>
       <source>Autotune: initializing</source>
-      <translation>Autotune: initializing</translation>
+      <translation type="unfinished">Autotune: initializing</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="88"/>
       <source>Autotune: roll</source>
-      <translation>Autotune: roll</translation>
+      <translation type="unfinished">Autotune: roll</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="91"/>
       <source>Autotune: pitch</source>
-      <translation>Autotune: pitch</translation>
+      <translation type="unfinished">Autotune: pitch</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="94"/>
       <source>Autotune: yaw</source>
-      <translation>Autotune: yaw</translation>
+      <translation type="unfinished">Autotune: yaw</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="97"/>
       <source>Wait for disarm</source>
-      <translation>Wait for disarm</translation>
+      <translation type="unfinished">Wait for disarm</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="100"/>
       <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation>Land and disarm the vehicle in order to apply the parameters.</translation>
+      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
       <source>Autotune: in progress</source>
-      <translation>Autotune: in progress</translation>
+      <translation type="unfinished">Autotune: in progress</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="112"/>
       <source>Autotune: Success</source>
-      <translation>Autotune: Success</translation>
+      <translation type="unfinished">Autotune: Success</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="114"/>
       <source>Autotune successful.</source>
-      <translation>Autotune successful.</translation>
+      <translation type="unfinished">Autotune successful.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
       <source>Autotune: Unknown error</source>
-      <translation>Autotune: Unknown error</translation>
+      <translation type="unfinished">Autotune: Unknown error</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="129"/>
       <source>Autotune: Failed</source>
-      <translation>Autotune: Failed</translation>
+      <translation type="unfinished">Autotune: Failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="139"/>
       <source>Autotune: Ack error %1</source>
-      <translation>Autotune: Ack error %1</translation>
+      <translation type="unfinished">Autotune: Ack error %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.h" line="56"/>
       <source>Autotune: Not performed</source>
-      <translation>Autotune: Not performed</translation>
+      <translation type="unfinished">Autotune: Not performed</translation>
     </message>
   </context>
   <context>
@@ -4464,12 +4464,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="31"/>
       <source>Device</source>
-      <translation>Device</translation>
+      <translation type="unfinished">Device</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="37"/>
       <source>Address</source>
-      <translation>Address</translation>
+      <translation type="unfinished">Address</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="44"/>
@@ -4631,7 +4631,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="94"/>
       <source>Unable to put radio into command mode +++</source>
-      <translation>Unable to put radio into command mode +++</translation>
+      <translation type="unfinished">Unable to put radio into command mode +++</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="99"/>
@@ -4641,12 +4641,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="107"/>
       <source>Radio did not respond to ATI2 command</source>
-      <translation>Radio did not respond to ATI2 command</translation>
+      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="114"/>
       <source>Radio did not return board id</source>
-      <translation>Radio did not return board id</translation>
+      <translation type="unfinished">Radio did not return board id</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="131"/>
@@ -4666,7 +4666,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="321"/>
       <source>Get Device: </source>
-      <translation>Get Device: </translation>
+      <translation type="unfinished">Get Device: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="749"/>
@@ -4877,7 +4877,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/ComponentInformation/CompInfoParam.cc" line="270"/>
       <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation>Internal Error: Parameter MetaData major must be 1</translation>
+      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
     </message>
   </context>
   <context>
@@ -4891,7 +4891,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/ComplexMissionItem.cc" line="65"/>
       <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation>&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
+      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
     </message>
   </context>
   <context>
@@ -4947,7 +4947,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="16"/>
       <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation>Use the Polyline Tools to create the polyline which defines the corridor.</translation>
+      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="54"/>
@@ -5113,7 +5113,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
       <source>Generic Initial checks</source>
-      <translation>Generic Initial checks</translation>
+      <translation type="unfinished">Generic Initial checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
@@ -5466,7 +5466,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="286"/>
       <source>Invalid Nak format</source>
-      <translation>Invalid Nak format</translation>
+      <translation type="unfinished">Invalid Nak format</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="288"/>
@@ -5578,7 +5578,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="70"/>
       <source>Use loiter to altitude</source>
-      <translation>Use loiter to altitude</translation>
+      <translation type="unfinished">Use loiter to altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="181"/>
@@ -6147,7 +6147,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="399"/>
       <source>Follow the forums actively when using it.</source>
-      <translation>Follow the forums actively when using it.</translation>
+      <translation type="unfinished">Follow the forums actively when using it.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="425"/>
@@ -6336,7 +6336,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
       <source>Fixed Wing Landing</source>
-      <translation>Fixed Wing Landing</translation>
+      <translation type="unfinished">Fixed Wing Landing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="100"/>
@@ -6484,7 +6484,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="592"/>
       <source>ROI here</source>
       <comment>Make this a Region Of Interest</comment>
-      <translation>ROI here</translation>
+      <translation type="unfinished">ROI here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="619"/>
@@ -7399,7 +7399,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="22"/>
       <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
+      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="64"/>
@@ -7517,7 +7517,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="214"/>
       <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation>Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
+      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
     </message>
   </context>
   <context>
@@ -7842,7 +7842,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
       <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation>WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
+      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
@@ -7957,7 +7957,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="92"/>
       <source>Make the specified location a Region Of Interest.</source>
-      <translation>Make the specified location a Region Of Interest.</translation>
+      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="93"/>
@@ -7982,7 +7982,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="221"/>
       <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
+      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="232"/>
@@ -8089,7 +8089,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
       <source>Valuec requires a connected vehicle for setup.</source>
-      <translation>Valuec requires a connected vehicle for setup.</translation>
+      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="102"/>
@@ -8156,7 +8156,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="293"/>
       <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>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
+      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="374"/>
@@ -8168,12 +8168,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="406"/>
       <source>Specify the icon you want to display based on value ranges.</source>
-      <translation>Specify the icon you want to display based on value ranges.</translation>
+      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="511"/>
       <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation>Specify the icon opacity you want based on value ranges.</translation>
+      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="581"/>
@@ -8209,7 +8209,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Joystick/Joystick.h" line="340"/>
       <source>Toggle Arm</source>
-      <translation>Toggle Arm</translation>
+      <translation type="unfinished">Toggle Arm</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="341"/>
@@ -8224,22 +8224,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Joystick/Joystick.h" line="343"/>
       <source>Continuous Zoom In</source>
-      <translation>Continuous Zoom In</translation>
+      <translation type="unfinished">Continuous Zoom In</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="344"/>
       <source>Continuous Zoom Out</source>
-      <translation>Continuous Zoom Out</translation>
+      <translation type="unfinished">Continuous Zoom Out</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="345"/>
       <source>Step Zoom In</source>
-      <translation>Step Zoom In</translation>
+      <translation type="unfinished">Step Zoom In</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="346"/>
       <source>Step Zoom Out</source>
-      <translation>Step Zoom Out</translation>
+      <translation type="unfinished">Step Zoom Out</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="351"/>
@@ -8366,8 +8366,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation>버튼 할당</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -8410,7 +8410,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
       <source>Enable further advanced settings (careful!)</source>
-      <translation>Enable further advanced settings (careful!)</translation>
+      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
@@ -8489,7 +8489,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="264"/>
       <source>No firmware support</source>
-      <translation>No firmware support</translation>
+      <translation type="unfinished">No firmware support</translation>
     </message>
   </context>
   <context>
@@ -9155,12 +9155,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="274"/>
       <source>Absolute pressure</source>
-      <translation>Absolute pressure</translation>
+      <translation type="unfinished">Absolute pressure</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="275"/>
       <source>Differential pressure</source>
-      <translation>Differential pressure</translation>
+      <translation type="unfinished">Differential pressure</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="276"/>
@@ -9175,22 +9175,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="278"/>
       <source>Computer vision position</source>
-      <translation>Computer vision position</translation>
+      <translation type="unfinished">Computer vision position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="279"/>
       <source>Laser based position</source>
-      <translation>Laser based position</translation>
+      <translation type="unfinished">Laser based position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="280"/>
       <source>External ground truth</source>
-      <translation>External ground truth</translation>
+      <translation type="unfinished">External ground truth</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="281"/>
       <source>Angular rate control</source>
-      <translation>Angular rate control</translation>
+      <translation type="unfinished">Angular rate control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="282"/>
@@ -9255,7 +9255,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="294"/>
       <source>Motors reversed</source>
-      <translation>Motors reversed</translation>
+      <translation type="unfinished">Motors reversed</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="295"/>
@@ -9270,7 +9270,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="297"/>
       <source>Proximity</source>
-      <translation>Proximity</translation>
+      <translation type="unfinished">Proximity</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="298"/>
@@ -9548,7 +9548,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="256"/>
       <source>Plot 2</source>
-      <translation>Plot 2</translation>
+      <translation type="unfinished">Plot 2</translation>
     </message>
   </context>
   <context>
@@ -9599,12 +9599,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="153"/>
       <source>FW(vtol)</source>
-      <translation>FW(vtol)</translation>
+      <translation type="unfinished">FW(vtol)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="153"/>
       <source>MR(vtol)</source>
-      <translation>MR(vtol)</translation>
+      <translation type="unfinished">MR(vtol)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="228"/>
@@ -10261,7 +10261,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="220"/>
       <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
+      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="225"/>
@@ -10507,7 +10507,7 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="50"/>
       <source>Warning: Unable to determine motor count</source>
-      <translation>Warning: Unable to determine motor count</translation>
+      <translation type="unfinished">Warning: Unable to determine motor count</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="63"/>
@@ -10560,7 +10560,7 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
       <source>Multirotor Initial Checks</source>
-      <translation>Multirotor Initial Checks</translation>
+      <translation type="unfinished">Multirotor Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
@@ -10570,7 +10570,7 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
       <source>Props mounted and secured?</source>
-      <translation>Props mounted and secured?</translation>
+      <translation type="unfinished">Props mounted and secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
@@ -10620,7 +10620,7 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
       <source>OK for your platform?</source>
-      <translation>OK for your platform?</translation>
+      <translation type="unfinished">OK for your platform?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
@@ -10854,7 +10854,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
       <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
+      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
@@ -10880,7 +10880,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="334"/>
       <source>Select Tuning:</source>
-      <translation>Select Tuning:</translation>
+      <translation type="unfinished">Select Tuning:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="360"/>
@@ -11089,7 +11089,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="481"/>
       <source>Unable to pause vehicle.</source>
-      <translation>Unable to pause vehicle.</translation>
+      <translation type="unfinished">Unable to pause vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="490"/>
@@ -11170,12 +11170,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
       <source>Flight Behavior</source>
-      <translation>Flight Behavior</translation>
+      <translation type="unfinished">Flight Behavior</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
       <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation>Flight Behavior is used to configure flight characteristics.</translation>
+      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
     </message>
   </context>
   <context>
@@ -11183,17 +11183,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
       <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
+      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
       <source>Responsiveness</source>
-      <translation>Responsiveness</translation>
+      <translation type="unfinished">Responsiveness</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
       <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
+      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="80"/>
@@ -11203,22 +11203,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
       <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
+      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
       <source>Horizontal velocity (m/s)</source>
-      <translation>Horizontal velocity (m/s)</translation>
+      <translation type="unfinished">Horizontal velocity (m/s)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
       <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation>Limit the horizonal velocity (applies to all modes).</translation>
+      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
       <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
+      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
@@ -11228,17 +11228,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
       <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation>Limit the vertical velocity (applies to all modes).</translation>
+      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
       <source>Mission Turning Radius</source>
-      <translation>Mission Turning Radius</translation>
+      <translation type="unfinished">Mission Turning Radius</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
       <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
+      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
     </message>
   </context>
   <context>
@@ -11608,7 +11608,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
       <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation>Tuning Setup is used to tune the flight controllers.</translation>
+      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
     </message>
   </context>
   <context>
@@ -11616,22 +11616,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="22"/>
       <source>Rate Controller</source>
-      <translation>Rate Controller</translation>
+      <translation type="unfinished">Rate Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="26"/>
       <source>Attitude Controller</source>
-      <translation>Attitude Controller</translation>
+      <translation type="unfinished">Attitude Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="30"/>
       <source>Velocity Controller</source>
-      <translation>Velocity Controller</translation>
+      <translation type="unfinished">Velocity Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
       <source>Position Controller</source>
-      <translation>Position Controller</translation>
+      <translation type="unfinished">Position Controller</translation>
     </message>
   </context>
   <context>
@@ -11644,13 +11644,13 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="38"/>
       <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation>Proportional Gain (MC_ROLL_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="39"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="56"/>
       <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation>Increase for more responsiveness, reduce if the attitude overshoots.</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="48"/>
@@ -11660,7 +11660,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="55"/>
       <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation>Proportional Gain (MC_PITCH_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="65"/>
@@ -11670,12 +11670,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="72"/>
       <source>Proportional Gain (MC_YAW_P)</source>
-      <translation>Proportional Gain (MC_YAW_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="73"/>
       <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
     </message>
   </context>
   <context>
@@ -11683,38 +11683,38 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
       <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation>Position control mode (set this to &apos;simple&apos; during tuning):</translation>
+      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="46"/>
       <source>Horizontal</source>
-      <translation>Horizontal</translation>
+      <translation type="unfinished">Horizontal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="47"/>
       <source>Horizontal (Y direction, sidewards)</source>
-      <translation>Horizontal (Y direction, sidewards)</translation>
+      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="54"/>
       <source>Proportional gain (MPC_XY_P)</source>
-      <translation>Proportional gain (MPC_XY_P)</translation>
+      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="55"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="72"/>
       <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="64"/>
       <source>Vertical</source>
-      <translation>Vertical</translation>
+      <translation type="unfinished">Vertical</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="71"/>
       <source>Proportional gain (MPC_Z_P)</source>
-      <translation>Proportional gain (MPC_Z_P)</translation>
+      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
     </message>
   </context>
   <context>
@@ -11747,37 +11747,37 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="79"/>
       <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation>Overall Multiplier (MC_ROLLRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="146"/>
       <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
+      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="87"/>
       <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation>Differential Gain (MC_ROLLRATE_D)</translation>
+      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="88"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="121"/>
       <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
+      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="95"/>
       <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation>Integral Gain (MC_ROLLRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="96"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="129"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="154"/>
       <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation>Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
+      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
@@ -11787,17 +11787,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="112"/>
       <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation>Overall Multiplier (MC_PITCHRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="120"/>
       <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation>Differential Gain (MC_PITCHRATE_D)</translation>
+      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="128"/>
       <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation>Integral Gain (MC_PITCHRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
@@ -11807,12 +11807,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="145"/>
       <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation>Overall Multiplier (MC_YAWRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="153"/>
       <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation>Integral Gain (MC_YAWRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
     </message>
   </context>
   <context>
@@ -11820,74 +11820,74 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
       <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation>Position control mode (set this to &apos;simple&apos; during tuning):</translation>
+      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="46"/>
       <source>Horizontal</source>
-      <translation>Horizontal</translation>
+      <translation type="unfinished">Horizontal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="47"/>
       <source>Horizontal (Y direction, sidewards)</source>
-      <translation>Horizontal (Y direction, sidewards)</translation>
+      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="54"/>
       <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation>Proportional gain (MPC_XY_VEL_P_ACC)</translation>
+      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="55"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="88"/>
       <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="62"/>
       <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation>Integral gain (MPC_XY_VEL_I_ACC)</translation>
+      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="63"/>
       <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation>Increase to reduce steady-state error (e.g. wind)</translation>
+      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="70"/>
       <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation>Differential gain (MPC_XY_VEL_D_ACC)</translation>
+      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="71"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="104"/>
       <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
+      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="80"/>
       <source>Vertical</source>
-      <translation>Vertical</translation>
+      <translation type="unfinished">Vertical</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="87"/>
       <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation>Proportional gain (MPC_Z_VEL_P_ACC)</translation>
+      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="95"/>
       <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation>Integral gain (MPC_Z_VEL_I_ACC)</translation>
+      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="96"/>
       <source>Increase to reduce steady-state error</source>
-      <translation>Increase to reduce steady-state error</translation>
+      <translation type="unfinished">Increase to reduce steady-state error</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="103"/>
       <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation>Differential gain (MPC_Z_VEL_D_ACC)</translation>
+      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
     </message>
   </context>
   <context>
@@ -12057,17 +12057,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="31"/>
       <source>Altitude &amp; Airspeed</source>
-      <translation>Altitude &amp; Airspeed</translation>
+      <translation type="unfinished">Altitude &amp; Airspeed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="40"/>
       <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation>Height rate feed forward (FW_T_HRATE_FF)</translation>
+      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="41"/>
       <source>TODO</source>
-      <translation>TODO</translation>
+      <translation type="unfinished">TODO</translation>
     </message>
   </context>
   <context>
@@ -12194,7 +12194,7 @@ Is this really what you want?</translation>
       <source>Select Reset to reset all parameters to their defaults.
 
 Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation>Select Reset to reset all parameters to their defaults.
+      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
 
 Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
     </message>
@@ -12327,13 +12327,13 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
       <location filename="../src/FactSystem/ParameterManager.cc" line="984"/>
       <source>Parameters not loaded since they are not currently on the vehicle: %1
 </source>
-      <translation>Parameters not loaded since they are not currently on the vehicle: %1
+      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
 </translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="988"/>
       <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation>Parameters not loaded due to type mismatch: %1</translation>
+      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="1133"/>
@@ -12406,7 +12406,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
       <source>Video Grid Lines</source>
-      <translation>Video Grid Lines</translation>
+      <translation type="unfinished">Video Grid Lines</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
@@ -12544,7 +12544,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="357"/>
       <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
+      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="515"/>
@@ -12650,7 +12650,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="793"/>
       <source>Not accepting any mission commands.</source>
-      <translation>Not accepting any mission commands.</translation>
+      <translation type="unfinished">Not accepting any mission commands.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="797"/>
@@ -12862,7 +12862,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="107"/>
       <source>Apply new altitude</source>
-      <translation>Apply new altitude</translation>
+      <translation type="unfinished">Apply new altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="118"/>
@@ -13756,7 +13756,7 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="146"/>
       <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation>Unabled to find writable download location. Tried downloads and temp directory.</translation>
+      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
     </message>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="156"/>
@@ -13963,12 +13963,12 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="51"/>
       <source>Polygon Tools</source>
-      <translation>Polygon Tools</translation>
+      <translation type="unfinished">Polygon Tools</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="52"/>
       <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
+      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="264"/>
@@ -14004,7 +14004,7 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="607"/>
       <source>Done Tracing</source>
-      <translation>Done Tracing</translation>
+      <translation type="unfinished">Done Tracing</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="607"/>
@@ -14027,7 +14027,7 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="41"/>
       <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
+      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="127"/>
@@ -14052,7 +14052,7 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="339"/>
       <source>Done Tracing</source>
-      <translation>Done Tracing</translation>
+      <translation type="unfinished">Done Tracing</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="339"/>
@@ -14241,7 +14241,7 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="341"/>
       <source>(CalcT)</source>
-      <translation>(CalcT)</translation>
+      <translation type="unfinished">(CalcT)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="361"/>
@@ -14251,12 +14251,12 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="363"/>
       <source>Calc Above Terrain</source>
-      <translation>Calc Above Terrain</translation>
+      <translation type="unfinished">Calc Above Terrain</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="367"/>
       <source>Mixed Modes</source>
-      <translation>Mixed Modes</translation>
+      <translation type="unfinished">Mixed Modes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="343"/>
@@ -14548,17 +14548,17 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="23"/>
       <source>RC To Param</source>
-      <translation>RC To Param</translation>
+      <translation type="unfinished">RC To Param</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="41"/>
       <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
+      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="47"/>
       <source>Waiting on parameter update from Vehicle.</source>
-      <translation>Waiting on parameter update from Vehicle.</translation>
+      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="58"/>
@@ -14593,7 +14593,7 @@ sudo apt-get remove modemmanager</translation>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="98"/>
       <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation>Double check that all values are correct prior to confirming dialog.</translation>
+      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
     </message>
   </context>
   <context>
@@ -15157,7 +15157,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
       <source>Rover Initial Checks</source>
-      <translation>Rover Initial Checks</translation>
+      <translation type="unfinished">Rover Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
@@ -15167,7 +15167,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
       <source>Battery mounted and secured?</source>
-      <translation>Battery mounted and secured?</translation>
+      <translation type="unfinished">Battery mounted and secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
@@ -15207,7 +15207,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
       <source>OK for your platform?</source>
-      <translation>OK for your platform?</translation>
+      <translation type="unfinished">OK for your platform?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
@@ -15333,7 +15333,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="135"/>
       <source>Object Detection</source>
-      <translation>Object Detection</translation>
+      <translation type="unfinished">Object Detection</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="163"/>
@@ -15367,7 +15367,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="236"/>
       <source>Show obstacle distance overlay</source>
-      <translation>Show obstacle distance overlay</translation>
+      <translation type="unfinished">Show obstacle distance overlay</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="247"/>
@@ -15412,17 +15412,17 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="421"/>
       <source>Return To Launch Settings</source>
-      <translation>Return To Launch Settings</translation>
+      <translation type="unfinished">Return To Launch Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="460"/>
       <source>Return to launch, then:</source>
-      <translation>Return to launch, then:</translation>
+      <translation type="unfinished">Return to launch, then:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="603"/>
       <source>Telemetry logging to vehicle storage:</source>
-      <translation>Telemetry logging to vehicle storage:</translation>
+      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="449"/>
@@ -15768,7 +15768,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation>To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
+      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="290"/>
@@ -15779,7 +15779,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="300"/>
       <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation>ROTATION_NONE indicates component points in direction of flight.</translation>
+      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="306"/>
@@ -15796,14 +15796,14 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <source>Adjust orientations as needed.
 
 ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation>Adjust orientations as needed.
+      <translation type="unfinished">Adjust orientations as needed.
 
 ROTATION_NONE indicates component points in direction of flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="367"/>
       <source>Mag %1 Orientation</source>
-      <translation>Mag %1 Orientation</translation>
+      <translation type="unfinished">Mag %1 Orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="395"/>
@@ -16221,7 +16221,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="75"/>
       <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation>Move &apos;%1&apos; %2 to the %3 location. %4</translation>
+      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="156"/>
@@ -16246,7 +16246,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="77"/>
       <source>Transition Direction</source>
-      <translation>Transition Direction</translation>
+      <translation type="unfinished">Transition Direction</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="77"/>
@@ -16261,17 +16261,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="78"/>
       <source>climbout</source>
-      <translation>climbout</translation>
+      <translation type="unfinished">climbout</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="79"/>
       <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation>Ensure distance from launch to transition direction is far enough to complete transition.</translation>
+      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="86"/>
       <source>Ensure clear of obstacles and into the wind.</source>
-      <translation>Ensure clear of obstacles and into the wind.</translation>
+      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="93"/>
@@ -16281,22 +16281,22 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="104"/>
       <source>Click in map to set planned Takeoff location.</source>
-      <translation>Click in map to set planned Takeoff location.</translation>
+      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="105"/>
       <source>Click in map to set planned Launch location.</source>
-      <translation>Click in map to set planned Launch location.</translation>
+      <translation type="unfinished">Click in map to set planned Launch location.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="128"/>
       <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
+      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="182"/>
       <source>Actual AMSL alt sent: %1 %2</source>
-      <translation>Actual AMSL alt sent: %1 %2</translation>
+      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="242"/>
@@ -16329,7 +16329,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="390"/>
       <source>Transition Direction</source>
-      <translation>Transition Direction</translation>
+      <translation type="unfinished">Transition Direction</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="392"/>
@@ -16344,7 +16344,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="400"/>
       <source>Loiter</source>
-      <translation>Loiter</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
   </context>
   <context>
@@ -16429,7 +16429,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="62"/>
       <source>Use the Polygon Tools to create the polygon which outlines the structure.</source>
-      <translation>Use the Polygon Tools to create the polygon which outlines the structure.</translation>
+      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="77"/>
@@ -16549,7 +16549,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
       <source>Submarine Initial checks</source>
-      <translation>Submarine Initial checks</translation>
+      <translation type="unfinished">Submarine Initial checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
@@ -16559,7 +16559,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
       <source>All seals in place?</source>
-      <translation>All seals in place?</translation>
+      <translation type="unfinished">All seals in place?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
@@ -16648,7 +16648,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="17"/>
       <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation>Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
+      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="18"/>
@@ -17090,7 +17090,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="35"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="91"/>
@@ -17110,12 +17110,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="103"/>
       <source>Spacing</source>
-      <translation>Spacing</translation>
+      <translation type="unfinished">Spacing</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="122"/>
       <source>Rotate Entry Point</source>
-      <translation>Rotate Entry Point</translation>
+      <translation type="unfinished">Rotate Entry Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="130"/>
@@ -17177,7 +17177,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="284"/>
       <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation>Preset name cannot include the &quot;/&quot; character.</translation>
+      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
     </message>
   </context>
   <context>
@@ -17517,7 +17517,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="88"/>
       <source>System of units</source>
-      <translation>System of units</translation>
+      <translation type="unfinished">System of units</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="101"/>
@@ -17527,7 +17527,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="101"/>
       <source>Imperial System</source>
-      <translation>Imperial System</translation>
+      <translation type="unfinished">Imperial System</translation>
     </message>
   </context>
   <context>
@@ -17645,7 +17645,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
       <source>VTOL Initial Checks</source>
-      <translation>VTOL Initial Checks</translation>
+      <translation type="unfinished">VTOL Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
@@ -17728,7 +17728,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="25"/>
       <source>VTOL Landing</source>
-      <translation>VTOL Landing</translation>
+      <translation type="unfinished">VTOL Landing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="92"/>
@@ -17756,7 +17756,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="70"/>
       <source>Use loiter to altitude</source>
-      <translation>Use loiter to altitude</translation>
+      <translation type="unfinished">Use loiter to altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="79"/>
@@ -17802,17 +17802,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="217"/>
       <source>* Actual flight path will vary.</source>
-      <translation>* Actual flight path will vary.</translation>
+      <translation type="unfinished">* Actual flight path will vary.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="226"/>
       <source>* Avoid tailwind on approach to land.</source>
-      <translation>* Avoid tailwind on approach to land.</translation>
+      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="235"/>
       <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation>* Ensure landing distance is enough to complete transition.</translation>
+      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="261"/>
@@ -17827,7 +17827,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="300"/>
       <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
+      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="304"/>
@@ -17973,12 +17973,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation>Internal error - MAV_COMP_ID_ALL not supported</translation>
+      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Waiting on previous response to same command.</source>
-      <translation>Waiting on previous response to same command.</translation>
+      <translation type="unfinished">Waiting on previous response to same command.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2719"/>
@@ -18016,7 +18016,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="203"/>
       <source>Airship</source>
-      <translation>Airship</translation>
+      <translation type="unfinished">Airship</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="205"/>
@@ -18059,7 +18059,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <source>%1Communication regained on %2 link</source>
-      <translation>%1Communication regained on %2 link</translation>
+      <translation type="unfinished">%1Communication regained on %2 link</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
@@ -18081,17 +18081,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="83"/>
       <source>%1Switching communication to new primary link</source>
-      <translation>%1Switching communication to new primary link</translation>
+      <translation type="unfinished">%1Switching communication to new primary link</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>%1Communication lost on %2 link.</source>
-      <translation>%1Communication lost on %2 link.</translation>
+      <translation type="unfinished">%1Communication lost on %2 link.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="142"/>
       <source>%1Switching communication to secondary link.</source>
-      <translation>%1Switching communication to secondary link.</translation>
+      <translation type="unfinished">%1Switching communication to secondary link.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="166"/>
diff --git a/translations/qgc_source_nl_NL.ts b/translations/qgc_source_nl_NL.ts
index 9303fad27f9e..63bb481be8a9 100644
--- a/translations/qgc_source_nl_NL.ts
+++ b/translations/qgc_source_nl_NL.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_nb_NO.ts b/translations/qgc_source_no_NO.ts
similarity index 99%
rename from translations/qgc_source_nb_NO.ts
rename to translations/qgc_source_no_NO.ts
index a767115dcf61..9af237405a57 100644
--- a/translations/qgc_source_nb_NO.ts
+++ b/translations/qgc_source_no_NO.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="nb" sourcelanguage="en">
+<TS version="2.1" language="no" sourcelanguage="en">
   <context>
     <name>APMAirframeComponent</name>
     <message>
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_pl_PL.ts b/translations/qgc_source_pl_PL.ts
index e70c6e050dbf..e2eba72bf4c9 100644
--- a/translations/qgc_source_pl_PL.ts
+++ b/translations/qgc_source_pl_PL.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_pt_PT.ts b/translations/qgc_source_pt_PT.ts
index 016171f27488..177dfe7e6269 100644
--- a/translations/qgc_source_pt_PT.ts
+++ b/translations/qgc_source_pt_PT.ts
@@ -3739,57 +3739,57 @@ Por favor coloque seu veículo na água, clique no botão, e espere. Note que os
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4056,61 +4056,61 @@ Por favor coloque seu veículo na água, clique no botão, e espere. Note que os
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
-      <translation>Nível Debug GStreamer</translation>
+      <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
-      <translation>Categorias de registros</translation>
+      <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
-      <translation>Buscar:</translation>
+      <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
-      <translation>Limpar</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
-      <translation>Limpar Tudo</translation>
+      <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
-      <translation>Arquivos de registros (*. txt)</translation>
+      <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
-      <translation>Todos os Arquivos (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
-      <translation>Selecione arquivo para salvar registro</translation>
+      <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
-      <translation>Salvar registros do aplicativo</translation>
+      <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
-      <translation>Mostrar mais recentes</translation>
+      <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
-      <translation>Definir registros</translation>
+      <translation type="unfinished">Set Logging</translation>
     </message>
   </context>
   <context>
@@ -8360,8 +8360,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation>Atribuição de botão</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9742,87 +9742,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11494,12 +11494,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation>Ativado</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation>Desativado</translation>
     </message>
@@ -11716,13 +11716,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15898,12 +15898,12 @@ ROTATION_NONE indica que o componente aponta na direção do voo.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15974,37 +15974,37 @@ ROTATION_NONE indica que o componente aponta na direção do voo.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_ru_RU.ts b/translations/qgc_source_ru_RU.ts
index 4eb0fcc7a925..7da5931f86da 100644
--- a/translations/qgc_source_ru_RU.ts
+++ b/translations/qgc_source_ru_RU.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_sv_SE.ts b/translations/qgc_source_sv_SE.ts
index 0f8becc50f71..0f936a481827 100644
--- a/translations/qgc_source_sv_SE.ts
+++ b/translations/qgc_source_sv_SE.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_tr_TR.ts b/translations/qgc_source_tr_TR.ts
index 355c22dcba45..39e250605f95 100644
--- a/translations/qgc_source_tr_TR.ts
+++ b/translations/qgc_source_tr_TR.ts
@@ -6,23 +6,23 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
       <source>Airframe is currently not set.</source>
-      <translation>Airframe is currently not set.</translation>
+      <translation type="unfinished">Airframe is currently not set.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
       <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation>Currently set to frame class &apos;%1&apos;</translation>
+      <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
       <source> and frame type &apos;%2&apos;</source>
-      <translation> and frame type &apos;%2&apos;</translation>
+      <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="74"/>
       <source>.</source>
       <comment>period for end of sentence</comment>
-      <translation>.</translation>
+      <translation type="unfinished">.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
@@ -32,22 +32,22 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
       <source>Frame Type</source>
-      <translation>Frame Type</translation>
+      <translation type="unfinished">Frame Type</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
       <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
-      <translation>Invalid setting for FRAME_TYPE. Click to Reset.</translation>
+      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.h" line="35"/>
       <source>Frame</source>
-      <translation>Frame</translation>
+      <translation type="unfinished">Frame</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.h" line="26"/>
       <source>Frame Setup is used to select the airframe which matches your vehicle.</source>
-      <translation>Frame Setup is used to select the airframe which matches your vehicle.</translation>
+      <translation type="unfinished">Frame Setup is used to select the airframe which matches your vehicle.</translation>
     </message>
   </context>
   <context>
@@ -55,12 +55,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="145"/>
       <source>Param file github json download failed: %1</source>
-      <translation>Param file github json download failed: %1</translation>
+      <translation type="unfinished">Param file github json download failed: %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="155"/>
       <source>Param file download failed: %1</source>
-      <translation>Param file download failed: %1</translation>
+      <translation type="unfinished">Param file download failed: %1</translation>
     </message>
   </context>
   <context>
@@ -68,22 +68,22 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
       <source>Frame Class</source>
-      <translation>Frame Class</translation>
+      <translation type="unfinished">Frame Class</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
       <source>Frame Type</source>
-      <translation>Frame Type</translation>
+      <translation type="unfinished">Frame Type</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
       <source>Firmware Version</source>
-      <translation>Firmware Version</translation>
+      <translation type="unfinished">Firmware Version</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
   </context>
   <context>
@@ -91,7 +91,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="220"/>
       <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>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
+      <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
     </message>
   </context>
   <context>
@@ -135,104 +135,104 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
       <source>Channel </source>
-      <translation>Channel </translation>
+      <translation type="unfinished">Channel </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="225"/>
       <source>Gimbal </source>
-      <translation>Gimbal </translation>
+      <translation type="unfinished">Gimbal </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="243"/>
       <source>Stabilize</source>
-      <translation>Stabilize</translation>
+      <translation type="unfinished">Stabilize</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="255"/>
       <source>Servo reverse</source>
-      <translation>Servo reverse</translation>
+      <translation type="unfinished">Servo reverse</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="269"/>
       <source>Output channel:</source>
-      <translation>Output channel:</translation>
+      <translation type="unfinished">Output channel:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="290"/>
       <source>Input channel:</source>
-      <translation>Input channel:</translation>
+      <translation type="unfinished">Input channel:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="310"/>
       <source>Gimbal angle limits:</source>
-      <translation>Gimbal angle limits:</translation>
+      <translation type="unfinished">Gimbal angle limits:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="319"/>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="363"/>
       <source>min</source>
-      <translation>min</translation>
+      <translation type="unfinished">min</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="337"/>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="382"/>
       <source>max</source>
-      <translation>max</translation>
+      <translation type="unfinished">max</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="355"/>
       <source>Servo PWM limits:</source>
-      <translation>Servo PWM limits:</translation>
+      <translation type="unfinished">Servo PWM limits:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="410"/>
       <source>Gimbal Settings</source>
-      <translation>Gimbal Settings</translation>
+      <translation type="unfinished">Gimbal Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="427"/>
       <source>Type:</source>
-      <translation>Type:</translation>
+      <translation type="unfinished">Type:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="449"/>
       <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation>Gimbal Type changes takes affect next reboot of autopilot</translation>
+      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="457"/>
       <source>Default Mode:</source>
-      <translation>Default Mode:</translation>
+      <translation type="unfinished">Default Mode:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="477"/>
       <source>Tilt</source>
-      <translation>Tilt</translation>
+      <translation type="unfinished">Tilt</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="495"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="513"/>
       <source>Pan</source>
-      <translation>Pan</translation>
+      <translation type="unfinished">Pan</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.h" line="32"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.h" line="24"/>
       <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation>Camera setup is used to adjust camera and gimbal settings.</translation>
+      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
     </message>
   </context>
   <context>
@@ -240,22 +240,22 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
       <source>Gimbal type</source>
-      <translation>Gimbal type</translation>
+      <translation type="unfinished">Gimbal type</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
       <source>Tilt input channel</source>
-      <translation>Tilt input channel</translation>
+      <translation type="unfinished">Tilt input channel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
       <source>Pan input channel</source>
-      <translation>Pan input channel</translation>
+      <translation type="unfinished">Pan input channel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
       <source>Roll input channel</source>
-      <translation>Roll input channel</translation>
+      <translation type="unfinished">Roll input channel</translation>
     </message>
   </context>
   <context>
@@ -263,57 +263,57 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
       <source>Channel 5</source>
-      <translation>Channel 5</translation>
+      <translation type="unfinished">Channel 5</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
       <source>Channel 6</source>
-      <translation>Channel 6</translation>
+      <translation type="unfinished">Channel 6</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
       <source>Channel 7</source>
-      <translation>Channel 7</translation>
+      <translation type="unfinished">Channel 7</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
       <source>Channel 8</source>
-      <translation>Channel 8</translation>
+      <translation type="unfinished">Channel 8</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
       <source>Channel 9</source>
-      <translation>Channel 9</translation>
+      <translation type="unfinished">Channel 9</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
       <source>Channel 10</source>
-      <translation>Channel 10</translation>
+      <translation type="unfinished">Channel 10</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
       <source>Channel 11</source>
-      <translation>Channel 11</translation>
+      <translation type="unfinished">Channel 11</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="194"/>
       <source>Channel 12</source>
-      <translation>Channel 12</translation>
+      <translation type="unfinished">Channel 12</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="195"/>
       <source>Channel 13</source>
-      <translation>Channel 13</translation>
+      <translation type="unfinished">Channel 13</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="196"/>
       <source>Channel 14</source>
-      <translation>Channel 14</translation>
+      <translation type="unfinished">Channel 14</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="197"/>
@@ -338,79 +338,79 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="290"/>
       <source>Gimbal </source>
-      <translation>Gimbal </translation>
+      <translation type="unfinished">Gimbal </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="323"/>
       <source>Output channel:</source>
-      <translation>Output channel:</translation>
+      <translation type="unfinished">Output channel:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="348"/>
       <source>Servo reverse</source>
-      <translation>Servo reverse</translation>
+      <translation type="unfinished">Servo reverse</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="358"/>
       <source>Stabilize</source>
-      <translation>Stabilize</translation>
+      <translation type="unfinished">Stabilize</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="376"/>
       <source>Servo PWM limits:</source>
-      <translation>Servo PWM limits:</translation>
+      <translation type="unfinished">Servo PWM limits:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="382"/>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="417"/>
       <source>min</source>
-      <translation>min</translation>
+      <translation type="unfinished">min</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="392"/>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="427"/>
       <source>max</source>
-      <translation>max</translation>
+      <translation type="unfinished">max</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="412"/>
       <source>Gimbal angle limits:</source>
-      <translation>Gimbal angle limits:</translation>
+      <translation type="unfinished">Gimbal angle limits:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="453"/>
       <source>Gimbal Settings</source>
-      <translation>Gimbal Settings</translation>
+      <translation type="unfinished">Gimbal Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="470"/>
       <source>Type:</source>
-      <translation>Type:</translation>
+      <translation type="unfinished">Type:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
       <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation>Gimbal Type changes takes affect next reboot of autopilot</translation>
+      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="500"/>
       <source>Default Mode:</source>
-      <translation>Default Mode:</translation>
+      <translation type="unfinished">Default Mode:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="521"/>
       <source>Tilt</source>
-      <translation>Tilt</translation>
+      <translation type="unfinished">Tilt</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="541"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="561"/>
       <source>Pan</source>
-      <translation>Pan</translation>
+      <translation type="unfinished">Pan</translation>
     </message>
   </context>
   <context>
@@ -574,17 +574,17 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="695"/>
       <source>Error during Solo video link setup: %1</source>
-      <translation>Error during Solo video link setup: %1</translation>
+      <translation type="unfinished">Error during Solo video link setup: %1</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="852"/>
       <source>Unable to change altitude, vehicle altitude not known.</source>
-      <translation>Unable to change altitude, vehicle altitude not known.</translation>
+      <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="857"/>
       <source>Unable to pause vehicle.</source>
-      <translation>Unable to pause vehicle.</translation>
+      <translation type="unfinished">Unable to pause vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="933"/>
@@ -594,22 +594,22 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="987"/>
       <source>Vehicle does not support guided takeoff</source>
-      <translation>Vehicle does not support guided takeoff</translation>
+      <translation type="unfinished">Vehicle does not support guided takeoff</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="993"/>
       <source>Unable to takeoff, vehicle position not known.</source>
-      <translation>Unable to takeoff, vehicle position not known.</translation>
+      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1003"/>
       <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
-      <translation>Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
+      <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1008"/>
       <source>Unable to takeoff: Vehicle failed to arm.</source>
-      <translation>Unable to takeoff: Vehicle failed to arm.</translation>
+      <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1026"/>
@@ -630,17 +630,17 @@
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1048"/>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1059"/>
       <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
-      <translation>Unable to start mission: Vehicle failed to change to Auto mode.</translation>
+      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1064"/>
       <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
-      <translation>Unable to start mission: Vehicle failed to change to Guided mode.</translation>
+      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="1070"/>
       <source>Unable to start mission: Vehicle failed to arm.</source>
-      <translation>Unable to start mission: Vehicle failed to arm.</translation>
+      <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
     </message>
   </context>
   <context>
@@ -671,12 +671,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
       <source>Flight Mode Settings</source>
-      <translation>Flight Mode Settings</translation>
+      <translation type="unfinished">Flight Mode Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
       <source> (Channel 5)</source>
-      <translation> (Channel 5)</translation>
+      <translation type="unfinished"> (Channel 5)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
@@ -751,7 +751,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
       <source>Switch Options</source>
-      <translation>Switch Options</translation>
+      <translation type="unfinished">Switch Options</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
@@ -766,7 +766,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.h" line="24"/>
       <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
+      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
     </message>
   </context>
   <context>
@@ -779,17 +779,17 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.h" line="72"/>
       <source>Simple</source>
-      <translation>Simple</translation>
+      <translation type="unfinished">Simple</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.h" line="72"/>
       <source>Super-Simple</source>
-      <translation>Super-Simple</translation>
+      <translation type="unfinished">Super-Simple</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.h" line="72"/>
       <source>Custom</source>
-      <translation>Custom</translation>
+      <translation type="unfinished">Custom</translation>
     </message>
   </context>
   <context>
@@ -797,32 +797,32 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
       <source>Flight Mode 1</source>
-      <translation>Flight Mode 1</translation>
+      <translation type="unfinished">Flight Mode 1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
       <source>Flight Mode 2</source>
-      <translation>Flight Mode 2</translation>
+      <translation type="unfinished">Flight Mode 2</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
       <source>Flight Mode 3</source>
-      <translation>Flight Mode 3</translation>
+      <translation type="unfinished">Flight Mode 3</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
       <source>Flight Mode 4</source>
-      <translation>Flight Mode 4</translation>
+      <translation type="unfinished">Flight Mode 4</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
       <source>Flight Mode 5</source>
-      <translation>Flight Mode 5</translation>
+      <translation type="unfinished">Flight Mode 5</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
       <source>Flight Mode 6</source>
-      <translation>Flight Mode 6</translation>
+      <translation type="unfinished">Flight Mode 6</translation>
     </message>
   </context>
   <context>
@@ -830,62 +830,62 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
       <source>Enable Follow Me</source>
-      <translation>Enable Follow Me</translation>
+      <translation type="unfinished">Enable Follow Me</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
       <source>Waiting for Vehicle to update</source>
-      <translation>Waiting for Vehicle to update</translation>
+      <translation type="unfinished">Waiting for Vehicle to update</translation>
     </message>
     <message>
       <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>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
+      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
       <source>Reset To Supported Settings</source>
-      <translation>Reset To Supported Settings</translation>
+      <translation type="unfinished">Reset To Supported Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
       <source>Vehicle Position</source>
-      <translation>Vehicle Position</translation>
+      <translation type="unfinished">Vehicle Position</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
       <source>Maintain Current Offsets</source>
-      <translation>Maintain Current Offsets</translation>
+      <translation type="unfinished">Maintain Current Offsets</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
       <source>Specify Offsets</source>
-      <translation>Specify Offsets</translation>
+      <translation type="unfinished">Specify Offsets</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
       <source>Point Vehicle</source>
-      <translation>Point Vehicle</translation>
+      <translation type="unfinished">Point Vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
       <source>Maintain current vehicle orientation</source>
-      <translation>Maintain current vehicle orientation</translation>
+      <translation type="unfinished">Maintain current vehicle orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
       <source>Point at ground station location</source>
-      <translation>Point at ground station location</translation>
+      <translation type="unfinished">Point at ground station location</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
       <source>Same direction as ground station movement</source>
-      <translation>Same direction as ground station movement</translation>
+      <translation type="unfinished">Same direction as ground station movement</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
       <source>Vehicle Offsets</source>
-      <translation>Vehicle Offsets</translation>
+      <translation type="unfinished">Vehicle Offsets</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
@@ -905,12 +905,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
       <source>Click in the graphic to change angle</source>
-      <translation>Click in the graphic to change angle</translation>
+      <translation type="unfinished">Click in the graphic to change angle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
       <source>L</source>
-      <translation>L</translation>
+      <translation type="unfinished">L</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.h" line="34"/>
@@ -971,102 +971,102 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="83"/>
       <source>Servo Setup</source>
-      <translation>Servo Setup</translation>
+      <translation type="unfinished">Servo Setup</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
       <source>Servo</source>
-      <translation>Servo</translation>
+      <translation type="unfinished">Servo</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
       <source>Function</source>
-      <translation>Function</translation>
+      <translation type="unfinished">Function</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="90"/>
       <source>Min</source>
-      <translation>Min</translation>
+      <translation type="unfinished">Min</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
       <source>Max</source>
-      <translation>Max</translation>
+      <translation type="unfinished">Max</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="92"/>
       <source>Trim</source>
-      <translation>Trim</translation>
+      <translation type="unfinished">Trim</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="93"/>
       <source>Reversed</source>
-      <translation>Reversed</translation>
+      <translation type="unfinished">Reversed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="95"/>
       <source>1</source>
-      <translation>1</translation>
+      <translation type="unfinished">1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="118"/>
       <source>2</source>
-      <translation>2</translation>
+      <translation type="unfinished">2</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="141"/>
       <source>3</source>
-      <translation>3</translation>
+      <translation type="unfinished">3</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="164"/>
       <source>4</source>
-      <translation>4</translation>
+      <translation type="unfinished">4</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="187"/>
       <source>5</source>
-      <translation>5</translation>
+      <translation type="unfinished">5</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="210"/>
       <source>6</source>
-      <translation>6</translation>
+      <translation type="unfinished">6</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="233"/>
       <source>7</source>
-      <translation>7</translation>
+      <translation type="unfinished">7</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="256"/>
       <source>8</source>
-      <translation>8</translation>
+      <translation type="unfinished">8</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="282"/>
       <source>Swashplate Setup</source>
-      <translation>Swashplate Setup</translation>
+      <translation type="unfinished">Swashplate Setup</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="341"/>
       <source>Throttle Settings</source>
-      <translation>Throttle Settings</translation>
+      <translation type="unfinished">Throttle Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="388"/>
       <source>Governor Settings</source>
-      <translation>Governor Settings</translation>
+      <translation type="unfinished">Governor Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="414"/>
       <source>Miscellaneous Settings</source>
-      <translation>Miscellaneous Settings</translation>
+      <translation type="unfinished">Miscellaneous Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="419"/>
       <source>* Stabilize Collective Curve *</source>
-      <translation>* Stabilize Collective Curve *</translation>
+      <translation type="unfinished">* Stabilize Collective Curve *</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
@@ -1076,17 +1076,17 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="434"/>
       <source>* Tail &amp; Gyros *</source>
-      <translation>* Tail &amp; Gyros *</translation>
+      <translation type="unfinished">* Tail &amp; Gyros *</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.h" line="33"/>
       <source>Heli</source>
-      <translation>Heli</translation>
+      <translation type="unfinished">Heli</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.h" line="24"/>
       <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
-      <translation>Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
+      <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
     </message>
   </context>
   <context>
@@ -1094,42 +1094,42 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="137"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="145"/>
       <source>Channel </source>
-      <translation>Channel </translation>
+      <translation type="unfinished">Channel </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="169"/>
       <source>Light Output Channels</source>
-      <translation>Light Output Channels</translation>
+      <translation type="unfinished">Light Output Channels</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="186"/>
       <source>Lights 1:</source>
-      <translation>Lights 1:</translation>
+      <translation type="unfinished">Lights 1:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="207"/>
       <source>Lights 2:</source>
-      <translation>Lights 2:</translation>
+      <translation type="unfinished">Lights 2:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="228"/>
       <source>Brightness Steps:</source>
-      <translation>Brightness Steps:</translation>
+      <translation type="unfinished">Brightness Steps:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.h" line="32"/>
       <source>Lights</source>
-      <translation>Lights</translation>
+      <translation type="unfinished">Lights</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.h" line="24"/>
       <source>Lights setup is used to adjust light output channels.</source>
-      <translation>Lights setup is used to adjust light output channels.</translation>
+      <translation type="unfinished">Lights setup is used to adjust light output channels.</translation>
     </message>
   </context>
   <context>
@@ -1137,67 +1137,67 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
       <source>Channel 5</source>
-      <translation>Channel 5</translation>
+      <translation type="unfinished">Channel 5</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
       <source>Channel 6</source>
-      <translation>Channel 6</translation>
+      <translation type="unfinished">Channel 6</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
       <source>Channel 7</source>
-      <translation>Channel 7</translation>
+      <translation type="unfinished">Channel 7</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
       <source>Channel 8</source>
-      <translation>Channel 8</translation>
+      <translation type="unfinished">Channel 8</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
       <source>Channel 9</source>
-      <translation>Channel 9</translation>
+      <translation type="unfinished">Channel 9</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
       <source>Channel 10</source>
-      <translation>Channel 10</translation>
+      <translation type="unfinished">Channel 10</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
       <source>Channel 11</source>
-      <translation>Channel 11</translation>
+      <translation type="unfinished">Channel 11</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
       <source>Channel 12</source>
-      <translation>Channel 12</translation>
+      <translation type="unfinished">Channel 12</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
       <source>Channel 13</source>
-      <translation>Channel 13</translation>
+      <translation type="unfinished">Channel 13</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
       <source>Channel 14</source>
-      <translation>Channel 14</translation>
+      <translation type="unfinished">Channel 14</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
       <source>Lights Output 1</source>
-      <translation>Lights Output 1</translation>
+      <translation type="unfinished">Lights Output 1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
       <source>Lights Output 2</source>
-      <translation>Lights Output 2</translation>
+      <translation type="unfinished">Lights Output 2</translation>
     </message>
   </context>
   <context>
@@ -1228,7 +1228,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.h" line="25"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
   </context>
   <context>
@@ -1236,7 +1236,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
       <source>Not supported</source>
-      <translation>Not supported</translation>
+      <translation type="unfinished">Not supported</translation>
     </message>
   </context>
   <context>
@@ -1377,188 +1377,188 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
       <source>Requires vehicle reboot</source>
-      <translation>Requires vehicle reboot</translation>
+      <translation type="unfinished">Requires vehicle reboot</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
       <source>Battery 1</source>
-      <translation>Battery 1</translation>
+      <translation type="unfinished">Battery 1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
       <source>Battery1 monitor:</source>
-      <translation>Battery1 monitor:</translation>
+      <translation type="unfinished">Battery1 monitor:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
       <source>Reboot vehicle</source>
-      <translation>Reboot vehicle</translation>
+      <translation type="unfinished">Reboot vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
       <source>Battery 2</source>
-      <translation>Battery 2</translation>
+      <translation type="unfinished">Battery 2</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
       <source>Battery2 monitor:</source>
-      <translation>Battery2 monitor:</translation>
+      <translation type="unfinished">Battery2 monitor:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
       <source>ESC Calibration</source>
-      <translation>ESC Calibration</translation>
+      <translation type="unfinished">ESC Calibration</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
       <source>WARNING: Remove props prior to calibration!</source>
-      <translation>WARNING: Remove props prior to calibration!</translation>
+      <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
       <source>Calibrate</source>
-      <translation>Calibrate</translation>
+      <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
       <source>Now perform these steps:</source>
-      <translation>Now perform these steps:</translation>
+      <translation type="unfinished">Now perform these steps:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
       <source>Click Calibrate to start, then:</source>
-      <translation>Click Calibrate to start, then:</translation>
+      <translation type="unfinished">Click Calibrate to start, then:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
       <source>- Disconnect USB and battery so flight controller powers down</source>
-      <translation>- Disconnect USB and battery so flight controller powers down</translation>
+      <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
       <source>- Connect the battery</source>
-      <translation>- Connect the battery</translation>
+      <translation type="unfinished">- Connect the battery</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
       <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation>- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
+      <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
       <source>- If using a flight controller with a safety button press it until it displays solid red</source>
-      <translation>- If using a flight controller with a safety button press it until it displays solid red</translation>
+      <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
       <source>- You will hear a musical tone then two beeps</source>
-      <translation>- You will hear a musical tone then two beeps</translation>
+      <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
       <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
-      <translation>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
+      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
       <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
-      <translation>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
+      <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
       <source>- Disconnect the battery and power up again normally</source>
-      <translation>- Disconnect the battery and power up again normally</translation>
+      <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
       <source>Power Module 90A</source>
-      <translation>Power Module 90A</translation>
+      <translation type="unfinished">Power Module 90A</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
       <source>Power Module HV</source>
-      <translation>Power Module HV</translation>
+      <translation type="unfinished">Power Module HV</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
       <source>3DR Iris</source>
-      <translation>3DR Iris</translation>
+      <translation type="unfinished">3DR Iris</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="362"/>
       <source>Other</source>
-      <translation>Other</translation>
+      <translation type="unfinished">Other</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="372"/>
       <source>Battery monitor:</source>
-      <translation>Battery monitor:</translation>
+      <translation type="unfinished">Battery monitor:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="384"/>
       <source>Battery capacity:</source>
-      <translation>Battery capacity:</translation>
+      <translation type="unfinished">Battery capacity:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="396"/>
       <source>Minimum arming voltage:</source>
-      <translation>Minimum arming voltage:</translation>
+      <translation type="unfinished">Minimum arming voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="408"/>
       <source>Power sensor:</source>
-      <translation>Power sensor:</translation>
+      <translation type="unfinished">Power sensor:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="433"/>
       <source>Current pin:</source>
-      <translation>Current pin:</translation>
+      <translation type="unfinished">Current pin:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="448"/>
       <source>Voltage pin:</source>
-      <translation>Voltage pin:</translation>
+      <translation type="unfinished">Voltage pin:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="463"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="569"/>
       <source>Voltage multiplier:</source>
-      <translation>Voltage multiplier:</translation>
+      <translation type="unfinished">Voltage multiplier:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="474"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="500"/>
       <source>Calculate</source>
-      <translation>Calculate</translation>
+      <translation type="unfinished">Calculate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="542"/>
       <source>Calculate Voltage Multiplier</source>
-      <translation>Calculate Voltage Multiplier</translation>
+      <translation type="unfinished">Calculate Voltage Multiplier</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="484"/>
       <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>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
+      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="489"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="622"/>
       <source>Amps per volt:</source>
-      <translation>Amps per volt:</translation>
+      <translation type="unfinished">Amps per volt:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="595"/>
       <source>Calculate Amps per Volt</source>
-      <translation>Calculate Amps per Volt</translation>
+      <translation type="unfinished">Calculate Amps per Volt</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="510"/>
       <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>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
+      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
@@ -1573,58 +1573,58 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="515"/>
       <source>Amps Offset:</source>
-      <translation>Amps Offset:</translation>
+      <translation type="unfinished">Amps Offset:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="530"/>
       <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>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
+      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="554"/>
       <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
-      <translation>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
+      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="562"/>
       <source>Measured voltage:</source>
-      <translation>Measured voltage:</translation>
+      <translation type="unfinished">Measured voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="566"/>
       <source>Vehicle voltage:</source>
-      <translation>Vehicle voltage:</translation>
+      <translation type="unfinished">Vehicle voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="574"/>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="627"/>
       <source>Calculate And Set</source>
-      <translation>Calculate And Set</translation>
+      <translation type="unfinished">Calculate And Set</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="607"/>
       <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>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
+      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="615"/>
       <source>Measured current:</source>
-      <translation>Measured current:</translation>
+      <translation type="unfinished">Measured current:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="619"/>
       <source>Vehicle current:</source>
-      <translation>Vehicle current:</translation>
+      <translation type="unfinished">Vehicle current:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.h" line="33"/>
       <source>Power</source>
-      <translation>Power</translation>
+      <translation type="unfinished">Power</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.h" line="24"/>
       <source>The Power Component is used to setup battery parameters.</source>
-      <translation>The Power Component is used to setup battery parameters.</translation>
+      <translation type="unfinished">The Power Component is used to setup battery parameters.</translation>
     </message>
   </context>
   <context>
@@ -1632,22 +1632,22 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
       <source>Batt1 monitor</source>
-      <translation>Batt1 monitor</translation>
+      <translation type="unfinished">Batt1 monitor</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
       <source>Batt1 capacity</source>
-      <translation>Batt1 capacity</translation>
+      <translation type="unfinished">Batt1 capacity</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
       <source>Batt2 monitor</source>
-      <translation>Batt2 monitor</translation>
+      <translation type="unfinished">Batt2 monitor</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
       <source>Batt2 capacity</source>
-      <translation>Batt2 capacity</translation>
+      <translation type="unfinished">Batt2 capacity</translation>
     </message>
   </context>
   <context>
@@ -1655,12 +1655,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.h" line="41"/>
       <source>Radio</source>
-      <translation>Radio</translation>
+      <translation type="unfinished">Radio</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.h" line="26"/>
       <source>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</source>
-      <translation>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
+      <translation type="unfinished">The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
     </message>
   </context>
   <context>
@@ -1668,7 +1668,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
@@ -1676,7 +1676,7 @@
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
@@ -1684,22 +1684,22 @@
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
       <source>Channel %1</source>
-      <translation>Channel %1</translation>
+      <translation type="unfinished">Channel %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
       <source>Throttle</source>
-      <translation>Throttle</translation>
+      <translation type="unfinished">Throttle</translation>
     </message>
   </context>
   <context>
@@ -1813,121 +1813,121 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="65"/>
       <source>Requires vehicle reboot</source>
-      <translation>Requires vehicle reboot</translation>
+      <translation type="unfinished">Requires vehicle reboot</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="78"/>
       <source>Low action:</source>
-      <translation>Low action:</translation>
+      <translation type="unfinished">Low action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="85"/>
       <source>Critical action:</source>
-      <translation>Critical action:</translation>
+      <translation type="unfinished">Critical action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="92"/>
       <source>Low voltage threshold:</source>
-      <translation>Low voltage threshold:</translation>
+      <translation type="unfinished">Low voltage threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="100"/>
       <source>Critical voltage threshold:</source>
-      <translation>Critical voltage threshold:</translation>
+      <translation type="unfinished">Critical voltage threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="107"/>
       <source>Low mAh threshold:</source>
-      <translation>Low mAh threshold:</translation>
+      <translation type="unfinished">Low mAh threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="114"/>
       <source>Critical mAh threshold:</source>
-      <translation>Critical mAh threshold:</translation>
+      <translation type="unfinished">Critical mAh threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="135"/>
       <source>Reboot vehicle</source>
-      <translation>Reboot vehicle</translation>
+      <translation type="unfinished">Reboot vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="146"/>
       <source>Battery1 Failsafe Triggers</source>
-      <translation>Battery1 Failsafe Triggers</translation>
+      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="180"/>
       <source>Battery2 Failsafe Triggers</source>
-      <translation>Battery2 Failsafe Triggers</translation>
+      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="219"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="278"/>
       <source>Failsafe Triggers</source>
-      <translation>Failsafe Triggers</translation>
+      <translation type="unfinished">Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="237"/>
       <source>Throttle PWM threshold:</source>
-      <translation>Throttle PWM threshold:</translation>
+      <translation type="unfinished">Throttle PWM threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="251"/>
       <source>GCS failsafe</source>
-      <translation>GCS failsafe</translation>
+      <translation type="unfinished">GCS failsafe</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="295"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="365"/>
       <source>Ground Station failsafe:</source>
-      <translation>Ground Station failsafe:</translation>
+      <translation type="unfinished">Ground Station failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="302"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="372"/>
       <source>Throttle failsafe:</source>
-      <translation>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="309"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="382"/>
       <source>PWM threshold:</source>
-      <translation>PWM threshold:</translation>
+      <translation type="unfinished">PWM threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="315"/>
       <source>Failsafe Crash Check:</source>
-      <translation>Failsafe Crash Check:</translation>
+      <translation type="unfinished">Failsafe Crash Check:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="344"/>
       <source>General Failsafe Triggers</source>
-      <translation>General Failsafe Triggers</translation>
+      <translation type="unfinished">General Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="374"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="374"/>
       <source>Always RTL</source>
-      <translation>Always RTL</translation>
+      <translation type="unfinished">Always RTL</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
       <source>Continue with Mission in Auto Mode</source>
-      <translation>Continue with Mission in Auto Mode</translation>
+      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
       <source>Always Land</source>
-      <translation>Always Land</translation>
+      <translation type="unfinished">Always Land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="416"/>
       <source>GeoFence</source>
-      <translation>GeoFence</translation>
+      <translation type="unfinished">GeoFence</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="433"/>
@@ -1963,59 +1963,59 @@
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="543"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="672"/>
       <source>Return to Launch</source>
-      <translation>Return to Launch</translation>
+      <translation type="unfinished">Return to Launch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="573"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="686"/>
       <source>Return at current altitude</source>
-      <translation>Return at current altitude</translation>
+      <translation type="unfinished">Return at current altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="584"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="697"/>
       <source>Return at specified altitude:</source>
-      <translation>Return at specified altitude:</translation>
+      <translation type="unfinished">Return at specified altitude:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="605"/>
       <source>Loiter above Home for:</source>
-      <translation>Loiter above Home for:</translation>
+      <translation type="unfinished">Loiter above Home for:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="623"/>
       <source>Final land stage altitude:</source>
-      <translation>Final land stage altitude:</translation>
+      <translation type="unfinished">Final land stage altitude:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="638"/>
       <source>Final land stage descent speed:</source>
-      <translation>Final land stage descent speed:</translation>
+      <translation type="unfinished">Final land stage descent speed:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="724"/>
       <source>Arming Checks</source>
-      <translation>Arming Checks</translation>
+      <translation type="unfinished">Arming Checks</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="755"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
+      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.h" line="34"/>
       <source>Safety</source>
-      <translation>Safety</translation>
+      <translation type="unfinished">Safety</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="24"/>
       <source>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</source>
-      <translation>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
+      <translation type="unfinished">Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="34"/>
       <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
+      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
     </message>
   </context>
   <context>
@@ -2023,151 +2023,151 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="84"/>
       <source>Battery1 Failsafe Triggers</source>
-      <translation>Battery1 Failsafe Triggers</translation>
+      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="105"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="177"/>
       <source>Battery low action:</source>
-      <translation>Battery low action:</translation>
+      <translation type="unfinished">Battery low action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="113"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="185"/>
       <source>Battery critical action:</source>
-      <translation>Battery critical action:</translation>
+      <translation type="unfinished">Battery critical action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="124"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="194"/>
       <source>Voltage threshold:</source>
-      <translation>Voltage threshold:</translation>
+      <translation type="unfinished">Voltage threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="135"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="205"/>
       <source>MAH threshold:</source>
-      <translation>MAH threshold:</translation>
+      <translation type="unfinished">MAH threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="154"/>
       <source>Battery2 Failsafe Triggers</source>
-      <translation>Battery2 Failsafe Triggers</translation>
+      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="223"/>
       <source>General Failsafe Triggers</source>
-      <translation>General Failsafe Triggers</translation>
+      <translation type="unfinished">General Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="244"/>
       <source>Ground Station failsafe:</source>
-      <translation>Ground Station failsafe:</translation>
+      <translation type="unfinished">Ground Station failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="251"/>
       <source>Throttle failsafe:</source>
-      <translation>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="253"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="253"/>
       <source>Always RTL</source>
-      <translation>Always RTL</translation>
+      <translation type="unfinished">Always RTL</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
       <source>Continue with Mission in Auto Mode</source>
-      <translation>Continue with Mission in Auto Mode</translation>
+      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
       <source>Always Land</source>
-      <translation>Always Land</translation>
+      <translation type="unfinished">Always Land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="261"/>
       <source>PWM threshold:</source>
-      <translation>PWM threshold:</translation>
+      <translation type="unfinished">PWM threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="277"/>
       <source>GeoFence</source>
-      <translation>GeoFence</translation>
+      <translation type="unfinished">GeoFence</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="292"/>
       <source>Circle GeoFence enabled</source>
-      <translation>Circle GeoFence enabled</translation>
+      <translation type="unfinished">Circle GeoFence enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="317"/>
       <source>Altitude GeoFence enabled</source>
-      <translation>Altitude GeoFence enabled</translation>
+      <translation type="unfinished">Altitude GeoFence enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="342"/>
       <source>Report only</source>
-      <translation>Report only</translation>
+      <translation type="unfinished">Report only</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="354"/>
       <source>RTL or Land</source>
-      <translation>RTL or Land</translation>
+      <translation type="unfinished">RTL or Land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="365"/>
       <source>Max radius:</source>
-      <translation>Max radius:</translation>
+      <translation type="unfinished">Max radius:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="381"/>
       <source>Max altitude:</source>
-      <translation>Max altitude:</translation>
+      <translation type="unfinished">Max altitude:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="401"/>
       <source>Return to Launch</source>
-      <translation>Return to Launch</translation>
+      <translation type="unfinished">Return to Launch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="437"/>
       <source>Return at current altitude</source>
-      <translation>Return at current altitude</translation>
+      <translation type="unfinished">Return at current altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="449"/>
       <source>Return at specified altitude:</source>
-      <translation>Return at specified altitude:</translation>
+      <translation type="unfinished">Return at specified altitude:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="471"/>
       <source>Loiter above Home for:</source>
-      <translation>Loiter above Home for:</translation>
+      <translation type="unfinished">Loiter above Home for:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="490"/>
       <source>Land with descent speed:</source>
-      <translation>Land with descent speed:</translation>
+      <translation type="unfinished">Land with descent speed:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="511"/>
       <source>Final loiter altitude:</source>
-      <translation>Final loiter altitude:</translation>
+      <translation type="unfinished">Final loiter altitude:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="533"/>
       <source>Arming Checks</source>
-      <translation>Arming Checks</translation>
+      <translation type="unfinished">Arming Checks</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="564"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
+      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
     </message>
   </context>
   <context>
@@ -2175,42 +2175,42 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="58"/>
       <source>Failsafe Triggers</source>
-      <translation>Failsafe Triggers</translation>
+      <translation type="unfinished">Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="72"/>
       <source>Throttle PWM threshold:</source>
-      <translation>Throttle PWM threshold:</translation>
+      <translation type="unfinished">Throttle PWM threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="93"/>
       <source>Voltage threshold:</source>
-      <translation>Voltage threshold:</translation>
+      <translation type="unfinished">Voltage threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="114"/>
       <source>MAH threshold:</source>
-      <translation>MAH threshold:</translation>
+      <translation type="unfinished">MAH threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="135"/>
       <source>GCS failsafe</source>
-      <translation>GCS failsafe</translation>
+      <translation type="unfinished">GCS failsafe</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="147"/>
       <source>Return to Launch</source>
-      <translation>Return to Launch</translation>
+      <translation type="unfinished">Return to Launch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="161"/>
       <source>Return at current altitude</source>
-      <translation>Return at current altitude</translation>
+      <translation type="unfinished">Return at current altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="173"/>
       <source>Return at specified altitude:</source>
-      <translation>Return at specified altitude:</translation>
+      <translation type="unfinished">Return at specified altitude:</translation>
     </message>
   </context>
   <context>
@@ -2218,52 +2218,52 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="52"/>
       <source>Failsafe Triggers</source>
-      <translation>Failsafe Triggers</translation>
+      <translation type="unfinished">Failsafe Triggers</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="67"/>
       <source>Ground Station failsafe:</source>
-      <translation>Ground Station failsafe:</translation>
+      <translation type="unfinished">Ground Station failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="86"/>
       <source>Throttle failsafe:</source>
-      <translation>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="104"/>
       <source>PWM threshold:</source>
-      <translation>PWM threshold:</translation>
+      <translation type="unfinished">PWM threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="121"/>
       <source>Failsafe Crash Check:</source>
-      <translation>Failsafe Crash Check:</translation>
+      <translation type="unfinished">Failsafe Crash Check:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="130"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="130"/>
       <source>Hold</source>
-      <translation>Hold</translation>
+      <translation type="unfinished">Hold</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="130"/>
       <source>Hold and Disarm</source>
-      <translation>Hold and Disarm</translation>
+      <translation type="unfinished">Hold and Disarm</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="142"/>
       <source>Arming Checks</source>
-      <translation>Arming Checks</translation>
+      <translation type="unfinished">Arming Checks</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="173"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
+      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
     </message>
   </context>
   <context>
@@ -2271,32 +2271,32 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
       <source>Failsafe Actions</source>
-      <translation>Failsafe Actions</translation>
+      <translation type="unfinished">Failsafe Actions</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
       <source>GCS Heartbeat:</source>
-      <translation>GCS Heartbeat:</translation>
+      <translation type="unfinished">GCS Heartbeat:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
       <source>Leak:</source>
-      <translation>Leak:</translation>
+      <translation type="unfinished">Leak:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
       <source>Detector Pin:</source>
-      <translation>Detector Pin:</translation>
+      <translation type="unfinished">Detector Pin:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
       <source>Logic when Dry:</source>
-      <translation>Logic when Dry:</translation>
+      <translation type="unfinished">Logic when Dry:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
       <source>Battery:</source>
-      <translation>Battery:</translation>
+      <translation type="unfinished">Battery:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="177"/>
@@ -2306,53 +2306,53 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="185"/>
       <source>Voltage:</source>
-      <translation>Voltage:</translation>
+      <translation type="unfinished">Voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="199"/>
       <source>Remaining Capacity:</source>
-      <translation>Remaining Capacity:</translation>
+      <translation type="unfinished">Remaining Capacity:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="221"/>
       <source>EKF:</source>
-      <translation>EKF:</translation>
+      <translation type="unfinished">EKF:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="255"/>
       <source>Pilot Input:</source>
-      <translation>Pilot Input:</translation>
+      <translation type="unfinished">Pilot Input:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="267"/>
       <source>Timeout:</source>
-      <translation>Timeout:</translation>
+      <translation type="unfinished">Timeout:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="290"/>
       <source>Internal Temperature:</source>
-      <translation>Internal Temperature:</translation>
+      <translation type="unfinished">Internal Temperature:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="323"/>
       <source>Internal Pressure:</source>
-      <translation>Internal Pressure:</translation>
+      <translation type="unfinished">Internal Pressure:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="302"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="335"/>
       <source>Threshold:</source>
-      <translation>Threshold:</translation>
+      <translation type="unfinished">Threshold:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="356"/>
       <source>Arming Checks</source>
-      <translation>Arming Checks</translation>
+      <translation type="unfinished">Arming Checks</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="387"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
+      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
     </message>
   </context>
   <context>
@@ -2360,107 +2360,107 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
       <source>Arming Checks:</source>
-      <translation>Arming Checks:</translation>
+      <translation type="unfinished">Arming Checks:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
       <source>Enabled</source>
-      <translation>Enabled</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
       <source>Some disabled</source>
-      <translation>Some disabled</translation>
+      <translation type="unfinished">Some disabled</translation>
     </message>
     <message>
       <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>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
       <source>Failsafe Action:</source>
-      <translation>Failsafe Action:</translation>
+      <translation type="unfinished">Failsafe Action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
       <source>Failsafe Crash Check:</source>
-      <translation>Failsafe Crash Check:</translation>
+      <translation type="unfinished">Failsafe Crash Check:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
       <source>Batt1 low failsafe:</source>
-      <translation>Batt1 low failsafe:</translation>
+      <translation type="unfinished">Batt1 low failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
       <source>Batt1 critical failsafe:</source>
-      <translation>Batt1 critical failsafe:</translation>
+      <translation type="unfinished">Batt1 critical failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
       <source>Batt2 low failsafe:</source>
-      <translation>Batt2 low failsafe:</translation>
+      <translation type="unfinished">Batt2 low failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
       <source>Batt2 critical failsafe:</source>
-      <translation>Batt2 critical failsafe:</translation>
+      <translation type="unfinished">Batt2 critical failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
       <source>GeoFence:</source>
-      <translation>GeoFence:</translation>
+      <translation type="unfinished">GeoFence:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
       <source>Circle</source>
-      <translation>Circle</translation>
+      <translation type="unfinished">Circle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
       <source>Altitude,Circle</source>
-      <translation>Altitude,Circle</translation>
+      <translation type="unfinished">Altitude,Circle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
       <source>Report only</source>
-      <translation>Report only</translation>
+      <translation type="unfinished">Report only</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
       <source>RTL or Land</source>
-      <translation>RTL or Land</translation>
+      <translation type="unfinished">RTL or Land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
       <source>RTL min alt:</source>
-      <translation>RTL min alt:</translation>
+      <translation type="unfinished">RTL min alt:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
       <source>current</source>
-      <translation>current</translation>
+      <translation type="unfinished">current</translation>
     </message>
   </context>
   <context>
@@ -2468,93 +2468,93 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="41"/>
       <source>Arming Checks:</source>
-      <translation>Arming Checks:</translation>
+      <translation type="unfinished">Arming Checks:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
       <source>Enabled</source>
-      <translation>Enabled</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
       <source>Some disabled</source>
-      <translation>Some disabled</translation>
+      <translation type="unfinished">Some disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="46"/>
       <source>Throttle failsafe:</source>
-      <translation>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="51"/>
       <source>Batt1 low failsafe:</source>
-      <translation>Batt1 low failsafe:</translation>
+      <translation type="unfinished">Batt1 low failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
       <source>Batt1 critical failsafe:</source>
-      <translation>Batt1 critical failsafe:</translation>
+      <translation type="unfinished">Batt1 critical failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
       <source>Batt2 low failsafe:</source>
-      <translation>Batt2 low failsafe:</translation>
+      <translation type="unfinished">Batt2 low failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
       <source>Batt2 critical failsafe:</source>
-      <translation>Batt2 critical failsafe:</translation>
+      <translation type="unfinished">Batt2 critical failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="84"/>
       <source>GeoFence:</source>
-      <translation>GeoFence:</translation>
+      <translation type="unfinished">GeoFence:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="77"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="79"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
       <source>Circle</source>
-      <translation>Circle</translation>
+      <translation type="unfinished">Circle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
       <source>Altitude,Circle</source>
-      <translation>Altitude,Circle</translation>
+      <translation type="unfinished">Altitude,Circle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="86"/>
       <source>Report only</source>
-      <translation>Report only</translation>
+      <translation type="unfinished">Report only</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
       <source>RTL or Land</source>
-      <translation>RTL or Land</translation>
+      <translation type="unfinished">RTL or Land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="92"/>
       <source>RTL min alt:</source>
-      <translation>RTL min alt:</translation>
+      <translation type="unfinished">RTL min alt:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="93"/>
       <source>current</source>
-      <translation>current</translation>
+      <translation type="unfinished">current</translation>
     </message>
   </context>
   <context>
@@ -2562,34 +2562,34 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="33"/>
       <source>Throttle failsafe:</source>
-      <translation>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="34"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="39"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="44"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="38"/>
       <source>Voltage failsafe:</source>
-      <translation>Voltage failsafe:</translation>
+      <translation type="unfinished">Voltage failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="43"/>
       <source>mAh failsafe:</source>
-      <translation>mAh failsafe:</translation>
+      <translation type="unfinished">mAh failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="48"/>
       <source>RTL min alt:</source>
-      <translation>RTL min alt:</translation>
+      <translation type="unfinished">RTL min alt:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="49"/>
       <source>current</source>
-      <translation>current</translation>
+      <translation type="unfinished">current</translation>
     </message>
   </context>
   <context>
@@ -2599,63 +2599,63 @@
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="70"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="93"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="57"/>
       <source>Always RTL</source>
-      <translation>Always RTL</translation>
+      <translation type="unfinished">Always RTL</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="60"/>
       <source>Always Hold</source>
-      <translation>Always Hold</translation>
+      <translation type="unfinished">Always Hold</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="63"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="79"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="73"/>
       <source>Hold</source>
-      <translation>Hold</translation>
+      <translation type="unfinished">Hold</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="76"/>
       <source>Hold and Disarm</source>
-      <translation>Hold and Disarm</translation>
+      <translation type="unfinished">Hold and Disarm</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="87"/>
       <source>Arming Checks:</source>
-      <translation>Arming Checks:</translation>
+      <translation type="unfinished">Arming Checks:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
       <source>Enabled</source>
-      <translation>Enabled</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
       <source>Some disabled</source>
-      <translation>Some disabled</translation>
+      <translation type="unfinished">Some disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="92"/>
       <source>Throttle failsafe:</source>
-      <translation>Throttle failsafe:</translation>
+      <translation type="unfinished">Throttle failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="97"/>
       <source>Failsafe Action:</source>
-      <translation>Failsafe Action:</translation>
+      <translation type="unfinished">Failsafe Action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="102"/>
       <source>Failsafe Crash Check:</source>
-      <translation>Failsafe Crash Check:</translation>
+      <translation type="unfinished">Failsafe Crash Check:</translation>
     </message>
   </context>
   <context>
@@ -2663,52 +2663,52 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
       <source>Arming Checks:</source>
-      <translation>Arming Checks:</translation>
+      <translation type="unfinished">Arming Checks:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
       <source>Enabled</source>
-      <translation>Enabled</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
       <source>Some disabled</source>
-      <translation>Some disabled</translation>
+      <translation type="unfinished">Some disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
       <source>GCS failsafe:</source>
-      <translation>GCS failsafe:</translation>
+      <translation type="unfinished">GCS failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
       <source>Leak failsafe:</source>
-      <translation>Leak failsafe:</translation>
+      <translation type="unfinished">Leak failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
       <source>Battery failsafe:</source>
-      <translation>Battery failsafe:</translation>
+      <translation type="unfinished">Battery failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
       <source>EKF failsafe:</source>
-      <translation>EKF failsafe:</translation>
+      <translation type="unfinished">EKF failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
       <source>Pilot Input failsafe:</source>
-      <translation>Pilot Input failsafe:</translation>
+      <translation type="unfinished">Pilot Input failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
       <source>Int. Temperature failsafe:</source>
-      <translation>Int. Temperature failsafe:</translation>
+      <translation type="unfinished">Int. Temperature failsafe:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
       <source>Int. Pressure failsafe:</source>
-      <translation>Int. Pressure failsafe:</translation>
+      <translation type="unfinished">Int. Pressure failsafe:</translation>
     </message>
   </context>
   <context>
@@ -2716,142 +2716,142 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
       <source>If mounted in the direction of flight, select None.</source>
-      <translation>If mounted in the direction of flight, select None.</translation>
+      <translation type="unfinished">If mounted in the direction of flight, select None.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
       <source>Before calibrating make sure rotation settings are correct. </source>
-      <translation>Before calibrating make sure rotation settings are correct. </translation>
+      <translation type="unfinished">Before calibrating make sure rotation settings are correct. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
       <source>If the compass or GPS module is mounted in flight direction, leave the default value (None)</source>
-      <translation>If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
+      <translation type="unfinished">If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
       <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation>For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
+      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
       <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
+      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
       <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
+      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation>To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
+      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
       <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation>Start the individual calibration steps by clicking one of the buttons to the left.</translation>
+      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
       <source>The calibration for Compass %1 appears to be poor. </source>
-      <translation>The calibration for Compass %1 appears to be poor. </translation>
+      <translation type="unfinished">The calibration for Compass %1 appears to be poor. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
       <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation>Check the compass position within your vehicle and re-do the calibration.</translation>
+      <translation type="unfinished">Check the compass position within your vehicle and re-do the calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="99"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="682"/>
       <source>Calibrate Compass</source>
-      <translation>Calibrate Compass</translation>
+      <translation type="unfinished">Calibrate Compass</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="105"/>
       <source>Calibrate Accelerometer</source>
-      <translation>Calibrate Accelerometer</translation>
+      <translation type="unfinished">Calibrate Accelerometer</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="111"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="739"/>
       <source>Sensor Settings</source>
-      <translation>Sensor Settings</translation>
+      <translation type="unfinished">Sensor Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="188"/>
       <source>Calibration Cancel</source>
-      <translation>Calibration Cancel</translation>
+      <translation type="unfinished">Calibration Cancel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="272"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="311"/>
       <source>Calibration complete</source>
-      <translation>Calibration complete</translation>
+      <translation type="unfinished">Calibration complete</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="189"/>
       <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation>Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
+      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="127"/>
       <source>(primary</source>
-      <translation>(primary</translation>
+      <translation type="unfinished">(primary</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="127"/>
       <source>(secondary</source>
-      <translation>(secondary</translation>
+      <translation type="unfinished">(secondary</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="360"/>
       <source>Use Compass</source>
-      <translation>Use Compass</translation>
+      <translation type="unfinished">Use Compass</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="288"/>
       <source>Shown in the indicator bars is the quality of the calibration for each compass.
 
 </source>
-      <translation>Shown in the indicator bars is the quality of the calibration for each compass.
+      <translation type="unfinished">Shown in the indicator bars is the quality of the calibration for each compass.
 
 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="123"/>
       <source>Compass %1 </source>
-      <translation>Compass %1 </translation>
+      <translation type="unfinished">Compass %1 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="136"/>
       <source>, </source>
-      <translation>, </translation>
+      <translation type="unfinished">, </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="138"/>
       <source>external</source>
-      <translation>external</translation>
+      <translation type="unfinished">external</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="138"/>
       <source>internal</source>
-      <translation>internal</translation>
+      <translation type="unfinished">internal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
       <source>- Green indicates a well functioning compass.
 </source>
-      <translation>- Green indicates a well functioning compass.
+      <translation type="unfinished">- Green indicates a well functioning compass.
 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="290"/>
       <source>- Yellow indicates a questionable compass or calibration.
 </source>
-      <translation>- Yellow indicates a questionable compass or calibration.
+      <translation type="unfinished">- Yellow indicates a questionable compass or calibration.
 </translation>
     </message>
     <message>
@@ -2859,7 +2859,7 @@
       <source>- Red indicates a compass which should not be used.
 
 </source>
-      <translation>- Red indicates a compass which should not be used.
+      <translation type="unfinished">- Red indicates a compass which should not be used.
 
 </translation>
     </message>
@@ -2867,43 +2867,43 @@
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="292"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="321"/>
       <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
+      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="296"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="325"/>
       <source>Reboot Vehicle</source>
-      <translation>Reboot Vehicle</translation>
+      <translation type="unfinished">Reboot Vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="366"/>
       <source>Priority 1</source>
-      <translation>Priority 1</translation>
+      <translation type="unfinished">Priority 1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="366"/>
       <source>Priority 2</source>
-      <translation>Priority 2</translation>
+      <translation type="unfinished">Priority 2</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="366"/>
       <source>Priority 3</source>
-      <translation>Priority 3</translation>
+      <translation type="unfinished">Priority 3</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="366"/>
       <source>Not Set</source>
-      <translation>Not Set</translation>
+      <translation type="unfinished">Not Set</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="399"/>
       <source>Orientation:</source>
-      <translation>Orientation:</translation>
+      <translation type="unfinished">Orientation:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="459"/>
       <source>Autopilot Rotation:</source>
-      <translation>Autopilot Rotation:</translation>
+      <translation type="unfinished">Autopilot Rotation:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="476"/>
@@ -2913,12 +2913,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="494"/>
       <source>Magnetic Declination</source>
-      <translation>Magnetic Declination</translation>
+      <translation type="unfinished">Magnetic Declination</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="506"/>
       <source>Manual Magnetic Declination</source>
-      <translation>Manual Magnetic Declination</translation>
+      <translation type="unfinished">Manual Magnetic Declination</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="528"/>
@@ -2978,136 +2978,136 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="612"/>
       <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
+      <translation type="unfinished">This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="613"/>
       <source>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </source>
-      <translation>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
+      <translation type="unfinished">CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="614"/>
       <source>It is technically possible to set-up CompassMot using throttle but this is not recommended.</source>
-      <translation>It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
+      <translation type="unfinished">It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="621"/>
       <source>Disconnect your props, flip them over and rotate them one position around the frame. </source>
-      <translation>Disconnect your props, flip them over and rotate them one position around the frame. </translation>
+      <translation type="unfinished">Disconnect your props, flip them over and rotate them one position around the frame. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="622"/>
       <source>In this configuration they should push the copter down into the ground when the throttle is raised.</source>
-      <translation>In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
+      <translation type="unfinished">In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="629"/>
       <source>Secure the copter (perhaps with tape) so that it does not move.</source>
-      <translation>Secure the copter (perhaps with tape) so that it does not move.</translation>
+      <translation type="unfinished">Secure the copter (perhaps with tape) so that it does not move.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="636"/>
       <source>Turn on your transmitter and keep throttle at zero.</source>
-      <translation>Turn on your transmitter and keep throttle at zero.</translation>
+      <translation type="unfinished">Turn on your transmitter and keep throttle at zero.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="643"/>
       <source>Click Ok to start CompassMot calibration.</source>
-      <translation>Click Ok to start CompassMot calibration.</translation>
+      <translation type="unfinished">Click Ok to start CompassMot calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="700"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation>To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
+      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="725"/>
       <source>depth</source>
-      <translation>depth</translation>
+      <translation type="unfinished">depth</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="725"/>
       <source>altitude</source>
-      <translation>altitude</translation>
+      <translation type="unfinished">altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="721"/>
       <source>Pressure calibration will set the %1 to zero at the current pressure reading. %2</source>
-      <translation>Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
+      <translation type="unfinished">Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="726"/>
       <source>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
+      <translation type="unfinished">To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="712"/>
       <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
 
 Click Ok to start calibration.</source>
-      <translation>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
+      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
 
 Click Ok to start calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="666"/>
       <source>Accelerometer</source>
-      <translation>Accelerometer</translation>
+      <translation type="unfinished">Accelerometer</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="677"/>
       <source>Compass</source>
-      <translation>Compass</translation>
+      <translation type="unfinished">Compass</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="682"/>
       <source>Accelerometer must be calibrated prior to Compass.</source>
-      <translation>Accelerometer must be calibrated prior to Compass.</translation>
+      <translation type="unfinished">Accelerometer must be calibrated prior to Compass.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="693"/>
       <source>Level Horizon</source>
-      <translation>Level Horizon</translation>
+      <translation type="unfinished">Level Horizon</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="697"/>
       <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation>Accelerometer must be calibrated prior to Level Horizon.</translation>
+      <translation type="unfinished">Accelerometer must be calibrated prior to Level Horizon.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="709"/>
       <source>Gyro</source>
-      <translation>Gyro</translation>
+      <translation type="unfinished">Gyro</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="711"/>
       <source>Calibrate Gyro</source>
-      <translation>Calibrate Gyro</translation>
+      <translation type="unfinished">Calibrate Gyro</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="727"/>
       <source>Baro/Airspeed</source>
-      <translation>Baro/Airspeed</translation>
+      <translation type="unfinished">Baro/Airspeed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="727"/>
       <source>Pressure</source>
-      <translation>Pressure</translation>
+      <translation type="unfinished">Pressure</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="732"/>
       <source>CompassMot</source>
-      <translation>CompassMot</translation>
+      <translation type="unfinished">CompassMot</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="754"/>
       <source>Next</source>
-      <translation>Next</translation>
+      <translation type="unfinished">Next</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="762"/>
       <source>Cancel</source>
-      <translation>Cancel</translation>
+      <translation type="unfinished">Cancel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="832"/>
@@ -3117,7 +3117,7 @@ Click Ok to start calibration.</translation>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="868"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="877"/>
       <source>Rotate</source>
-      <translation>Rotate</translation>
+      <translation type="unfinished">Rotate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="832"/>
@@ -3127,17 +3127,17 @@ Click Ok to start calibration.</translation>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="868"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="877"/>
       <source>Hold Still</source>
-      <translation>Hold Still</translation>
+      <translation type="unfinished">Hold Still</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.h" line="35"/>
       <source>Sensors</source>
-      <translation>Sensors</translation>
+      <translation type="unfinished">Sensors</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.h" line="27"/>
       <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation>Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
+      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
     </message>
   </context>
   <context>
@@ -3145,64 +3145,64 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="144"/>
       <source>Calibration complete</source>
-      <translation>Calibration complete</translation>
+      <translation type="unfinished">Calibration complete</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="158"/>
       <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation>Calibration failed. Calibration log will be displayed.</translation>
+      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="222"/>
       <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
+      <translation type="unfinished">Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="329"/>
       <source>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</source>
-      <translation>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
+      <translation type="unfinished">Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="330"/>
       <source>Quickly bring the throttle back down to zero</source>
-      <translation>Quickly bring the throttle back down to zero</translation>
+      <translation type="unfinished">Quickly bring the throttle back down to zero</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="331"/>
       <source>Press the Next button to complete the calibration</source>
-      <translation>Press the Next button to complete the calibration</translation>
+      <translation type="unfinished">Press the Next button to complete the calibration</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="340"/>
       <source>Hold the vehicle in its level flight position.</source>
-      <translation>Hold the vehicle in its level flight position.</translation>
+      <translation type="unfinished">Hold the vehicle in its level flight position.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
       <source>Requesting pressure calibration...</source>
-      <translation>Requesting pressure calibration...</translation>
+      <translation type="unfinished">Requesting pressure calibration...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="358"/>
       <source>Requesting gyro calibration...</source>
-      <translation>Requesting gyro calibration...</translation>
+      <translation type="unfinished">Requesting gyro calibration...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="243"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="486"/>
       <source>Successfully completed</source>
-      <translation>Successfully completed</translation>
+      <translation type="unfinished">Successfully completed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="246"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="490"/>
       <source>Failed</source>
-      <translation>Failed</translation>
+      <translation type="unfinished">Failed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="284"/>
       <source>Hold still in the current orientation and press Next when ready</source>
-      <translation>Hold still in the current orientation and press Next when ready</translation>
+      <translation type="unfinished">Hold still in the current orientation and press Next when ready</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="483"/>
@@ -3212,37 +3212,37 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="545"/>
       <source>Compass %1 calibration complete</source>
-      <translation>Compass %1 calibration complete</translation>
+      <translation type="unfinished">Compass %1 calibration complete</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="547"/>
       <source>Compass %1 calibration below quality threshold</source>
-      <translation>Compass %1 calibration below quality threshold</translation>
+      <translation type="unfinished">Compass %1 calibration below quality threshold</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="566"/>
       <source>All compasses calibrated successfully</source>
-      <translation>All compasses calibrated successfully</translation>
+      <translation type="unfinished">All compasses calibrated successfully</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="567"/>
       <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
+      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="570"/>
       <source>Compass calibration failed</source>
-      <translation>Compass calibration failed</translation>
+      <translation type="unfinished">Compass calibration failed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="571"/>
       <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
+      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="575"/>
       <source>Continue rotating...</source>
-      <translation>Continue rotating...</translation>
+      <translation type="unfinished">Continue rotating...</translation>
     </message>
   </context>
   <context>
@@ -3256,12 +3256,12 @@ Click Ok to start calibration.</translation>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="74"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
       <source>Not installed</source>
-      <translation>Not installed</translation>
+      <translation type="unfinished">Not installed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="73"/>
@@ -3281,7 +3281,7 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="74"/>
       <source>Ready</source>
-      <translation>Ready</translation>
+      <translation type="unfinished">Ready</translation>
     </message>
   </context>
   <context>
@@ -3289,17 +3289,17 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.h" line="35"/>
       <source>Frame</source>
-      <translation>Frame</translation>
+      <translation type="unfinished">Frame</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.h" line="24"/>
       <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
+      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="202"/>
       <source>Frame selection</source>
-      <translation>Frame selection</translation>
+      <translation type="unfinished">Frame selection</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="211"/>
@@ -3314,17 +3314,17 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="218"/>
       <source>Yes, Load default parameter set for %1</source>
-      <translation>Yes, Load default parameter set for %1</translation>
+      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="231"/>
       <source>No, set frame only</source>
-      <translation>No, set frame only</translation>
+      <translation type="unfinished">No, set frame only</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="232"/>
       <source>Confirm frame %1</source>
-      <translation>Confirm frame %1</translation>
+      <translation type="unfinished">Confirm frame %1</translation>
     </message>
   </context>
   <context>
@@ -3332,23 +3332,23 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
       <source>Frame Type</source>
-      <translation>Frame Type</translation>
+      <translation type="unfinished">Frame Type</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
       <source>Firmware Version</source>
-      <translation>Firmware Version</translation>
+      <translation type="unfinished">Firmware Version</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
       <source>Git Revision</source>
-      <translation>Git Revision</translation>
+      <translation type="unfinished">Git Revision</translation>
     </message>
   </context>
   <context>
@@ -3414,37 +3414,37 @@ Click Ok to start calibration.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
       <source>Reverse Motor Direction</source>
-      <translation>Reverse Motor Direction</translation>
+      <translation type="unfinished">Reverse Motor Direction</translation>
     </message>
     <message>
       <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>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.
+      <translation type="unfinished">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.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
       <source>A 10 second coooldown is required before testing again, please stand by...</source>
-      <translation>A 10 second coooldown is required before testing again, please stand by...</translation>
+      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
       <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
-      <translation>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
+      <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
       <source>Automatic Motor Direction Detection</source>
-      <translation>Automatic Motor Direction Detection</translation>
+      <translation type="unfinished">Automatic Motor Direction Detection</translation>
     </message>
     <message>
       <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>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
+      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
 Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
     </message>
   </context>
@@ -3466,12 +3466,12 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.h" line="33"/>
       <source>Tuning</source>
-      <translation>Tuning</translation>
+      <translation type="unfinished">Tuning</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.h" line="24"/>
       <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation>Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
+      <translation type="unfinished">Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
     </message>
   </context>
   <context>
@@ -3479,137 +3479,137 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="127"/>
       <source>Basic Tuning</source>
-      <translation>Basic Tuning</translation>
+      <translation type="unfinished">Basic Tuning</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="151"/>
       <source>Roll/Pitch Sensitivity</source>
-      <translation>Roll/Pitch Sensitivity</translation>
+      <translation type="unfinished">Roll/Pitch Sensitivity</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="156"/>
       <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
-      <translation>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
+      <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="184"/>
       <source>Climb Sensitivity</source>
-      <translation>Climb Sensitivity</translation>
+      <translation type="unfinished">Climb Sensitivity</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="189"/>
       <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
-      <translation>Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
+      <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="217"/>
       <source>RC Roll/Pitch Feel</source>
-      <translation>RC Roll/Pitch Feel</translation>
+      <translation type="unfinished">RC Roll/Pitch Feel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="222"/>
       <source>Slide to the left for soft control, slide to the right for crisp control</source>
-      <translation>Slide to the left for soft control, slide to the right for crisp control</translation>
+      <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="247"/>
       <source>Spin While Armed</source>
-      <translation>Spin While Armed</translation>
+      <translation type="unfinished">Spin While Armed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="252"/>
       <source>Adjust the amount the motors spin to indicate armed</source>
-      <translation>Adjust the amount the motors spin to indicate armed</translation>
+      <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="277"/>
       <source>Minimum Thrust</source>
-      <translation>Minimum Thrust</translation>
+      <translation type="unfinished">Minimum Thrust</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="282"/>
       <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
-      <translation>Adjust the minimum amount of thrust require for the vehicle to move</translation>
+      <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="286"/>
       <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
-      <translation>Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
+      <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="322"/>
       <source>AutoTune</source>
-      <translation>AutoTune</translation>
+      <translation type="unfinished">AutoTune</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="343"/>
       <source>Axes to AutoTune:</source>
-      <translation>Axes to AutoTune:</translation>
+      <translation type="unfinished">Axes to AutoTune:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="352"/>
       <source>Channel for AutoTune switch:</source>
-      <translation>Channel for AutoTune switch:</translation>
+      <translation type="unfinished">Channel for AutoTune switch:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>None</source>
-      <translation>None</translation>
+      <translation type="unfinished">None</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>Channel 7</source>
-      <translation>Channel 7</translation>
+      <translation type="unfinished">Channel 7</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>Channel 8</source>
-      <translation>Channel 8</translation>
+      <translation type="unfinished">Channel 8</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>Channel 9</source>
-      <translation>Channel 9</translation>
+      <translation type="unfinished">Channel 9</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>Channel 10</source>
-      <translation>Channel 10</translation>
+      <translation type="unfinished">Channel 10</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>Channel 11</source>
-      <translation>Channel 11</translation>
+      <translation type="unfinished">Channel 11</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="358"/>
       <source>Channel 12</source>
-      <translation>Channel 12</translation>
+      <translation type="unfinished">Channel 12</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="382"/>
       <source>In Flight Tuning</source>
-      <translation>In Flight Tuning</translation>
+      <translation type="unfinished">In Flight Tuning</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="406"/>
       <source>RC Channel 6 Option (Tuning):</source>
-      <translation>RC Channel 6 Option (Tuning):</translation>
+      <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="424"/>
       <source>Min:</source>
-      <translation>Min:</translation>
+      <translation type="unfinished">Min:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="436"/>
       <source>Max:</source>
-      <translation>Max:</translation>
+      <translation type="unfinished">Max:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="467"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="474"/>
@@ -3634,7 +3634,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="508"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="515"/>
@@ -3659,7 +3659,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="549"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="556"/>
@@ -3682,17 +3682,17 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
       <source>Attitude Controller Parameters</source>
-      <translation>Attitude Controller Parameters</translation>
+      <translation type="unfinished">Attitude Controller Parameters</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
       <source>Position Controller Parameters</source>
-      <translation>Position Controller Parameters</translation>
+      <translation type="unfinished">Position Controller Parameters</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
       <source>Waypoint navigation parameters</source>
-      <translation>Waypoint navigation parameters</translation>
+      <translation type="unfinished">Waypoint navigation parameters</translation>
     </message>
   </context>
   <context>
@@ -3886,26 +3886,26 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="44"/>
       <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation>Your vehicle is using a custom airframe configuration. </translation>
+      <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
       <source>This configuration can only be modified through the Parameter Editor.
 
 </source>
-      <translation>This configuration can only be modified through the Parameter Editor.
+      <translation type="unfinished">This configuration can only be modified through the Parameter Editor.
 
 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="46"/>
       <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
-      <translation>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
+      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="49"/>
       <source>Reset</source>
-      <translation>Reset</translation>
+      <translation type="unfinished">Reset</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="121"/>
@@ -3915,33 +3915,33 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="111"/>
       <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
-      <translation>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
+      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="109"/>
       <source>You&apos;ve connected a %1.</source>
-      <translation>You&apos;ve connected a %1.</translation>
+      <translation type="unfinished">You&apos;ve connected a %1.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="110"/>
       <source>Airframe is not set.</source>
-      <translation>Airframe is not set.</translation>
+      <translation type="unfinished">Airframe is not set.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="119"/>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="120"/>
       <source>Apply and Restart</source>
-      <translation>Apply and Restart</translation>
+      <translation type="unfinished">Apply and Restart</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="20"/>
       <source>Airframe</source>
-      <translation>Airframe</translation>
+      <translation type="unfinished">Airframe</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="32"/>
       <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>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
+      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
     </message>
   </context>
   <context>
@@ -3949,7 +3949,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="89"/>
       <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation>You cannot change airframe configuration while connected to multiple vehicles.</translation>
+      <translation type="unfinished">You cannot change airframe configuration while connected to multiple vehicles.</translation>
     </message>
   </context>
   <context>
@@ -3957,38 +3957,38 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
       <source>System ID</source>
-      <translation>System ID</translation>
+      <translation type="unfinished">System ID</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
       <source>Airframe type</source>
-      <translation>Airframe type</translation>
+      <translation type="unfinished">Airframe type</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
       <source>Firmware Version</source>
-      <translation>Firmware Version</translation>
+      <translation type="unfinished">Firmware Version</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
       <source>Custom Fw. Ver.</source>
-      <translation>Custom Fw. Ver.</translation>
+      <translation type="unfinished">Custom Fw. Ver.</translation>
     </message>
   </context>
   <context>
@@ -4004,115 +4004,115 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
       <source>Select Altitude Mode</source>
-      <translation>Select Altitude Mode</translation>
+      <translation type="unfinished">Select Altitude Mode</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="51"/>
       <source>Relative To Launch</source>
-      <translation>Relative To Launch</translation>
+      <translation type="unfinished">Relative To Launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
       <source>Specified altitudes are relative to launch position height.</source>
-      <translation>Specified altitudes are relative to launch position height.</translation>
+      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="56"/>
       <source>AMSL</source>
-      <translation>AMSL</translation>
+      <translation type="unfinished">AMSL</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
       <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation>Specified altitudes are Above Mean Sea Level.</translation>
+      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="61"/>
       <source>Calculated Above Terrain</source>
-      <translation>Calculated Above Terrain</translation>
+      <translation type="unfinished">Calculated Above Terrain</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
       <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
+      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="66"/>
       <source>Terrain Frame</source>
-      <translation>Terrain Frame</translation>
+      <translation type="unfinished">Terrain Frame</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
       <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
+      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="71"/>
       <source>Mixed Modes</source>
-      <translation>Mixed Modes</translation>
+      <translation type="unfinished">Mixed Modes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="72"/>
       <source>The altitude mode can differ for each individual item.</source>
-      <translation>The altitude mode can differ for each individual item.</translation>
+      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
-      <translation>GStreamer Debug Level</translation>
+      <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
-      <translation>Logging categories</translation>
+      <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
-      <translation>Search:</translation>
+      <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
-      <translation>Clear</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
-      <translation>Clear All</translation>
+      <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
-      <translation>Log files (*.txt)</translation>
+      <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
-      <translation>Select log save file</translation>
+      <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
-      <translation>Save App Log</translation>
+      <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
-      <translation>Show Latest</translation>
+      <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
-      <translation>Set Logging</translation>
+      <translation type="unfinished">Set Logging</translation>
     </message>
   </context>
   <context>
@@ -4120,37 +4120,37 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.h" line="107"/>
       <source>Parameters</source>
-      <translation>Parameters</translation>
+      <translation type="unfinished">Parameters</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="108"/>
       <source>Telemetry</source>
-      <translation>Telemetry</translation>
+      <translation type="unfinished">Telemetry</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="109"/>
       <source>Missions</source>
-      <translation>Missions</translation>
+      <translation type="unfinished">Missions</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="110"/>
       <source>Logs</source>
-      <translation>Logs</translation>
+      <translation type="unfinished">Logs</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="111"/>
       <source>Video</source>
-      <translation>Video</translation>
+      <translation type="unfinished">Video</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="112"/>
       <source>Photo</source>
-      <translation>Photo</translation>
+      <translation type="unfinished">Photo</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="113"/>
       <source>CrashLogs</source>
-      <translation>CrashLogs</translation>
+      <translation type="unfinished">CrashLogs</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="114"/>
@@ -4170,7 +4170,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="204"/>
       <source> (Partial)</source>
-      <translation> (Partial)</translation>
+      <translation type="unfinished"> (Partial)</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="212"/>
@@ -4183,22 +4183,22 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/UI/toolbar/ArmedIndicator.qml" line="24"/>
       <source>Armed</source>
-      <translation>Armed</translation>
+      <translation type="unfinished">Armed</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/ArmedIndicator.qml" line="24"/>
       <source>Disarmed</source>
-      <translation>Disarmed</translation>
+      <translation type="unfinished">Disarmed</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/ArmedIndicator.qml" line="25"/>
       <source>Arm</source>
-      <translation>Arm</translation>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/ArmedIndicator.qml" line="25"/>
       <source>Disarm</source>
-      <translation>Disarm</translation>
+      <translation type="unfinished">Disarm</translation>
     </message>
   </context>
   <context>
@@ -4214,7 +4214,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
       <source>One or more vehicle components require setup prior to flight.</source>
-      <translation>One or more vehicle components require setup prior to flight.</translation>
+      <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
     </message>
   </context>
   <context>
@@ -4222,72 +4222,72 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="31"/>
       <source>Autotune: In progress</source>
-      <translation>Autotune: In progress</translation>
+      <translation type="unfinished">Autotune: In progress</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="85"/>
       <source>Autotune: initializing</source>
-      <translation>Autotune: initializing</translation>
+      <translation type="unfinished">Autotune: initializing</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="88"/>
       <source>Autotune: roll</source>
-      <translation>Autotune: roll</translation>
+      <translation type="unfinished">Autotune: roll</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="91"/>
       <source>Autotune: pitch</source>
-      <translation>Autotune: pitch</translation>
+      <translation type="unfinished">Autotune: pitch</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="94"/>
       <source>Autotune: yaw</source>
-      <translation>Autotune: yaw</translation>
+      <translation type="unfinished">Autotune: yaw</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="97"/>
       <source>Wait for disarm</source>
-      <translation>Wait for disarm</translation>
+      <translation type="unfinished">Wait for disarm</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="100"/>
       <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation>Land and disarm the vehicle in order to apply the parameters.</translation>
+      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
       <source>Autotune: in progress</source>
-      <translation>Autotune: in progress</translation>
+      <translation type="unfinished">Autotune: in progress</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="112"/>
       <source>Autotune: Success</source>
-      <translation>Autotune: Success</translation>
+      <translation type="unfinished">Autotune: Success</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="114"/>
       <source>Autotune successful.</source>
-      <translation>Autotune successful.</translation>
+      <translation type="unfinished">Autotune successful.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
       <source>Autotune: Unknown error</source>
-      <translation>Autotune: Unknown error</translation>
+      <translation type="unfinished">Autotune: Unknown error</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="129"/>
       <source>Autotune: Failed</source>
-      <translation>Autotune: Failed</translation>
+      <translation type="unfinished">Autotune: Failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="139"/>
       <source>Autotune: Ack error %1</source>
-      <translation>Autotune: Ack error %1</translation>
+      <translation type="unfinished">Autotune: Ack error %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.h" line="56"/>
       <source>Autotune: Not performed</source>
-      <translation>Autotune: Not performed</translation>
+      <translation type="unfinished">Autotune: Not performed</translation>
     </message>
   </context>
   <context>
@@ -4328,7 +4328,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
       <source>Not Mapped</source>
-      <translation>Not Mapped</translation>
+      <translation type="unfinished">Not Mapped</translation>
     </message>
   </context>
   <context>
@@ -4337,7 +4337,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="142"/>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="319"/>
       <source>100%</source>
-      <translation>100%</translation>
+      <translation type="unfinished">100%</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="151"/>
@@ -4348,7 +4348,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="224"/>
       <source>Battery %1</source>
-      <translation>Battery %1</translation>
+      <translation type="unfinished">Battery %1</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="224"/>
@@ -4358,33 +4358,33 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="238"/>
       <source>Charge State</source>
-      <translation>Charge State</translation>
+      <translation type="unfinished">Charge State</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="244"/>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="250"/>
       <source>Remaining</source>
-      <translation>Remaining</translation>
+      <translation type="unfinished">Remaining</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="256"/>
       <source>Voltage</source>
-      <translation>Voltage</translation>
+      <translation type="unfinished">Voltage</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="261"/>
       <source>Consumed</source>
-      <translation>Consumed</translation>
+      <translation type="unfinished">Consumed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="267"/>
       <source>Temperature</source>
-      <translation>Temperature</translation>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="273"/>
       <source>Function</source>
-      <translation>Function</translation>
+      <translation type="unfinished">Function</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="291"/>
@@ -4435,12 +4435,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="108"/>
       <source>Bluetooth Link Settings</source>
-      <translation>Bluetooth Link Settings</translation>
+      <translation type="unfinished">Bluetooth Link Settings</translation>
     </message>
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="111"/>
       <source>Bluetooth Not Available</source>
-      <translation>Bluetooth Not Available</translation>
+      <translation type="unfinished">Bluetooth Not Available</translation>
     </message>
   </context>
   <context>
@@ -4448,7 +4448,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="431"/>
       <source>Bluetooth Link Error</source>
-      <translation>Bluetooth Link Error</translation>
+      <translation type="unfinished">Bluetooth Link Error</translation>
     </message>
     <message>
       <location filename="../src/Comms/BluetoothLink.cc" line="431"/>
@@ -4461,27 +4461,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="31"/>
       <source>Device</source>
-      <translation>Device</translation>
+      <translation type="unfinished">Device</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="37"/>
       <source>Address</source>
-      <translation>Address</translation>
+      <translation type="unfinished">Address</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="44"/>
       <source>Bluetooth Devices</source>
-      <translation>Bluetooth Devices</translation>
+      <translation type="unfinished">Bluetooth Devices</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="67"/>
       <source>Scan</source>
-      <translation>Scan</translation>
+      <translation type="unfinished">Scan</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="73"/>
       <source>Stop</source>
-      <translation>Stop</translation>
+      <translation type="unfinished">Stop</translation>
     </message>
   </context>
   <context>
@@ -4517,158 +4517,158 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="226"/>
       <source>Write failed: %1</source>
-      <translation>Write failed: %1</translation>
+      <translation type="unfinished">Write failed: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="231"/>
       <source>Incorrect number of bytes returned for write: actual(%1) expected(%2)</source>
-      <translation>Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
+      <translation type="unfinished">Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="252"/>
       <source>Timeout waiting for bytes to be available</source>
-      <translation>Timeout waiting for bytes to be available</translation>
+      <translation type="unfinished">Timeout waiting for bytes to be available</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="262"/>
       <source>Read failed: error: %1</source>
-      <translation>Read failed: error: %1</translation>
+      <translation type="unfinished">Read failed: error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="276"/>
       <source>Get Command Response: </source>
-      <translation>Get Command Response: </translation>
+      <translation type="unfinished">Get Command Response: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="282"/>
       <source>Invalid sync response: 0x%1 0x%2</source>
-      <translation>Invalid sync response: 0x%1 0x%2</translation>
+      <translation type="unfinished">Invalid sync response: 0x%1 0x%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="285"/>
       <source>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</source>
-      <translation>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
+      <translation type="unfinished">This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="288"/>
       <source>Unknown response code</source>
-      <translation>Unknown response code</translation>
+      <translation type="unfinished">Unknown response code</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="294"/>
       <source>Command failed: 0x%1 (%2)</source>
-      <translation>Command failed: 0x%1 (%2)</translation>
+      <translation type="unfinished">Command failed: 0x%1 (%2)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="158"/>
       <source>Get Board Info: </source>
-      <translation>Get Board Info: </translation>
+      <translation type="unfinished">Get Board Info: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="344"/>
       <source>Send Command: </source>
-      <translation>Send Command: </translation>
+      <translation type="unfinished">Send Command: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="352"/>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="518"/>
       <source>Unable to open firmware file %1: %2</source>
-      <translation>Unable to open firmware file %1: %2</translation>
+      <translation type="unfinished">Unable to open firmware file %1: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="373"/>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="543"/>
       <source>Firmware file read failed: %1</source>
-      <translation>Firmware file read failed: %1</translation>
+      <translation type="unfinished">Firmware file read failed: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="389"/>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="472"/>
       <source>Flash failed: %1 at address 0x%2</source>
-      <translation>Flash failed: %1 at address 0x%2</translation>
+      <translation type="unfinished">Flash failed: %1 at address 0x%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="423"/>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="595"/>
       <source>Unable to retrieve block from ihx: index %1</source>
-      <translation>Unable to retrieve block from ihx: index %1</translation>
+      <translation type="unfinished">Unable to retrieve block from ihx: index %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="443"/>
       <source>Unable to set flash start address: 0x%2</source>
-      <translation>Unable to set flash start address: 0x%2</translation>
+      <translation type="unfinished">Unable to set flash start address: 0x%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="561"/>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="646"/>
       <source>Read failed: %1 at address: 0x%2</source>
-      <translation>Read failed: %1 at address: 0x%2</translation>
+      <translation type="unfinished">Read failed: %1 at address: 0x%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="567"/>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="654"/>
       <source>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</source>
-      <translation>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
+      <translation type="unfinished">Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="615"/>
       <source>Unable to set read start address: 0x%2</source>
-      <translation>Unable to set read start address: 0x%2</translation>
+      <translation type="unfinished">Unable to set read start address: 0x%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="691"/>
       <source>CRC mismatch: board(0x%1) file(0x%2)</source>
-      <translation>CRC mismatch: board(0x%1) file(0x%2)</translation>
+      <translation type="unfinished">CRC mismatch: board(0x%1) file(0x%2)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="42"/>
       <source>Open failed on port %1: %2</source>
-      <translation>Open failed on port %1: %2</translation>
+      <translation type="unfinished">Open failed on port %1: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="94"/>
       <source>Unable to put radio into command mode +++</source>
-      <translation>Unable to put radio into command mode +++</translation>
+      <translation type="unfinished">Unable to put radio into command mode +++</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="99"/>
       <source>Radio did not respond to command mode</source>
-      <translation>Radio did not respond to command mode</translation>
+      <translation type="unfinished">Radio did not respond to command mode</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="107"/>
       <source>Radio did not respond to ATI2 command</source>
-      <translation>Radio did not respond to ATI2 command</translation>
+      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="114"/>
       <source>Radio did not return board id</source>
-      <translation>Radio did not return board id</translation>
+      <translation type="unfinished">Radio did not return board id</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="131"/>
       <source>Found unsupported bootloader version: %1</source>
-      <translation>Found unsupported bootloader version: %1</translation>
+      <translation type="unfinished">Found unsupported bootloader version: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="167"/>
       <source>Unable to reboot radio (ready read)</source>
-      <translation>Unable to reboot radio (ready read)</translation>
+      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="183"/>
       <source>Erase failed: %1</source>
-      <translation>Erase failed: %1</translation>
+      <translation type="unfinished">Erase failed: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="321"/>
       <source>Get Device: </source>
-      <translation>Get Device: </translation>
+      <translation type="unfinished">Get Device: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="749"/>
       <source>Get Board Id: </source>
-      <translation>Get Board Id: </translation>
+      <translation type="unfinished">Get Board Id: </translation>
     </message>
   </context>
   <context>
@@ -4676,17 +4676,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/CameraCalc.cc" line="225"/>
       <source>CameraCalc section version %1 not supported</source>
-      <translation>CameraCalc section version %1 not supported</translation>
+      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/CameraCalc.cc" line="297"/>
       <source>Custom Camera</source>
-      <translation>Custom Camera</translation>
+      <translation type="unfinished">Custom Camera</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/CameraCalc.cc" line="302"/>
       <source>Manual (no camera specs)</source>
-      <translation>Manual (no camera specs)</translation>
+      <translation type="unfinished">Manual (no camera specs)</translation>
     </message>
   </context>
   <context>
@@ -4694,27 +4694,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/CameraCalcCamera.qml" line="107"/>
       <source>Width</source>
-      <translation>Width</translation>
+      <translation type="unfinished">Width</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcCamera.qml" line="111"/>
       <source>Height</source>
-      <translation>Height</translation>
+      <translation type="unfinished">Height</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcCamera.qml" line="119"/>
       <source>Sensor</source>
-      <translation>Sensor</translation>
+      <translation type="unfinished">Sensor</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcCamera.qml" line="134"/>
       <source>Image</source>
-      <translation>Image</translation>
+      <translation type="unfinished">Image</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcCamera.qml" line="149"/>
       <source>Focal length</source>
-      <translation>Focal length</translation>
+      <translation type="unfinished">Focal length</translation>
     </message>
   </context>
   <context>
@@ -4722,27 +4722,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/CameraCalcGrid.qml" line="45"/>
       <source>Front Lap</source>
-      <translation>Front Lap</translation>
+      <translation type="unfinished">Front Lap</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcGrid.qml" line="49"/>
       <source>Side Lap</source>
-      <translation>Side Lap</translation>
+      <translation type="unfinished">Side Lap</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcGrid.qml" line="57"/>
       <source>Overlap</source>
-      <translation>Overlap</translation>
+      <translation type="unfinished">Overlap</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcGrid.qml" line="70"/>
       <source>Select one:</source>
-      <translation>Select one:</translation>
+      <translation type="unfinished">Select one:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraCalcGrid.qml" line="100"/>
       <source>Grnd Res</source>
-      <translation>Grnd Res</translation>
+      <translation type="unfinished">Grnd Res</translation>
     </message>
   </context>
   <context>
@@ -4750,37 +4750,37 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="29"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="54"/>
       <source>Time</source>
-      <translation>Time</translation>
+      <translation type="unfinished">Time</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="70"/>
       <source>Distance</source>
-      <translation>Distance</translation>
+      <translation type="unfinished">Distance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="87"/>
       <source>Mode</source>
-      <translation>Mode</translation>
+      <translation type="unfinished">Mode</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="107"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="108"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CameraSection.qml" line="106"/>
       <source>Gimbal</source>
-      <translation>Gimbal</translation>
+      <translation type="unfinished">Gimbal</translation>
     </message>
   </context>
   <context>
@@ -4788,42 +4788,42 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="162"/>
       <source>Center map on:</source>
-      <translation>Center map on:</translation>
+      <translation type="unfinished">Center map on:</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="165"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="177"/>
       <source>All items</source>
-      <translation>All items</translation>
+      <translation type="unfinished">All items</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
       <source>Launch</source>
-      <translation>Launch</translation>
+      <translation type="unfinished">Launch</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
       <source>Current Location</source>
-      <translation>Current Location</translation>
+      <translation type="unfinished">Current Location</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="212"/>
       <source>Specified Location</source>
-      <translation>Specified Location</translation>
+      <translation type="unfinished">Specified Location</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
       <source>Follow Vehicle</source>
-      <translation>Follow Vehicle</translation>
+      <translation type="unfinished">Follow Vehicle</translation>
     </message>
   </context>
   <context>
@@ -4831,37 +4831,37 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="29"/>
       <source>Center map on:</source>
-      <translation>Center map on:</translation>
+      <translation type="unfinished">Center map on:</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="32"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="43"/>
       <source>All items</source>
-      <translation>All items</translation>
+      <translation type="unfinished">All items</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
       <source>Launch</source>
-      <translation>Launch</translation>
+      <translation type="unfinished">Launch</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
       <source>Current Location</source>
-      <translation>Current Location</translation>
+      <translation type="unfinished">Current Location</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="86"/>
       <source>Specified Location</source>
-      <translation>Specified Location</translation>
+      <translation type="unfinished">Specified Location</translation>
     </message>
   </context>
   <context>
@@ -4869,12 +4869,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/ComponentInformation/CompInfoParam.cc" line="135"/>
       <source>Component %1</source>
-      <translation>Component %1</translation>
+      <translation type="unfinished">Component %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/ComponentInformation/CompInfoParam.cc" line="270"/>
       <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation>Internal Error: Parameter MetaData major must be 1</translation>
+      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
     </message>
   </context>
   <context>
@@ -4883,12 +4883,12 @@ Click Ok to start the auto-tuning process.
       <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>This Pattern does not support Presets.</translation>
+      <translation type="unfinished">This Pattern does not support Presets.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/ComplexMissionItem.cc" line="65"/>
       <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation>&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
+      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
     </message>
   </context>
   <context>
@@ -4904,24 +4904,24 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="115"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation>%1 does not support loading this complex mission item type: %2:%3</translation>
+      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="122"/>
       <source>%1 complex item version %2 not supported</source>
-      <translation>%1 complex item version %2 not supported</translation>
+      <translation type="unfinished">%1 complex item version %2 not supported</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="22"/>
       <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="51"/>
       <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
       <source>Corridor Scan</source>
-      <translation>Corridor Scan</translation>
+      <translation type="unfinished">Corridor Scan</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
       <source>C</source>
-      <translation>C</translation>
+      <translation type="unfinished">C</translation>
     </message>
   </context>
   <context>
@@ -4929,27 +4929,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="17"/>
       <source>Corridor</source>
-      <translation>Corridor</translation>
+      <translation type="unfinished">Corridor</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="36"/>
       <source>Width</source>
-      <translation>Width</translation>
+      <translation type="unfinished">Width</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="43"/>
       <source>Turnaround dist</source>
-      <translation>Turnaround dist</translation>
+      <translation type="unfinished">Turnaround dist</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="16"/>
       <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation>Use the Polyline Tools to create the polyline which defines the corridor.</translation>
+      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/CorridorScanEditor.qml" line="54"/>
       <source>Images in turnarounds</source>
-      <translation>Images in turnarounds</translation>
+      <translation type="unfinished">Images in turnarounds</translation>
     </message>
   </context>
   <context>
@@ -5110,87 +5110,87 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
       <source>Generic Initial checks</source>
-      <translation>Generic Initial checks</translation>
+      <translation type="unfinished">Generic Initial checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
       <source>Hardware</source>
-      <translation>Hardware</translation>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
       <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation>Props mounted? Wings secured? Tail secured?</translation>
+      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>Please arm the vehicle here</translation>
+      <translation type="unfinished">Please arm the vehicle here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
       <source>Actuators</source>
-      <translation>Actuators</translation>
+      <translation type="unfinished">Actuators</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
       <source>Move all control surfaces. Did they work properly?</source>
-      <translation>Move all control surfaces. Did they work properly?</translation>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
       <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation>Propellers free? Then throttle up gently. Working properly?</translation>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
       <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation>Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
       <source>Last preparations before launch</source>
-      <translation>Last preparations before launch</translation>
+      <translation type="unfinished">Last preparations before launch</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
       <source>Payload</source>
-      <translation>Payload</translation>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
       <source>Configured and started? Payload lid closed?</source>
-      <translation>Configured and started? Payload lid closed?</translation>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
       <source>Wind &amp; weather</source>
-      <translation>Wind &amp; weather</translation>
+      <translation type="unfinished">Wind &amp; weather</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
       <source>OK for your platform? Lauching into the wind?</source>
-      <translation>OK for your platform? Lauching into the wind?</translation>
+      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
       <source>Flight area</source>
-      <translation>Flight area</translation>
+      <translation type="unfinished">Flight area</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
       <source>Launch area and path free of obstacles/people?</source>
-      <translation>Launch area and path free of obstacles/people?</translation>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
     </message>
   </context>
   <context>
@@ -5198,133 +5198,133 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="33"/>
       <source>controller WiFi Bridge</source>
-      <translation>controller WiFi Bridge</translation>
+      <translation type="unfinished">controller WiFi Bridge</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="66"/>
       <source>Error fetching WiFi Bridge Status: %1</source>
-      <translation>Error fetching WiFi Bridge Status: %1</translation>
+      <translation type="unfinished">Error fetching WiFi Bridge Status: %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="116"/>
       <source>ESP WiFi Bridge Settings</source>
-      <translation>ESP WiFi Bridge Settings</translation>
+      <translation type="unfinished">ESP WiFi Bridge Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="143"/>
       <source>WiFi Mode</source>
-      <translation>WiFi Mode</translation>
+      <translation type="unfinished">WiFi Mode</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="159"/>
       <source>WiFi Channel</source>
-      <translation>WiFi Channel</translation>
+      <translation type="unfinished">WiFi Channel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="176"/>
       <source>WiFi AP SSID</source>
-      <translation>WiFi AP SSID</translation>
+      <translation type="unfinished">WiFi AP SSID</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="192"/>
       <source>WiFi AP Password</source>
-      <translation>WiFi AP Password</translation>
+      <translation type="unfinished">WiFi AP Password</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="208"/>
       <source>WiFi STA SSID</source>
-      <translation>WiFi STA SSID</translation>
+      <translation type="unfinished">WiFi STA SSID</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="225"/>
       <source>WiFi STA Password</source>
-      <translation>WiFi STA Password</translation>
+      <translation type="unfinished">WiFi STA Password</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="242"/>
       <source>UART Baud Rate</source>
-      <translation>UART Baud Rate</translation>
+      <translation type="unfinished">UART Baud Rate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="258"/>
       <source>QGC UDP Port</source>
-      <translation>QGC UDP Port</translation>
+      <translation type="unfinished">QGC UDP Port</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="277"/>
       <source>ESP WiFi Bridge Status</source>
-      <translation>ESP WiFi Bridge Status</translation>
+      <translation type="unfinished">ESP WiFi Bridge Status</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
       <source>Bridge/Vehicle Link</source>
-      <translation>Bridge/Vehicle Link</translation>
+      <translation type="unfinished">Bridge/Vehicle Link</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
       <source>Bridge/QGC Link</source>
-      <translation>Bridge/QGC Link</translation>
+      <translation type="unfinished">Bridge/QGC Link</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="298"/>
       <source>QGC/Bridge Link</source>
-      <translation>QGC/Bridge Link</translation>
+      <translation type="unfinished">QGC/Bridge Link</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="304"/>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="319"/>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="333"/>
       <source>Messages Received</source>
-      <translation>Messages Received</translation>
+      <translation type="unfinished">Messages Received</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="346"/>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="360"/>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="374"/>
       <source>Messages Lost</source>
-      <translation>Messages Lost</translation>
+      <translation type="unfinished">Messages Lost</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="388"/>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="402"/>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="416"/>
       <source>Messages Sent</source>
-      <translation>Messages Sent</translation>
+      <translation type="unfinished">Messages Sent</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="433"/>
       <source>Restore Defaults</source>
-      <translation>Restore Defaults</translation>
+      <translation type="unfinished">Restore Defaults</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="440"/>
       <source>Restart WiFi Bridge</source>
-      <translation>Restart WiFi Bridge</translation>
+      <translation type="unfinished">Restart WiFi Bridge</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="450"/>
       <source>Reboot WiFi Bridge</source>
-      <translation>Reboot WiFi Bridge</translation>
+      <translation type="unfinished">Reboot WiFi Bridge</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="451"/>
       <source>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</source>
-      <translation>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
+      <translation type="unfinished">This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="466"/>
       <source>Reset Counters</source>
-      <translation>Reset Counters</translation>
+      <translation type="unfinished">Reset Counters</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="14"/>
       <source>WiFi Bridge</source>
-      <translation>WiFi Bridge</translation>
+      <translation type="unfinished">WiFi Bridge</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.h" line="23"/>
       <source>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</source>
-      <translation>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
+      <translation type="unfinished">The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
     </message>
   </context>
   <context>
@@ -5332,12 +5332,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="29"/>
       <source>Firmware Version</source>
-      <translation>Firmware Version</translation>
+      <translation type="unfinished">Firmware Version</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="33"/>
       <source>WiFi Mode</source>
-      <translation>WiFi Mode</translation>
+      <translation type="unfinished">WiFi Mode</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="34"/>
@@ -5352,22 +5352,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="37"/>
       <source>WiFi Channel</source>
-      <translation>WiFi Channel</translation>
+      <translation type="unfinished">WiFi Channel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="42"/>
       <source>WiFi AP SSID</source>
-      <translation>WiFi AP SSID</translation>
+      <translation type="unfinished">WiFi AP SSID</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="46"/>
       <source>WiFi AP Password</source>
-      <translation>WiFi AP Password</translation>
+      <translation type="unfinished">WiFi AP Password</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="60"/>
       <source>UART Baud Rate</source>
-      <translation>UART Baud Rate</translation>
+      <translation type="unfinished">UART Baud Rate</translation>
     </message>
   </context>
   <context>
@@ -5408,12 +5408,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="56"/>
       <source>Latitude</source>
-      <translation>Latitude</translation>
+      <translation type="unfinished">Latitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="64"/>
       <source>Longitude</source>
-      <translation>Longitude</translation>
+      <translation type="unfinished">Longitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="72"/>
@@ -5434,27 +5434,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="82"/>
       <source>Zone</source>
-      <translation>Zone</translation>
+      <translation type="unfinished">Zone</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="90"/>
       <source>Hemisphere</source>
-      <translation>Hemisphere</translation>
+      <translation type="unfinished">Hemisphere</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="98"/>
       <source>Easting</source>
-      <translation>Easting</translation>
+      <translation type="unfinished">Easting</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="106"/>
       <source>Northing</source>
-      <translation>Northing</translation>
+      <translation type="unfinished">Northing</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
       <source>MGRS</source>
-      <translation>MGRS</translation>
+      <translation type="unfinished">MGRS</translation>
     </message>
   </context>
   <context>
@@ -5462,12 +5462,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="286"/>
       <source>Invalid Nak format</source>
-      <translation>Invalid Nak format</translation>
+      <translation type="unfinished">Invalid Nak format</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="288"/>
       <source>errno %1</source>
-      <translation>errno %1</translation>
+      <translation type="unfinished">errno %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="547"/>
@@ -5488,13 +5488,13 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/Vehicle/FTPManager.cc" line="675"/>
       <location filename="../src/Vehicle/FTPManager.cc" line="683"/>
       <source>Download failed</source>
-      <translation>Download failed</translation>
+      <translation type="unfinished">Download failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="420"/>
       <location filename="../src/Vehicle/FTPManager.cc" line="642"/>
       <source>Download failed: Error saving file</source>
-      <translation>Download failed: Error saving file</translation>
+      <translation type="unfinished">Download failed: Error saving file</translation>
     </message>
   </context>
   <context>
@@ -5502,18 +5502,18 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="40"/>
       <source>Set to vehicle heading</source>
-      <translation>Set to vehicle heading</translation>
+      <translation type="unfinished">Set to vehicle heading</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="41"/>
       <source>Set to vehicle location</source>
-      <translation>Set to vehicle location</translation>
+      <translation type="unfinished">Set to vehicle location</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="97"/>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="171"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="107"/>
@@ -5523,88 +5523,88 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="118"/>
       <source>Radius</source>
-      <translation>Radius</translation>
+      <translation type="unfinished">Radius</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="132"/>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="355"/>
       <source>Loiter clockwise</source>
-      <translation>Loiter clockwise</translation>
+      <translation type="unfinished">Loiter clockwise</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="148"/>
       <source>Landing point</source>
-      <translation>Landing point</translation>
+      <translation type="unfinished">Landing point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="164"/>
       <source>Heading</source>
-      <translation>Heading</translation>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="195"/>
       <source>Glide Slope</source>
-      <translation>Glide Slope</translation>
+      <translation type="unfinished">Glide Slope</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="220"/>
       <source>Altitudes relative to launch</source>
-      <translation>Altitudes relative to launch</translation>
+      <translation type="unfinished">Altitudes relative to launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="351"/>
       <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
-      <translation>Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
+      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="361"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="230"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="58"/>
       <source>Final approach</source>
-      <translation>Final approach</translation>
+      <translation type="unfinished">Final approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="70"/>
       <source>Use loiter to altitude</source>
-      <translation>Use loiter to altitude</translation>
+      <translation type="unfinished">Use loiter to altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="181"/>
       <source>Distance</source>
-      <translation>Distance</translation>
+      <translation type="unfinished">Distance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="268"/>
       <source>* Approximate glide slope altitudes.</source>
-      <translation>* Approximate glide slope altitudes.</translation>
+      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="277"/>
       <source>* Actual flight path will vary.</source>
-      <translation>* Actual flight path will vary.</translation>
+      <translation type="unfinished">* Actual flight path will vary.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="286"/>
       <source>* Avoid tailwind on landing.</source>
-      <translation>* Avoid tailwind on landing.</translation>
+      <translation type="unfinished">* Avoid tailwind on landing.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="312"/>
       <source>Click in map to set landing point.</source>
-      <translation>Click in map to set landing point.</translation>
+      <translation type="unfinished">Click in map to set landing point.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="319"/>
       <source>- or -</source>
-      <translation>- or -</translation>
+      <translation type="unfinished">- or -</translation>
     </message>
   </context>
   <context>
@@ -5612,22 +5612,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="278"/>
       <source>Loiter</source>
-      <translation>Loiter</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="278"/>
       <source>Approach</source>
-      <translation>Approach</translation>
+      <translation type="unfinished">Approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="332"/>
       <source>Landing Area</source>
-      <translation>Landing Area</translation>
+      <translation type="unfinished">Landing Area</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="370"/>
       <source>Glide Slope</source>
-      <translation>Glide Slope</translation>
+      <translation type="unfinished">Glide Slope</translation>
     </message>
   </context>
   <context>
@@ -5635,17 +5635,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FactSystem/Fact.cc" line="225"/>
       <source>Unknown: %1</source>
-      <translation>Unknown: %1</translation>
+      <translation type="unfinished">Unknown: %1</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/Fact.cc" line="339"/>
       <source>true</source>
-      <translation>true</translation>
+      <translation type="unfinished">true</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/Fact.cc" line="339"/>
       <source>false</source>
-      <translation>false</translation>
+      <translation type="unfinished">false</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/Fact.cc" line="745"/>
@@ -5663,12 +5663,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FactSystem/FactMetaData.h" line="224"/>
       <source>Other</source>
-      <translation>Other</translation>
+      <translation type="unfinished">Other</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/FactMetaData.h" line="225"/>
       <source>Misc</source>
-      <translation>Misc</translation>
+      <translation type="unfinished">Misc</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/FactMetaData.cc" line="311"/>
@@ -5684,13 +5684,13 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/FactSystem/FactMetaData.cc" line="433"/>
       <location filename="../src/FactSystem/FactMetaData.cc" line="442"/>
       <source>Value must be within %1 and %2</source>
-      <translation>Value must be within %1 and %2</translation>
+      <translation type="unfinished">Value must be within %1 and %2</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/FactMetaData.cc" line="373"/>
       <location filename="../src/FactSystem/FactMetaData.cc" line="461"/>
       <source>Invalid number</source>
-      <translation>Invalid number</translation>
+      <translation type="unfinished">Invalid number</translation>
     </message>
   </context>
   <context>
@@ -5698,7 +5698,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="41"/>
       <source>Value Details</source>
-      <translation>Value Details</translation>
+      <translation type="unfinished">Value Details</translation>
     </message>
   </context>
   <context>
@@ -5714,32 +5714,32 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FactValueGrid.cc" line="24"/>
       <source>Default</source>
-      <translation>Default</translation>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FactValueGrid.cc" line="25"/>
       <source>Small</source>
-      <translation>Small</translation>
+      <translation type="unfinished">Small</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FactValueGrid.cc" line="26"/>
       <source>Medium</source>
-      <translation>Medium</translation>
+      <translation type="unfinished">Medium</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FactValueGrid.cc" line="27"/>
       <source>Large</source>
-      <translation>Large</translation>
+      <translation type="unfinished">Large</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FactValueGrid.cc" line="332"/>
       <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
-      <translation>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
+      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FactValueGrid.cc" line="332"/>
       <source>Load Settings</source>
-      <translation>Load Settings</translation>
+      <translation type="unfinished">Load Settings</translation>
     </message>
   </context>
   <context>
@@ -5747,7 +5747,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FactSystem/FactControls/FactValueSlider.qml" line="100"/>
       <source>Value Details</source>
-      <translation>Value Details</translation>
+      <translation type="unfinished">Value Details</translation>
     </message>
   </context>
   <context>
@@ -5755,22 +5755,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="127"/>
       <source>PX4 Pro</source>
-      <translation>PX4 Pro</translation>
+      <translation type="unfinished">PX4 Pro</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="129"/>
       <source>ArduPilot</source>
-      <translation>ArduPilot</translation>
+      <translation type="unfinished">ArduPilot</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="131"/>
       <source>Generic</source>
-      <translation>Generic</translation>
+      <translation type="unfinished">Generic</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="133"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
   </context>
   <context>
@@ -5778,102 +5778,102 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="130"/>
       <source>Incorrectly formatted line in .ihx file, line too short</source>
-      <translation>Incorrectly formatted line in .ihx file, line too short</translation>
+      <translation type="unfinished">Incorrectly formatted line in .ihx file, line too short</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="135"/>
       <source>Unsupported record type in file: %1</source>
-      <translation>Unsupported record type in file: %1</translation>
+      <translation type="unfinished">Unsupported record type in file: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="205"/>
       <source>Unable to open firmware file %1, error: %2</source>
-      <translation>Unable to open firmware file %1, error: %2</translation>
+      <translation type="unfinished">Unable to open firmware file %1, error: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="214"/>
       <source>Supplied file is not a valid JSON document</source>
-      <translation>Supplied file is not a valid JSON document</translation>
+      <translation type="unfinished">Supplied file is not a valid JSON document</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="225"/>
       <source>Firmware file missing required key: %1</source>
-      <translation>Firmware file missing required key: %1</translation>
+      <translation type="unfinished">Firmware file missing required key: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="235"/>
       <source>Firmware file has invalid key: %1</source>
-      <translation>Firmware file has invalid key: %1</translation>
+      <translation type="unfinished">Firmware file has invalid key: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="241"/>
       <source>Downloaded firmware board id does not match hardware board id: %1 != %2</source>
-      <translation>Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
+      <translation type="unfinished">Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="263"/>
       <source>Write failed for parameter meta data file, error: %1</source>
-      <translation>Write failed for parameter meta data file, error: %1</translation>
+      <translation type="unfinished">Write failed for parameter meta data file, error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="270"/>
       <source>Unable to open parameter meta data file %1 for writing, error: %2</source>
-      <translation>Unable to open parameter meta data file %1 for writing, error: %2</translation>
+      <translation type="unfinished">Unable to open parameter meta data file %1 for writing, error: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="292"/>
       <source>Write failed for airframe meta data file, error: %1</source>
-      <translation>Write failed for airframe meta data file, error: %1</translation>
+      <translation type="unfinished">Write failed for airframe meta data file, error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="299"/>
       <source>Unable to open airframe meta data file %1 for writing, error: %2</source>
-      <translation>Unable to open airframe meta data file %1 for writing, error: %2</translation>
+      <translation type="unfinished">Unable to open airframe meta data file %1 for writing, error: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="325"/>
       <source>Unable to open decompressed file %1 for writing, error: %2</source>
-      <translation>Unable to open decompressed file %1 for writing, error: %2</translation>
+      <translation type="unfinished">Unable to open decompressed file %1 for writing, error: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="331"/>
       <source>Write failed for decompressed image file, error: %1</source>
-      <translation>Write failed for decompressed image file, error: %1</translation>
+      <translation type="unfinished">Write failed for decompressed image file, error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="355"/>
       <source>Firmware file has invalid decompressed size for %1</source>
-      <translation>Firmware file has invalid decompressed size for %1</translation>
+      <translation type="unfinished">Firmware file has invalid decompressed size for %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="367"/>
       <source>Could not find compressed bytes for %1 in Firmware file</source>
-      <translation>Could not find compressed bytes for %1 in Firmware file</translation>
+      <translation type="unfinished">Could not find compressed bytes for %1 in Firmware file</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="372"/>
       <source>Incorrectly formed compressed bytes section for %1 in Firmware file</source>
-      <translation>Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
+      <translation type="unfinished">Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="388"/>
       <source>Firmware file has 0 length %1</source>
-      <translation>Firmware file has 0 length %1</translation>
+      <translation type="unfinished">Firmware file has 0 length %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="392"/>
       <source>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</source>
-      <translation>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
+      <translation type="unfinished">Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="396"/>
       <source>Successfully decompressed %1</source>
-      <translation>Successfully decompressed %1</translation>
+      <translation type="unfinished">Successfully decompressed %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="424"/>
       <source>Unabled to open firmware file %1, %2</source>
-      <translation>Unabled to open firmware file %1, %2</translation>
+      <translation type="unfinished">Unabled to open firmware file %1, %2</translation>
     </message>
   </context>
   <context>
@@ -5881,7 +5881,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="379"/>
       <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
-      <translation>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
+      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
     </message>
   </context>
   <context>
@@ -5889,33 +5889,33 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="27"/>
       <source>Firmware</source>
-      <translation>Firmware</translation>
+      <translation type="unfinished">Firmware</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="43"/>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="140"/>
       <source>Firmware Setup</source>
-      <translation>Firmware Setup</translation>
+      <translation type="unfinished">Firmware Setup</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="47"/>
       <source>Update the autopilot firmware to the latest version</source>
-      <translation>Update the autopilot firmware to the latest version</translation>
+      <translation type="unfinished">Update the autopilot firmware to the latest version</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="51"/>
       <source>All %1 connections to vehicles must be </source>
-      <translation>All %1 connections to vehicles must be </translation>
+      <translation type="unfinished">All %1 connections to vehicles must be </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="229"/>
       <source>Upgrade cancelled</source>
-      <translation>Upgrade cancelled</translation>
+      <translation type="unfinished">Upgrade cancelled</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="75"/>
       <source>Select Firmware File</source>
-      <translation>Select Firmware File</translation>
+      <translation type="unfinished">Select Firmware File</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="46"/>
@@ -5985,33 +5985,33 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="76"/>
       <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
-      <translation>Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
+      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="76"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="119"/>
       <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
-      <translation>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
+      <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="120"/>
       <source>Detected [%1]: </source>
-      <translation>Detected [%1]: </translation>
+      <translation type="unfinished">Detected [%1]: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="127"/>
       <source>Found device</source>
-      <translation>Found device</translation>
+      <translation type="unfinished">Found device</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="170"/>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="297"/>
       <source>PX4 Pro </source>
-      <translation>PX4 Pro </translation>
+      <translation type="unfinished">PX4 Pro </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="199"/>
@@ -6031,123 +6031,123 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="239"/>
       <source>Standard Version (stable)</source>
-      <translation>Standard Version (stable)</translation>
+      <translation type="unfinished">Standard Version (stable)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="243"/>
       <source>Beta Testing (beta)</source>
-      <translation>Beta Testing (beta)</translation>
+      <translation type="unfinished">Beta Testing (beta)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="247"/>
       <source>Developer Build (master)</source>
-      <translation>Developer Build (master)</translation>
+      <translation type="unfinished">Developer Build (master)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="251"/>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="264"/>
       <source>Custom firmware file...</source>
-      <translation>Custom firmware file...</translation>
+      <translation type="unfinished">Custom firmware file...</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="309"/>
       <source>ArduPilot</source>
-      <translation>ArduPilot</translation>
+      <translation type="unfinished">ArduPilot</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="260"/>
       <source>Standard Version</source>
-      <translation>Standard Version</translation>
+      <translation type="unfinished">Standard Version</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="278"/>
       <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
-      <translation>Detected Pixhawk board. You can select from the following flight stacks:</translation>
+      <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="279"/>
       <source>Press Ok to upgrade your vehicle.</source>
-      <translation>Press Ok to upgrade your vehicle.</translation>
+      <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="346"/>
       <source>Downloading list of available firmwares...</source>
-      <translation>Downloading list of available firmwares...</translation>
+      <translation type="unfinished">Downloading list of available firmwares...</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="353"/>
       <source>No Firmware Available</source>
-      <translation>No Firmware Available</translation>
+      <translation type="unfinished">No Firmware Available</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="359"/>
       <source>Advanced settings</source>
-      <translation>Advanced settings</translation>
+      <translation type="unfinished">Advanced settings</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="373"/>
       <source>Select the standard version or one from the file system (previously downloaded):</source>
-      <translation>Select the standard version or one from the file system (previously downloaded):</translation>
+      <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="374"/>
       <source>Select which version of the above flight stack you would like to install:</source>
-      <translation>Select which version of the above flight stack you would like to install:</translation>
+      <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="388"/>
       <source>WARNING: BETA FIRMWARE. </source>
-      <translation>WARNING: BETA FIRMWARE. </translation>
+      <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="389"/>
       <source>This firmware version is ONLY intended for beta testers. </source>
-      <translation>This firmware version is ONLY intended for beta testers. </translation>
+      <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="390"/>
       <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
-      <translation>Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
+      <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="391"/>
       <source>Do NOT use for normal operation.</source>
-      <translation>Do NOT use for normal operation.</translation>
+      <translation type="unfinished">Do NOT use for normal operation.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="394"/>
       <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
-      <translation>WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
+      <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="395"/>
       <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
-      <translation>This firmware has NOT BEEN FLIGHT TESTED. </translation>
+      <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="396"/>
       <source>It is only intended for DEVELOPERS. </source>
-      <translation>It is only intended for DEVELOPERS. </translation>
+      <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="397"/>
       <source>Run bench tests without props first. </source>
-      <translation>Run bench tests without props first. </translation>
+      <translation type="unfinished">Run bench tests without props first. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="398"/>
       <source>Do NOT fly this without additional safety precautions. </source>
-      <translation>Do NOT fly this without additional safety precautions. </translation>
+      <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="399"/>
       <source>Follow the forums actively when using it.</source>
-      <translation>Follow the forums actively when using it.</translation>
+      <translation type="unfinished">Follow the forums actively when using it.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="425"/>
       <source>Flash ChibiOS Bootloader</source>
-      <translation>Flash ChibiOS Bootloader</translation>
+      <translation type="unfinished">Flash ChibiOS Bootloader</translation>
     </message>
   </context>
   <context>
@@ -6155,87 +6155,87 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="165"/>
       <source>Connect not allowed during Firmware Upgrade.</source>
-      <translation>Connect not allowed during Firmware Upgrade.</translation>
+      <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="283"/>
       <source>Connected to bootloader:</source>
-      <translation>Connected to bootloader:</translation>
+      <translation type="unfinished">Connected to bootloader:</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="284"/>
       <source>  Version: %1</source>
-      <translation>  Version: %1</translation>
+      <translation type="unfinished">  Version: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="285"/>
       <source>  Board ID: %1</source>
-      <translation>  Board ID: %1</translation>
+      <translation type="unfinished">  Board ID: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="286"/>
       <source>  Flash size: %1</source>
-      <translation>  Flash size: %1</translation>
+      <translation type="unfinished">  Flash size: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="341"/>
       <source>Custom firmware selected but no filename given.</source>
-      <translation>Custom firmware selected but no filename given.</translation>
+      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="346"/>
       <source>Unable to find specified firmware for board type</source>
-      <translation>Unable to find specified firmware for board type</translation>
+      <translation type="unfinished">Unable to find specified firmware for board type</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="352"/>
       <source>No firmware file selected</source>
-      <translation>No firmware file selected</translation>
+      <translation type="unfinished">No firmware file selected</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="363"/>
       <source>Downloading firmware...</source>
-      <translation>Downloading firmware...</translation>
+      <translation type="unfinished">Downloading firmware...</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="364"/>
       <source> From: %1</source>
-      <translation> From: %1</translation>
+      <translation type="unfinished"> From: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="385"/>
       <source>Download complete</source>
-      <translation>Download complete</translation>
+      <translation type="unfinished">Download complete</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="393"/>
       <source>Image load failed</source>
-      <translation>Image load failed</translation>
+      <translation type="unfinished">Image load failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="399"/>
       <source>Bootloader not found</source>
-      <translation>Bootloader not found</translation>
+      <translation type="unfinished">Bootloader not found</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="404"/>
       <source>Image size of %1 is too large for board flash size %2</source>
-      <translation>Image size of %1 is too large for board flash size %2</translation>
+      <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="436"/>
       <source>Upgrade complete</source>
-      <translation>Upgrade complete</translation>
+      <translation type="unfinished">Upgrade complete</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="492"/>
       <source>Upgrade cancelled</source>
-      <translation>Upgrade cancelled</translation>
+      <translation type="unfinished">Upgrade cancelled</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgradeController.cc" line="564"/>
       <source>Choose board type</source>
-      <translation>Choose board type</translation>
+      <translation type="unfinished">Choose board type</translation>
     </message>
   </context>
   <context>
@@ -6243,87 +6243,87 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
       <source>Fixed Wing Initial Checks</source>
-      <translation>Fixed Wing Initial Checks</translation>
+      <translation type="unfinished">Fixed Wing Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
       <source>Hardware</source>
-      <translation>Hardware</translation>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
       <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation>Props mounted? Wings secured? Tail secured?</translation>
+      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>Please arm the vehicle here</translation>
+      <translation type="unfinished">Please arm the vehicle here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
       <source>Actuators</source>
-      <translation>Actuators</translation>
+      <translation type="unfinished">Actuators</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
       <source>Move all control surfaces. Did they work properly?</source>
-      <translation>Move all control surfaces. Did they work properly?</translation>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
       <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation>Propellers free? Then throttle up gently. Working properly?</translation>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
       <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation>Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
       <source>Last preparations before launch</source>
-      <translation>Last preparations before launch</translation>
+      <translation type="unfinished">Last preparations before launch</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
       <source>Payload</source>
-      <translation>Payload</translation>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
       <source>Configured and started? Payload lid closed?</source>
-      <translation>Configured and started? Payload lid closed?</translation>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
       <source>Wind &amp; weather</source>
-      <translation>Wind &amp; weather</translation>
+      <translation type="unfinished">Wind &amp; weather</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
       <source>OK for your platform? Lauching into the wind?</source>
-      <translation>OK for your platform? Lauching into the wind?</translation>
+      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
       <source>Flight area</source>
-      <translation>Flight area</translation>
+      <translation type="unfinished">Flight area</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
       <source>Launch area and path free of obstacles/people?</source>
-      <translation>Launch area and path free of obstacles/people?</translation>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
     </message>
   </context>
   <context>
@@ -6331,12 +6331,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
       <source>Fixed Wing Landing</source>
-      <translation>Fixed Wing Landing</translation>
+      <translation type="unfinished">Fixed Wing Landing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="100"/>
       <source>%1 complex item version %2 not supported</source>
-      <translation>%1 complex item version %2 not supported</translation>
+      <translation type="unfinished">%1 complex item version %2 not supported</translation>
     </message>
   </context>
   <context>
@@ -6344,12 +6344,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="73"/>
       <source>WAITING FOR VIDEO</source>
-      <translation>WAITING FOR VIDEO</translation>
+      <translation type="unfinished">WAITING FOR VIDEO</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="73"/>
       <source>VIDEO DISABLED</source>
-      <translation>VIDEO DISABLED</translation>
+      <translation type="unfinished">VIDEO DISABLED</translation>
     </message>
   </context>
   <context>
@@ -6357,7 +6357,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightMap/FlightMap.qml" line="74"/>
       <source>Specify Position</source>
-      <translation>Specify Position</translation>
+      <translation type="unfinished">Specify Position</translation>
     </message>
   </context>
   <context>
@@ -6395,7 +6395,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/QmlControls/FlightModeMenu.qml" line="20"/>
       <source>N/A</source>
       <comment>No data to display</comment>
-      <translation>N/A</translation>
+      <translation type="unfinished">N/A</translation>
     </message>
   </context>
   <context>
@@ -6427,12 +6427,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="25"/>
       <source>Flight Modes</source>
-      <translation>Flight Modes</translation>
+      <translation type="unfinished">Flight Modes</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="36"/>
       <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
+      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
     </message>
   </context>
   <context>
@@ -6440,17 +6440,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="21"/>
       <source>Mode switch</source>
-      <translation>Mode switch</translation>
+      <translation type="unfinished">Mode switch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="22"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="27"/>
       <source>Flight Mode %1 </source>
-      <translation>Flight Mode %1 </translation>
+      <translation type="unfinished">Flight Mode %1 </translation>
     </message>
   </context>
   <context>
@@ -6467,25 +6467,25 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="356"/>
       <source>R</source>
       <comment>rally point map item label</comment>
-      <translation>R</translation>
+      <translation type="unfinished">R</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="452"/>
       <source>Go here</source>
       <comment>Go to location waypoint</comment>
-      <translation>Go here</translation>
+      <translation type="unfinished">Go here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="592"/>
       <source>ROI here</source>
       <comment>Make this a Region Of Interest</comment>
-      <translation>ROI here</translation>
+      <translation type="unfinished">ROI here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="619"/>
       <source>Orbit</source>
       <comment>Orbit waypoint</comment>
-      <translation>Orbit</translation>
+      <translation type="unfinished">Orbit</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMap.qml" line="682"/>
@@ -6548,37 +6548,37 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="62"/>
       <source>Flight Plan complete</source>
-      <translation>Flight Plan complete</translation>
+      <translation type="unfinished">Flight Plan complete</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="78"/>
       <source>%1 Images Taken</source>
-      <translation>%1 Images Taken</translation>
+      <translation type="unfinished">%1 Images Taken</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="85"/>
       <source>Remove plan from vehicle</source>
-      <translation>Remove plan from vehicle</translation>
+      <translation type="unfinished">Remove plan from vehicle</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="96"/>
       <source>Leave plan on vehicle</source>
-      <translation>Leave plan on vehicle</translation>
+      <translation type="unfinished">Leave plan on vehicle</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="115"/>
       <source>Resume Mission From Waypoint %1</source>
-      <translation>Resume Mission From Waypoint %1</translation>
+      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="126"/>
       <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>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
+      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="134"/>
       <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
+      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
     </message>
   </context>
   <context>
@@ -6586,7 +6586,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
       <source>Pre-Flight Checklist</source>
-      <translation>Pre-Flight Checklist</translation>
+      <translation type="unfinished">Pre-Flight Checklist</translation>
     </message>
   </context>
   <context>
@@ -6848,7 +6848,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="72"/>
       <source>Double-click to exit full screen</source>
-      <translation>Double-click to exit full screen</translation>
+      <translation type="unfinished">Double-click to exit full screen</translation>
     </message>
   </context>
   <context>
@@ -7099,54 +7099,54 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="164"/>
       <source>Units</source>
-      <translation>Units</translation>
+      <translation type="unfinished">Units</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="38"/>
       <source>Language</source>
-      <translation>Language</translation>
+      <translation type="unfinished">Language</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="45"/>
       <source>Color Scheme</source>
-      <translation>Color Scheme</translation>
+      <translation type="unfinished">Color Scheme</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="52"/>
       <source>Stream GCS Position</source>
-      <translation>Stream GCS Position</translation>
+      <translation type="unfinished">Stream GCS Position</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="60"/>
       <source>Mute all audio output</source>
-      <translation>Mute all audio output</translation>
+      <translation type="unfinished">Mute all audio output</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="76"/>
       <source>Clear all settings on next start</source>
-      <translation>Clear all settings on next start</translation>
+      <translation type="unfinished">Clear all settings on next start</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="139"/>
       <source>Application Load/Save Path</source>
-      <translation>Application Load/Save Path</translation>
+      <translation type="unfinished">Application Load/Save Path</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="149"/>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="206"/>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="242"/>
       <source>Browse</source>
-      <translation>Browse</translation>
+      <translation type="unfinished">Browse</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="153"/>
       <source>Choose the location to save/load files</source>
-      <translation>Choose the location to save/load files</translation>
+      <translation type="unfinished">Choose the location to save/load files</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="94"/>
       <source>UI Scaling</source>
-      <translation>UI Scaling</translation>
+      <translation type="unfinished">UI Scaling</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="35"/>
@@ -7166,23 +7166,23 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="180"/>
       <source>Brand Image</source>
-      <translation>Brand Image</translation>
+      <translation type="unfinished">Brand Image</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="194"/>
       <source>Indoor Image</source>
-      <translation>Indoor Image</translation>
+      <translation type="unfinished">Indoor Image</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="211"/>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="247"/>
       <source>Choose custom brand image file</source>
-      <translation>Choose custom brand image file</translation>
+      <translation type="unfinished">Choose custom brand image file</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="230"/>
       <source>Outdoor Image</source>
-      <translation>Outdoor Image</translation>
+      <translation type="unfinished">Outdoor Image</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="256"/>
@@ -7200,17 +7200,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/GeoFenceController.cc" line="148"/>
       <source>GeoFence supports version %1</source>
-      <translation>GeoFence supports version %1</translation>
+      <translation type="unfinished">GeoFence supports version %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/GeoFenceController.cc" line="155"/>
       <source>GeoFence polygon not stored as object</source>
-      <translation>GeoFence polygon not stored as object</translation>
+      <translation type="unfinished">GeoFence polygon not stored as object</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/GeoFenceController.cc" line="169"/>
       <source>GeoFence circle not stored as object</source>
-      <translation>GeoFence circle not stored as object</translation>
+      <translation type="unfinished">GeoFence circle not stored as object</translation>
     </message>
   </context>
   <context>
@@ -7218,97 +7218,97 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="37"/>
       <source>GeoFence</source>
-      <translation>GeoFence</translation>
+      <translation type="unfinished">GeoFence</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="65"/>
       <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
-      <translation>GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
+      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="66"/>
       <source>This vehicle does not support GeoFence.</source>
-      <translation>This vehicle does not support GeoFence.</translation>
+      <translation type="unfinished">This vehicle does not support GeoFence.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="116"/>
       <source>Insert GeoFence</source>
-      <translation>Insert GeoFence</translation>
+      <translation type="unfinished">Insert GeoFence</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="121"/>
       <source>Polygon Fence</source>
-      <translation>Polygon Fence</translation>
+      <translation type="unfinished">Polygon Fence</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="133"/>
       <source>Circular Fence</source>
-      <translation>Circular Fence</translation>
+      <translation type="unfinished">Circular Fence</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="147"/>
       <source>Polygon Fences</source>
-      <translation>Polygon Fences</translation>
+      <translation type="unfinished">Polygon Fences</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="151"/>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="226"/>
       <source>None</source>
-      <translation>None</translation>
+      <translation type="unfinished">None</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="162"/>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="238"/>
       <source>Inclusion</source>
-      <translation>Inclusion</translation>
+      <translation type="unfinished">Inclusion</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="178"/>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="254"/>
       <source>Edit</source>
-      <translation>Edit</translation>
+      <translation type="unfinished">Edit</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="202"/>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="294"/>
       <source>Delete</source>
-      <translation>Delete</translation>
+      <translation type="unfinished">Delete</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="211"/>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="303"/>
       <source>Del</source>
-      <translation>Del</translation>
+      <translation type="unfinished">Del</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="222"/>
       <source>Circular Fences</source>
-      <translation>Circular Fences</translation>
+      <translation type="unfinished">Circular Fences</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="278"/>
       <source>Radius</source>
-      <translation>Radius</translation>
+      <translation type="unfinished">Radius</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="314"/>
       <source>Breach Return Point</source>
-      <translation>Breach Return Point</translation>
+      <translation type="unfinished">Breach Return Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="318"/>
       <source>Add Breach Return Point</source>
-      <translation>Add Breach Return Point</translation>
+      <translation type="unfinished">Add Breach Return Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="327"/>
       <source>Remove Breach Return Point</source>
-      <translation>Remove Breach Return Point</translation>
+      <translation type="unfinished">Remove Breach Return Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="342"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
   </context>
   <context>
@@ -7316,22 +7316,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/GeoFenceManager.cc" line="155"/>
       <source>GeoFence load: Vertex count change mid-polygon - actual:expected</source>
-      <translation>GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
+      <translation type="unfinished">GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/GeoFenceManager.cc" line="159"/>
       <source>GeoFence load: Polygon type changed before last load complete - actual:expected</source>
-      <translation>GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
+      <translation type="unfinished">GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/GeoFenceManager.cc" line="172"/>
       <source>GeoFence load: Incomplete polygon loaded</source>
-      <translation>GeoFence load: Incomplete polygon loaded</translation>
+      <translation type="unfinished">GeoFence load: Incomplete polygon loaded</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/GeoFenceManager.cc" line="180"/>
       <source>GeoFence load: Unsupported command %1</source>
-      <translation>GeoFence load: Unsupported command %1</translation>
+      <translation type="unfinished">GeoFence load: Unsupported command %1</translation>
     </message>
   </context>
   <context>
@@ -7340,7 +7340,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/QmlControls/GeoFenceMapVisuals.qml" line="170"/>
       <source>B</source>
       <comment>Breach Return Point item indicator</comment>
-      <translation>B</translation>
+      <translation type="unfinished">B</translation>
     </message>
   </context>
   <context>
@@ -7371,22 +7371,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="144"/>
       <source>The save folder already contains images.</source>
-      <translation>The save folder already contains images.</translation>
+      <translation type="unfinished">The save folder already contains images.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="157"/>
       <source>Cannot find the image directory.</source>
-      <translation>Cannot find the image directory.</translation>
+      <translation type="unfinished">Cannot find the image directory.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="166"/>
       <source>Couldn&apos;t replace the previously tagged images</source>
-      <translation>Couldn&apos;t replace the previously tagged images</translation>
+      <translation type="unfinished">Couldn&apos;t replace the previously tagged images</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagController.cc" line="173"/>
       <source>Cannot find the save directory.</source>
-      <translation>Cannot find the save directory.</translation>
+      <translation type="unfinished">Cannot find the save directory.</translation>
     </message>
   </context>
   <context>
@@ -7394,44 +7394,44 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="22"/>
       <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
+      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="64"/>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="73"/>
       <source>Select log file</source>
-      <translation>Select log file</translation>
+      <translation type="unfinished">Select log file</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="74"/>
       <source>ULog file (*.ulg)</source>
-      <translation>ULog file (*.ulg)</translation>
+      <translation type="unfinished">ULog file (*.ulg)</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="74"/>
       <source>PX4 log file (*.px4log)</source>
-      <translation>PX4 log file (*.px4log)</translation>
+      <translation type="unfinished">PX4 log file (*.px4log)</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="74"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="91"/>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="100"/>
       <source>Select image directory</source>
-      <translation>Select image directory</translation>
+      <translation type="unfinished">Select image directory</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="117"/>
       <source>(Optionally) Select save directory</source>
-      <translation>(Optionally) Select save directory</translation>
+      <translation type="unfinished">(Optionally) Select save directory</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="126"/>
       <source>Select save directory</source>
-      <translation>Select save directory</translation>
+      <translation type="unfinished">Select save directory</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="142"/>
@@ -7446,12 +7446,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="151"/>
       <source>Cancel Tagging</source>
-      <translation>Cancel Tagging</translation>
+      <translation type="unfinished">Cancel Tagging</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="151"/>
       <source>Start Tagging</source>
-      <translation>Start Tagging</translation>
+      <translation type="unfinished">Start Tagging</translation>
     </message>
   </context>
   <context>
@@ -7459,7 +7459,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="84"/>
       <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
-      <translation>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
+      <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="106"/>
@@ -7484,7 +7484,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="221"/>
       <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation>Geotagging failed. Couldn&apos;t open an image.</translation>
+      <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="229"/>
@@ -7497,22 +7497,22 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="100"/>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="208"/>
       <source>Tagging cancelled</source>
-      <translation>Tagging cancelled</translation>
+      <translation type="unfinished">Tagging cancelled</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="133"/>
       <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation>Geotagging failed. Couldn&apos;t open log file.</translation>
+      <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="149"/>
       <source>Log parsing failed</source>
-      <translation>Log parsing failed</translation>
+      <translation type="unfinished">Log parsing failed</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagWorker.cc" line="214"/>
       <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation>Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
+      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
     </message>
   </context>
   <context>
@@ -7659,7 +7659,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="118"/>
       <source>Slide to confirm</source>
-      <translation>Slide to confirm</translation>
+      <translation type="unfinished">Slide to confirm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="118"/>
@@ -7672,12 +7672,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="35"/>
       <source>EMERGENCY STOP</source>
-      <translation>EMERGENCY STOP</translation>
+      <translation type="unfinished">EMERGENCY STOP</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="36"/>
       <source>Arm</source>
-      <translation>Arm</translation>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
@@ -7687,7 +7687,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
       <source>Disarm</source>
-      <translation>Disarm</translation>
+      <translation type="unfinished">Disarm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
@@ -7697,87 +7697,87 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
       <source>Return</source>
-      <translation>Return</translation>
+      <translation type="unfinished">Return</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="42"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="44"/>
       <source>Land</source>
-      <translation>Land</translation>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="45"/>
       <source>Start Mission</source>
-      <translation>Start Mission</translation>
+      <translation type="unfinished">Start Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="46"/>
       <source>Start Mission (MV)</source>
-      <translation>Start Mission (MV)</translation>
+      <translation type="unfinished">Start Mission (MV)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="47"/>
       <source>Continue Mission</source>
-      <translation>Continue Mission</translation>
+      <translation type="unfinished">Continue Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="48"/>
       <source>Resume FAILED</source>
-      <translation>Resume FAILED</translation>
+      <translation type="unfinished">Resume FAILED</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="49"/>
       <source>Pause</source>
-      <translation>Pause</translation>
+      <translation type="unfinished">Pause</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="50"/>
       <source>Pause (MV)</source>
-      <translation>Pause (MV)</translation>
+      <translation type="unfinished">Pause (MV)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="51"/>
       <source>Change Altitude</source>
-      <translation>Change Altitude</translation>
+      <translation type="unfinished">Change Altitude</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
       <source>Orbit</source>
-      <translation>Orbit</translation>
+      <translation type="unfinished">Orbit</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
       <source>Land Abort</source>
-      <translation>Land Abort</translation>
+      <translation type="unfinished">Land Abort</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="57"/>
       <source>Set Waypoint</source>
-      <translation>Set Waypoint</translation>
+      <translation type="unfinished">Set Waypoint</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
       <source>Go To Location</source>
-      <translation>Go To Location</translation>
+      <translation type="unfinished">Go To Location</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="79"/>
       <source>Return to the launch position of the vehicle.</source>
-      <translation>Return to the launch position of the vehicle.</translation>
+      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
       <source>VTOL Transition</source>
-      <translation>VTOL Transition</translation>
+      <translation type="unfinished">VTOL Transition</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
       <source>Force Arm</source>
-      <translation>Force Arm</translation>
+      <translation type="unfinished">Force Arm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
@@ -7802,7 +7802,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
       <source>ROI</source>
-      <translation>ROI</translation>
+      <translation type="unfinished">ROI</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
@@ -7827,7 +7827,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
       <source>Arm the vehicle.</source>
-      <translation>Arm the vehicle.</translation>
+      <translation type="unfinished">Arm the vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
@@ -7837,12 +7837,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
       <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation>WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
+      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
       <source>Disarm the vehicle</source>
-      <translation>Disarm the vehicle</translation>
+      <translation type="unfinished">Disarm the vehicle</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
@@ -7852,12 +7852,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
       <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
-      <translation>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
+      <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
       <source>Takeoff from ground and hold position.</source>
-      <translation>Takeoff from ground and hold position.</translation>
+      <translation type="unfinished">Takeoff from ground and hold position.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
@@ -7867,7 +7867,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
       <source>Takeoff from ground and start the current mission.</source>
-      <translation>Takeoff from ground and start the current mission.</translation>
+      <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
@@ -7877,22 +7877,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
       <source>Continue the mission from the current waypoint.</source>
-      <translation>Continue the mission from the current waypoint.</translation>
+      <translation type="unfinished">Continue the mission from the current waypoint.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="77"/>
       <source>Upload of resume mission failed. Confirm to retry upload</source>
-      <translation>Upload of resume mission failed. Confirm to retry upload</translation>
+      <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="78"/>
       <source>Land the vehicle at the current position.</source>
-      <translation>Land the vehicle at the current position.</translation>
+      <translation type="unfinished">Land the vehicle at the current position.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="80"/>
       <source>Change the altitude of the vehicle up or down.</source>
-      <translation>Change the altitude of the vehicle up or down.</translation>
+      <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="81"/>
@@ -7912,27 +7912,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="84"/>
       <source>Move the vehicle to the specified location.</source>
-      <translation>Move the vehicle to the specified location.</translation>
+      <translation type="unfinished">Move the vehicle to the specified location.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="85"/>
       <source>Adjust current waypoint to %1.</source>
-      <translation>Adjust current waypoint to %1.</translation>
+      <translation type="unfinished">Adjust current waypoint to %1.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="86"/>
       <source>Orbit the vehicle around the specified location.</source>
-      <translation>Orbit the vehicle around the specified location.</translation>
+      <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="87"/>
       <source>Abort the landing sequence.</source>
-      <translation>Abort the landing sequence.</translation>
+      <translation type="unfinished">Abort the landing sequence.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="88"/>
       <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
+      <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="89"/>
@@ -7942,17 +7942,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="90"/>
       <source>Transition VTOL to fixed wing flight.</source>
-      <translation>Transition VTOL to fixed wing flight.</translation>
+      <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="91"/>
       <source>Transition VTOL to multi-rotor flight.</source>
-      <translation>Transition VTOL to multi-rotor flight.</translation>
+      <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="92"/>
       <source>Make the specified location a Region Of Interest.</source>
-      <translation>Make the specified location a Region Of Interest.</translation>
+      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="93"/>
@@ -7977,7 +7977,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="221"/>
       <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
+      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="232"/>
@@ -8002,12 +8002,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="497"/>
       <source>Smart RTL</source>
-      <translation>Smart RTL</translation>
+      <translation type="unfinished">Smart RTL</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="736"/>
       <source>Internal error: unknown actionCode</source>
-      <translation>Internal error: unknown actionCode</translation>
+      <translation type="unfinished">Internal error: unknown actionCode</translation>
     </message>
   </context>
   <context>
@@ -8023,17 +8023,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/HelpSettings.qml" line="37"/>
       <source>QGroundControl User Guide</source>
-      <translation>QGroundControl User Guide</translation>
+      <translation type="unfinished">QGroundControl User Guide</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/HelpSettings.qml" line="44"/>
       <source>PX4 Users Discussion Forum</source>
-      <translation>PX4 Users Discussion Forum</translation>
+      <translation type="unfinished">PX4 Users Discussion Forum</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/HelpSettings.qml" line="51"/>
       <source>ArduPilot Users Discussion Forum</source>
-      <translation>ArduPilot Users Discussion Forum</translation>
+      <translation type="unfinished">ArduPilot Users Discussion Forum</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/HelpSettings.qml" line="58"/>
@@ -8047,13 +8047,13 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="124"/>
       <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="155"/>
       <source>+</source>
-      <translation>+</translation>
+      <translation type="unfinished">+</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="136"/>
       <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="167"/>
       <source>-</source>
-      <translation>-</translation>
+      <translation type="unfinished">-</translation>
     </message>
   </context>
   <context>
@@ -8061,22 +8061,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueData.cc" line="20"/>
       <source>None</source>
-      <translation>None</translation>
+      <translation type="unfinished">None</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
       <source>Color</source>
-      <translation>Color</translation>
+      <translation type="unfinished">Color</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
       <source>Opacity</source>
-      <translation>Opacity</translation>
+      <translation type="unfinished">Opacity</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
       <source>Icon</source>
-      <translation>Icon</translation>
+      <translation type="unfinished">Icon</translation>
     </message>
   </context>
   <context>
@@ -8084,24 +8084,24 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
       <source>Valuec requires a connected vehicle for setup.</source>
-      <translation>Valuec requires a connected vehicle for setup.</translation>
+      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="102"/>
       <source>Icon</source>
-      <translation>Icon</translation>
+      <translation type="unfinished">Icon</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="151"/>
       <source>Text</source>
-      <translation>Text</translation>
+      <translation type="unfinished">Text</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="91"/>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="157"/>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="166"/>
       <source>Label</source>
-      <translation>Label</translation>
+      <translation type="unfinished">Label</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
@@ -8131,12 +8131,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="173"/>
       <source>Size</source>
-      <translation>Size</translation>
+      <translation type="unfinished">Size</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="181"/>
       <source>Show Units</source>
-      <translation>Show Units</translation>
+      <translation type="unfinished">Show Units</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="190"/>
@@ -8151,29 +8151,29 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="293"/>
       <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>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
+      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="374"/>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="479"/>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="570"/>
       <source>Add Row</source>
-      <translation>Add Row</translation>
+      <translation type="unfinished">Add Row</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="406"/>
       <source>Specify the icon you want to display based on value ranges.</source>
-      <translation>Specify the icon you want to display based on value ranges.</translation>
+      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="511"/>
       <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation>Specify the icon opacity you want based on value ranges.</translation>
+      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="581"/>
       <source>Select Icon</source>
-      <translation>Select Icon</translation>
+      <translation type="unfinished">Select Icon</translation>
     </message>
   </context>
   <context>
@@ -8181,7 +8181,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueValue.qml" line="46"/>
       <source>--.--</source>
-      <translation>--.--</translation>
+      <translation type="unfinished">--.--</translation>
     </message>
   </context>
   <context>
@@ -8189,97 +8189,97 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Joystick/Joystick.h" line="337"/>
       <source>No Action</source>
-      <translation>No Action</translation>
+      <translation type="unfinished">No Action</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="338"/>
       <source>Arm</source>
-      <translation>Arm</translation>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="339"/>
       <source>Disarm</source>
-      <translation>Disarm</translation>
+      <translation type="unfinished">Disarm</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="340"/>
       <source>Toggle Arm</source>
-      <translation>Toggle Arm</translation>
+      <translation type="unfinished">Toggle Arm</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="341"/>
       <source>VTOL: Fixed Wing</source>
-      <translation>VTOL: Fixed Wing</translation>
+      <translation type="unfinished">VTOL: Fixed Wing</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="342"/>
       <source>VTOL: Multi-Rotor</source>
-      <translation>VTOL: Multi-Rotor</translation>
+      <translation type="unfinished">VTOL: Multi-Rotor</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="343"/>
       <source>Continuous Zoom In</source>
-      <translation>Continuous Zoom In</translation>
+      <translation type="unfinished">Continuous Zoom In</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="344"/>
       <source>Continuous Zoom Out</source>
-      <translation>Continuous Zoom Out</translation>
+      <translation type="unfinished">Continuous Zoom Out</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="345"/>
       <source>Step Zoom In</source>
-      <translation>Step Zoom In</translation>
+      <translation type="unfinished">Step Zoom In</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="346"/>
       <source>Step Zoom Out</source>
-      <translation>Step Zoom Out</translation>
+      <translation type="unfinished">Step Zoom Out</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="351"/>
       <source>Trigger Camera</source>
-      <translation>Trigger Camera</translation>
+      <translation type="unfinished">Trigger Camera</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="352"/>
       <source>Start Recording Video</source>
-      <translation>Start Recording Video</translation>
+      <translation type="unfinished">Start Recording Video</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="353"/>
       <source>Stop Recording Video</source>
-      <translation>Stop Recording Video</translation>
+      <translation type="unfinished">Stop Recording Video</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="354"/>
       <source>Toggle Recording Video</source>
-      <translation>Toggle Recording Video</translation>
+      <translation type="unfinished">Toggle Recording Video</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="355"/>
       <source>Gimbal Down</source>
-      <translation>Gimbal Down</translation>
+      <translation type="unfinished">Gimbal Down</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="356"/>
       <source>Gimbal Up</source>
-      <translation>Gimbal Up</translation>
+      <translation type="unfinished">Gimbal Up</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="357"/>
       <source>Gimbal Left</source>
-      <translation>Gimbal Left</translation>
+      <translation type="unfinished">Gimbal Left</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="358"/>
       <source>Gimbal Right</source>
-      <translation>Gimbal Right</translation>
+      <translation type="unfinished">Gimbal Right</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="359"/>
       <source>Gimbal Center</source>
-      <translation>Gimbal Center</translation>
+      <translation type="unfinished">Gimbal Center</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="360"/>
@@ -8294,7 +8294,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Joystick/Joystick.h" line="362"/>
       <source>Emergency Stop</source>
-      <translation>Emergency Stop</translation>
+      <translation type="unfinished">Emergency Stop</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="363"/>
@@ -8329,22 +8329,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Joystick/Joystick.h" line="347"/>
       <source>Next Video Stream</source>
-      <translation>Next Video Stream</translation>
+      <translation type="unfinished">Next Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="348"/>
       <source>Previous Video Stream</source>
-      <translation>Previous Video Stream</translation>
+      <translation type="unfinished">Previous Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="349"/>
       <source>Next Camera</source>
-      <translation>Next Camera</translation>
+      <translation type="unfinished">Next Camera</translation>
     </message>
     <message>
       <location filename="../src/Joystick/Joystick.h" line="350"/>
       <source>Previous Camera</source>
-      <translation>Previous Camera</translation>
+      <translation type="unfinished">Previous Camera</translation>
     </message>
   </context>
   <context>
@@ -8352,27 +8352,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="28"/>
       <source>Joystick</source>
-      <translation>Joystick</translation>
+      <translation type="unfinished">Joystick</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="79"/>
       <source>General</source>
-      <translation>General</translation>
+      <translation type="unfinished">General</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation>Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
       <source>Calibration</source>
-      <translation>Calibration</translation>
+      <translation type="unfinished">Calibration</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="90"/>
       <source>Advanced</source>
-      <translation>Advanced</translation>
+      <translation type="unfinished">Advanced</translation>
     </message>
   </context>
   <context>
@@ -8380,72 +8380,72 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
       <source>Full down stick is zero throttle</source>
-      <translation>Full down stick is zero throttle</translation>
+      <translation type="unfinished">Full down stick is zero throttle</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
       <source>Center stick is zero throttle</source>
-      <translation>Center stick is zero throttle</translation>
+      <translation type="unfinished">Center stick is zero throttle</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
       <source>Spring loaded throttle smoothing</source>
-      <translation>Spring loaded throttle smoothing</translation>
+      <translation type="unfinished">Spring loaded throttle smoothing</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
       <source>Allow negative Thrust</source>
-      <translation>Allow negative Thrust</translation>
+      <translation type="unfinished">Allow negative Thrust</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
       <source>Exponential:</source>
-      <translation>Exponential:</translation>
+      <translation type="unfinished">Exponential:</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
       <source>Enable further advanced settings (careful!)</source>
-      <translation>Enable further advanced settings (careful!)</translation>
+      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
       <source>Axis frequency (Hz):</source>
-      <translation>Axis frequency (Hz):</translation>
+      <translation type="unfinished">Axis frequency (Hz):</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="127"/>
       <source>Button repeat frequency (Hz):</source>
-      <translation>Button repeat frequency (Hz):</translation>
+      <translation type="unfinished">Button repeat frequency (Hz):</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="145"/>
       <source>Enable circle correction</source>
-      <translation>Enable circle correction</translation>
+      <translation type="unfinished">Enable circle correction</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="163"/>
       <source>Deadbands</source>
-      <translation>Deadbands</translation>
+      <translation type="unfinished">Deadbands</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="180"/>
       <source>Deadband can be set during the first </source>
-      <translation>Deadband can be set during the first </translation>
+      <translation type="unfinished">Deadband can be set during the first </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="181"/>
       <source>step of calibration by gently wiggling each axis. </source>
-      <translation>step of calibration by gently wiggling each axis. </translation>
+      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="182"/>
       <source>Deadband can also be adjusted by clicking and </source>
-      <translation>Deadband can also be adjusted by clicking and </translation>
+      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml" line="183"/>
       <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation>dragging vertically on the corresponding axis monitor.</translation>
+      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
     </message>
   </context>
   <context>
@@ -8459,22 +8459,22 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="99"/>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="229"/>
       <source>Repeat</source>
-      <translation>Repeat</translation>
+      <translation type="unfinished">Repeat</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="129"/>
       <source>#</source>
-      <translation>#</translation>
+      <translation type="unfinished">#</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="133"/>
       <source>Function: </source>
-      <translation>Function: </translation>
+      <translation type="unfinished">Function: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="138"/>
       <source>Shift Function: </source>
-      <translation>Shift Function: </translation>
+      <translation type="unfinished">Shift Function: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="258"/>
@@ -8484,7 +8484,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="264"/>
       <source>No firmware support</source>
-      <translation>No firmware support</translation>
+      <translation type="unfinished">No firmware support</translation>
     </message>
   </context>
   <context>
@@ -8492,22 +8492,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml" line="169"/>
       <source>Skip</source>
-      <translation>Skip</translation>
+      <translation type="unfinished">Skip</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml" line="175"/>
       <source>Cancel</source>
-      <translation>Cancel</translation>
+      <translation type="unfinished">Cancel</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
       <source>Next</source>
-      <translation>Next</translation>
+      <translation type="unfinished">Next</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
       <source>Start</source>
-      <translation>Start</translation>
+      <translation type="unfinished">Start</translation>
     </message>
   </context>
   <context>
@@ -8515,7 +8515,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigController.cc" line="151"/>
       <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
+      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
     </message>
   </context>
   <context>
@@ -8523,57 +8523,57 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="43"/>
       <source>Enable joystick input</source>
-      <translation>Enable joystick input</translation>
+      <translation type="unfinished">Enable joystick input</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="43"/>
       <source>Enable not allowed (Calibrate First)</source>
-      <translation>Enable not allowed (Calibrate First)</translation>
+      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="75"/>
       <source>Active joystick:</source>
-      <translation>Active joystick:</translation>
+      <translation type="unfinished">Active joystick:</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="87"/>
       <source>Active joystick name not in combo</source>
-      <translation>Active joystick name not in combo</translation>
+      <translation type="unfinished">Active joystick name not in combo</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="105"/>
       <source>RC Mode:</source>
-      <translation>RC Mode:</translation>
+      <translation type="unfinished">RC Mode:</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="162"/>
       <source>Lateral</source>
-      <translation>Lateral</translation>
+      <translation type="unfinished">Lateral</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="162"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="176"/>
       <source>Forward</source>
-      <translation>Forward</translation>
+      <translation type="unfinished">Forward</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="176"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="189"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml" line="202"/>
       <source>Throttle</source>
-      <translation>Throttle</translation>
+      <translation type="unfinished">Throttle</translation>
     </message>
   </context>
   <context>
@@ -8581,12 +8581,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/toolbar/JoystickIndicator.qml" line="35"/>
       <source>Joystick Status</source>
-      <translation>Joystick Status</translation>
+      <translation type="unfinished">Joystick Status</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/JoystickIndicator.qml" line="40"/>
       <source>Connected:</source>
-      <translation>Connected:</translation>
+      <translation type="unfinished">Connected:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/JoystickIndicator.qml" line="42"/>
@@ -8603,7 +8603,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/toolbar/JoystickIndicator.qml" line="45"/>
       <source>Enabled:</source>
-      <translation>Enabled:</translation>
+      <translation type="unfinished">Enabled:</translation>
     </message>
   </context>
   <context>
@@ -8650,7 +8650,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Utilities/Shape/KMLHelper.cc" line="19"/>
       <source>KML file load failed. %1</source>
-      <translation>KML file load failed. %1</translation>
+      <translation type="unfinished">KML file load failed. %1</translation>
     </message>
   </context>
   <context>
@@ -8666,12 +8666,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/LandingComplexItem.cc" line="709"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation>%1 does not support loading this complex mission item type: %2:%3</translation>
+      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/LandingComplexItem.cc" line="729"/>
       <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation>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 relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
+      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
     </message>
   </context>
   <context>
@@ -8692,34 +8692,34 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="268"/>
       <source>Connect not allowed: %1</source>
-      <translation>Connect not allowed: %1</translation>
+      <translation type="unfinished">Connect not allowed: %1</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="891"/>
       <location filename="../src/Comms/LinkManager.cc" line="895"/>
       <location filename="../src/Comms/LinkManager.cc" line="898"/>
       <source>%1 on %2 (AutoConnect)</source>
-      <translation>%1 on %2 (AutoConnect)</translation>
+      <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="538"/>
       <source>Shutdown</source>
-      <translation>Shutdown</translation>
+      <translation type="unfinished">Shutdown</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="556"/>
       <source>Serial</source>
-      <translation>Serial</translation>
+      <translation type="unfinished">Serial</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="558"/>
       <source>UDP</source>
-      <translation>UDP</translation>
+      <translation type="unfinished">UDP</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="559"/>
       <source>TCP</source>
-      <translation>TCP</translation>
+      <translation type="unfinished">TCP</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="561"/>
@@ -8729,7 +8729,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="564"/>
       <source>Mock Link</source>
-      <translation>Mock Link</translation>
+      <translation type="unfinished">Mock Link</translation>
     </message>
     <message>
       <location filename="../src/Comms/LinkManager.cc" line="567"/>
@@ -8740,7 +8740,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/Comms/LinkManager.cc" line="569"/>
       <location filename="../src/Comms/LinkManager.cc" line="733"/>
       <source>Log Replay</source>
-      <translation>Log Replay</translation>
+      <translation type="unfinished">Log Replay</translation>
     </message>
   </context>
   <context>
@@ -8748,12 +8748,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="192"/>
       <source>Add</source>
-      <translation>Add</translation>
+      <translation type="unfinished">Add</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="178"/>
       <source>Connect</source>
-      <translation>Connect</translation>
+      <translation type="unfinished">Connect</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="26"/>
@@ -8843,7 +8843,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="178"/>
       <source>Disconnect</source>
-      <translation>Disconnect</translation>
+      <translation type="unfinished">Disconnect</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="191"/>
@@ -8859,27 +8859,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="233"/>
       <source>Name</source>
-      <translation>Name</translation>
+      <translation type="unfinished">Name</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="238"/>
       <source>Enter name</source>
-      <translation>Enter name</translation>
+      <translation type="unfinished">Enter name</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="244"/>
       <source>Automatically Connect on Start</source>
-      <translation>Automatically Connect on Start</translation>
+      <translation type="unfinished">Automatically Connect on Start</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="251"/>
       <source>High Latency</source>
-      <translation>High Latency</translation>
+      <translation type="unfinished">High Latency</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="257"/>
       <source>Type</source>
-      <translation>Type</translation>
+      <translation type="unfinished">Type</translation>
     </message>
   </context>
   <context>
@@ -8887,28 +8887,28 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="191"/>
       <source>Available</source>
-      <translation>Available</translation>
+      <translation type="unfinished">Available</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="495"/>
       <source>Canceled</source>
-      <translation>Canceled</translation>
+      <translation type="unfinished">Canceled</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="124"/>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="301"/>
       <source>Error</source>
-      <translation>Error</translation>
+      <translation type="unfinished">Error</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="282"/>
       <source>Downloaded</source>
-      <translation>Downloaded</translation>
+      <translation type="unfinished">Downloaded</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadController.cc" line="77"/>
       <source>Waiting</source>
-      <translation>Waiting</translation>
+      <translation type="unfinished">Waiting</translation>
     </message>
   </context>
   <context>
@@ -8916,52 +8916,52 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="23"/>
       <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
+      <translation type="unfinished">Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="63"/>
       <source>Id</source>
-      <translation>Id</translation>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="71"/>
       <source>Date</source>
-      <translation>Date</translation>
+      <translation type="unfinished">Date</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="83"/>
       <source>Date Unknown</source>
-      <translation>Date Unknown</translation>
+      <translation type="unfinished">Date Unknown</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="91"/>
       <source>Size</source>
-      <translation>Size</translation>
+      <translation type="unfinished">Size</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="99"/>
       <source>Status</source>
-      <translation>Status</translation>
+      <translation type="unfinished">Status</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="117"/>
       <source>Refresh</source>
-      <translation>Refresh</translation>
+      <translation type="unfinished">Refresh</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="121"/>
       <source>Log Refresh</source>
-      <translation>Log Refresh</translation>
+      <translation type="unfinished">Log Refresh</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="121"/>
       <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation>You must be connected to a vehicle in order to download logs.</translation>
+      <translation type="unfinished">You must be connected to a vehicle in order to download logs.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="132"/>
       <source>Download</source>
-      <translation>Download</translation>
+      <translation type="unfinished">Download</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="144"/>
@@ -8976,27 +8976,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="153"/>
       <source>Select save directory</source>
-      <translation>Select save directory</translation>
+      <translation type="unfinished">Select save directory</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="171"/>
       <source>Erase All</source>
-      <translation>Erase All</translation>
+      <translation type="unfinished">Erase All</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="173"/>
       <source>Delete All Log Files</source>
-      <translation>Delete All Log Files</translation>
+      <translation type="unfinished">Delete All Log Files</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="174"/>
       <source>All log files will be erased permanently. Is this really what you want?</source>
-      <translation>All log files will be erased permanently. Is this really what you want?</translation>
+      <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="182"/>
       <source>Cancel</source>
-      <translation>Cancel</translation>
+      <translation type="unfinished">Cancel</translation>
     </message>
   </context>
   <context>
@@ -9025,27 +9025,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="25"/>
       <source>Log File</source>
-      <translation>Log File</translation>
+      <translation type="unfinished">Log File</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="34"/>
       <source>Browse</source>
-      <translation>Browse</translation>
+      <translation type="unfinished">Browse</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="40"/>
       <source>Select Telemetery Log</source>
-      <translation>Select Telemetery Log</translation>
+      <translation type="unfinished">Select Telemetery Log</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="41"/>
       <source>Telemetry Logs (*.%1)</source>
-      <translation>Telemetry Logs (*.%1)</translation>
+      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="41"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
   </context>
   <context>
@@ -9053,47 +9053,47 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
       <source>Log Replay</source>
-      <translation>Log Replay</translation>
+      <translation type="unfinished">Log Replay</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
       <source>You must close all connections prior to replaying a log.</source>
-      <translation>You must close all connections prior to replaying a log.</translation>
+      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
       <source>Select Telemetery Log</source>
-      <translation>Select Telemetery Log</translation>
+      <translation type="unfinished">Select Telemetery Log</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
       <source>Telemetry Logs (*.%1)</source>
-      <translation>Telemetry Logs (*.%1)</translation>
+      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="58"/>
       <source>Pause</source>
-      <translation>Pause</translation>
+      <translation type="unfinished">Pause</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="58"/>
       <source>Play</source>
-      <translation>Play</translation>
+      <translation type="unfinished">Play</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="106"/>
       <source>Load Telemetry Log</source>
-      <translation>Load Telemetry Log</translation>
+      <translation type="unfinished">Load Telemetry Log</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="112"/>
       <source>Close</source>
-      <translation>Close</translation>
+      <translation type="unfinished">Close</translation>
     </message>
   </context>
   <context>
@@ -9135,152 +9135,152 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="271"/>
       <source>Gyro</source>
-      <translation>Gyro</translation>
+      <translation type="unfinished">Gyro</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="272"/>
       <source>Accelerometer</source>
-      <translation>Accelerometer</translation>
+      <translation type="unfinished">Accelerometer</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="273"/>
       <source>Magnetometer</source>
-      <translation>Magnetometer</translation>
+      <translation type="unfinished">Magnetometer</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="274"/>
       <source>Absolute pressure</source>
-      <translation>Absolute pressure</translation>
+      <translation type="unfinished">Absolute pressure</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="275"/>
       <source>Differential pressure</source>
-      <translation>Differential pressure</translation>
+      <translation type="unfinished">Differential pressure</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="276"/>
       <source>GPS</source>
-      <translation>GPS</translation>
+      <translation type="unfinished">GPS</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="277"/>
       <source>Optical flow</source>
-      <translation>Optical flow</translation>
+      <translation type="unfinished">Optical flow</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="278"/>
       <source>Computer vision position</source>
-      <translation>Computer vision position</translation>
+      <translation type="unfinished">Computer vision position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="279"/>
       <source>Laser based position</source>
-      <translation>Laser based position</translation>
+      <translation type="unfinished">Laser based position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="280"/>
       <source>External ground truth</source>
-      <translation>External ground truth</translation>
+      <translation type="unfinished">External ground truth</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="281"/>
       <source>Angular rate control</source>
-      <translation>Angular rate control</translation>
+      <translation type="unfinished">Angular rate control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="282"/>
       <source>Attitude stabilization</source>
-      <translation>Attitude stabilization</translation>
+      <translation type="unfinished">Attitude stabilization</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="283"/>
       <source>Yaw position</source>
-      <translation>Yaw position</translation>
+      <translation type="unfinished">Yaw position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="284"/>
       <source>Z/altitude control</source>
-      <translation>Z/altitude control</translation>
+      <translation type="unfinished">Z/altitude control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="285"/>
       <source>X/Y position control</source>
-      <translation>X/Y position control</translation>
+      <translation type="unfinished">X/Y position control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="286"/>
       <source>Motor outputs / control</source>
-      <translation>Motor outputs / control</translation>
+      <translation type="unfinished">Motor outputs / control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="287"/>
       <source>RC receiver</source>
-      <translation>RC receiver</translation>
+      <translation type="unfinished">RC receiver</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="288"/>
       <source>Gyro 2</source>
-      <translation>Gyro 2</translation>
+      <translation type="unfinished">Gyro 2</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="289"/>
       <source>Accelerometer 2</source>
-      <translation>Accelerometer 2</translation>
+      <translation type="unfinished">Accelerometer 2</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="290"/>
       <source>Magnetometer 2</source>
-      <translation>Magnetometer 2</translation>
+      <translation type="unfinished">Magnetometer 2</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="291"/>
       <source>GeoFence</source>
-      <translation>GeoFence</translation>
+      <translation type="unfinished">GeoFence</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="292"/>
       <source>AHRS</source>
-      <translation>AHRS</translation>
+      <translation type="unfinished">AHRS</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="293"/>
       <source>Terrain</source>
-      <translation>Terrain</translation>
+      <translation type="unfinished">Terrain</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="294"/>
       <source>Motors reversed</source>
-      <translation>Motors reversed</translation>
+      <translation type="unfinished">Motors reversed</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="295"/>
       <source>Logging</source>
-      <translation>Logging</translation>
+      <translation type="unfinished">Logging</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="296"/>
       <source>Battery</source>
-      <translation>Battery</translation>
+      <translation type="unfinished">Battery</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="297"/>
       <source>Proximity</source>
-      <translation>Proximity</translation>
+      <translation type="unfinished">Proximity</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="298"/>
       <source>Satellite Communication</source>
-      <translation>Satellite Communication</translation>
+      <translation type="unfinished">Satellite Communication</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="299"/>
       <source>Pre-Arm Check</source>
-      <translation>Pre-Arm Check</translation>
+      <translation type="unfinished">Pre-Arm Check</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="300"/>
       <source>Avoidance/collision prevention</source>
-      <translation>Avoidance/collision prevention</translation>
+      <translation type="unfinished">Avoidance/collision prevention</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="301"/>
@@ -9293,7 +9293,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="313"/>
       <source>Unknown sensor</source>
-      <translation>Unknown sensor</translation>
+      <translation type="unfinished">Unknown sensor</translation>
     </message>
   </context>
   <context>
@@ -9301,12 +9301,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
       <source>Scale:</source>
-      <translation>Scale:</translation>
+      <translation type="unfinished">Scale:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
       <source>Range:</source>
-      <translation>Range:</translation>
+      <translation type="unfinished">Range:</translation>
     </message>
   </context>
   <context>
@@ -9332,79 +9332,79 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="64"/>
       <source>5 Sec</source>
-      <translation>5 Sec</translation>
+      <translation type="unfinished">5 Sec</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="65"/>
       <source>10 Sec</source>
-      <translation>10 Sec</translation>
+      <translation type="unfinished">10 Sec</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="66"/>
       <source>30 Sec</source>
-      <translation>30 Sec</translation>
+      <translation type="unfinished">30 Sec</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="67"/>
       <source>60 Sec</source>
-      <translation>60 Sec</translation>
+      <translation type="unfinished">60 Sec</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="70"/>
       <source>Auto</source>
-      <translation>Auto</translation>
+      <translation type="unfinished">Auto</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="71"/>
       <source>10,000</source>
-      <translation>10,000</translation>
+      <translation type="unfinished">10,000</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="72"/>
       <source>1,000</source>
-      <translation>1,000</translation>
+      <translation type="unfinished">1,000</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="73"/>
       <source>100</source>
-      <translation>100</translation>
+      <translation type="unfinished">100</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="74"/>
       <source>10</source>
-      <translation>10</translation>
+      <translation type="unfinished">10</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="75"/>
       <source>1</source>
-      <translation>1</translation>
+      <translation type="unfinished">1</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="76"/>
       <source>0.1</source>
-      <translation>0.1</translation>
+      <translation type="unfinished">0.1</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="77"/>
       <source>0.01</source>
-      <translation>0.01</translation>
+      <translation type="unfinished">0.01</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="78"/>
       <source>0.001</source>
-      <translation>0.001</translation>
+      <translation type="unfinished">0.001</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="79"/>
       <source>0.0001</source>
-      <translation>0.0001</translation>
+      <translation type="unfinished">0.0001</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="169"/>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="195"/>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="211"/>
       <source>System %1</source>
-      <translation>System %1</translation>
+      <translation type="unfinished">System %1</translation>
     </message>
   </context>
   <context>
@@ -9412,22 +9412,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="79"/>
       <source>Inspect real time MAVLink messages.</source>
-      <translation>Inspect real time MAVLink messages.</translation>
+      <translation type="unfinished">Inspect real time MAVLink messages.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="176"/>
       <source>Message:</source>
-      <translation>Message:</translation>
+      <translation type="unfinished">Message:</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="184"/>
       <source>Component:</source>
-      <translation>Component:</translation>
+      <translation type="unfinished">Component:</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="187"/>
       <source>Count:</source>
-      <translation>Count:</translation>
+      <translation type="unfinished">Count:</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="190"/>
@@ -9522,27 +9522,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="244"/>
       <source>Name</source>
-      <translation>Name</translation>
+      <translation type="unfinished">Name</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="247"/>
       <source>Value</source>
-      <translation>Value</translation>
+      <translation type="unfinished">Value</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="250"/>
       <source>Type</source>
-      <translation>Type</translation>
+      <translation type="unfinished">Type</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="253"/>
       <source>Plot 1</source>
-      <translation>Plot 1</translation>
+      <translation type="unfinished">Plot 1</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="256"/>
       <source>Plot 2</source>
-      <translation>Plot 2</translation>
+      <translation type="unfinished">Plot 2</translation>
     </message>
   </context>
   <context>
@@ -9568,47 +9568,47 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="46"/>
       <source>Ready To Fly</source>
-      <translation>Ready To Fly</translation>
+      <translation type="unfinished">Ready To Fly</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="47"/>
       <source>Not Ready</source>
-      <translation>Not Ready</translation>
+      <translation type="unfinished">Not Ready</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="49"/>
       <source>Armed</source>
-      <translation>Armed</translation>
+      <translation type="unfinished">Armed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="50"/>
       <source>Flying</source>
-      <translation>Flying</translation>
+      <translation type="unfinished">Flying</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="51"/>
       <source>Landing</source>
-      <translation>Landing</translation>
+      <translation type="unfinished">Landing</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="153"/>
       <source>FW(vtol)</source>
-      <translation>FW(vtol)</translation>
+      <translation type="unfinished">FW(vtol)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="153"/>
       <source>MR(vtol)</source>
-      <translation>MR(vtol)</translation>
+      <translation type="unfinished">MR(vtol)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="228"/>
       <source>Sensor Status</source>
-      <translation>Sensor Status</translation>
+      <translation type="unfinished">Sensor Status</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="194"/>
       <source>Disarm</source>
-      <translation>Disarm</translation>
+      <translation type="unfinished">Disarm</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="45"/>
@@ -9623,12 +9623,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="194"/>
       <source>Force Arm</source>
-      <translation>Force Arm</translation>
+      <translation type="unfinished">Force Arm</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="194"/>
       <source>Arm</source>
-      <translation>Arm</translation>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="218"/>
@@ -9664,12 +9664,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="388"/>
       <source>Transition to Multi-Rotor</source>
-      <translation>Transition to Multi-Rotor</translation>
+      <translation type="unfinished">Transition to Multi-Rotor</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="388"/>
       <source>Transition to Fixed Wing</source>
-      <translation>Transition to Fixed Wing</translation>
+      <translation type="unfinished">Transition to Fixed Wing</translation>
     </message>
   </context>
   <context>
@@ -9833,37 +9833,37 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="46"/>
       <source> km</source>
-      <translation> km</translation>
+      <translation type="unfinished"> km</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="48"/>
       <source> m</source>
-      <translation> m</translation>
+      <translation type="unfinished"> m</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="59"/>
       <source> mile</source>
-      <translation> mile</translation>
+      <translation type="unfinished"> mile</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="61"/>
       <source> miles</source>
-      <translation> miles</translation>
+      <translation type="unfinished"> miles</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="64"/>
       <source> ft</source>
-      <translation> ft</translation>
+      <translation type="unfinished"> ft</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="207"/>
       <source>+</source>
-      <translation>+</translation>
+      <translation type="unfinished">+</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapScale.qml" line="220"/>
       <source>-</source>
-      <translation>-</translation>
+      <translation type="unfinished">-</translation>
     </message>
   </context>
   <context>
@@ -10076,7 +10076,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionCommandDialog.qml" line="36"/>
       <source>Category:</source>
-      <translation>Category:</translation>
+      <translation type="unfinished">Category:</translation>
     </message>
   </context>
   <context>
@@ -10084,7 +10084,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/MissionCommandTree.h" line="93"/>
       <source>All commands</source>
-      <translation>All commands</translation>
+      <translation type="unfinished">All commands</translation>
     </message>
   </context>
   <context>
@@ -10092,39 +10092,39 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="793"/>
       <source>Mission item %1 is not an object</source>
-      <translation>Mission item %1 is not an object</translation>
+      <translation type="unfinished">Mission item %1 is not an object</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="879"/>
       <source>Unsupported complex item type: %1</source>
-      <translation>Unsupported complex item type: %1</translation>
+      <translation type="unfinished">Unsupported complex item type: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="882"/>
       <source>Unknown item type: %1</source>
-      <translation>Unknown item type: %1</translation>
+      <translation type="unfinished">Unknown item type: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="905"/>
       <source>Could not find doJumpId: %1</source>
-      <translation>Could not find doJumpId: %1</translation>
+      <translation type="unfinished">Could not find doJumpId: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="978"/>
       <source>The mission file is corrupted.</source>
-      <translation>The mission file is corrupted.</translation>
+      <translation type="unfinished">The mission file is corrupted.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="983"/>
       <source>The mission file is not compatible with this version of %1.</source>
-      <translation>The mission file is not compatible with this version of %1.</translation>
+      <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionController.cc" line="1031"/>
       <location filename="../src/MissionManager/MissionController.cc" line="1046"/>
       <location filename="../src/MissionManager/MissionController.cc" line="1070"/>
       <source>Mission: %1</source>
-      <translation>Mission: %1</translation>
+      <translation type="unfinished">Mission: %1</translation>
     </message>
   </context>
   <context>
@@ -10132,17 +10132,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/MissionItem.cc" line="270"/>
       <source>Type found: %1 must be: %2</source>
-      <translation>Type found: %1 must be: %2</translation>
+      <translation type="unfinished">Type found: %1 must be: %2</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionItem.cc" line="276"/>
       <source>%1 key must contains 7 values</source>
-      <translation>%1 key must contains 7 values</translation>
+      <translation type="unfinished">%1 key must contains 7 values</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionItem.cc" line="282"/>
       <source>Param %1 incorrect type %2, must be double or null</source>
-      <translation>Param %1 incorrect type %2, must be double or null</translation>
+      <translation type="unfinished">Param %1 incorrect type %2, must be double or null</translation>
     </message>
   </context>
   <context>
@@ -10151,42 +10151,42 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="102"/>
       <source>?</source>
       <extracomment>Indicator in Plan view to show mission item is not ready for save/send</extracomment>
-      <translation>?</translation>
+      <translation type="unfinished">?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="196"/>
       <source>Move to vehicle position</source>
-      <translation>Move to vehicle position</translation>
+      <translation type="unfinished">Move to vehicle position</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="209"/>
       <source>Move to previous item position</source>
-      <translation>Move to previous item position</translation>
+      <translation type="unfinished">Move to previous item position</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="219"/>
       <source>Edit position...</source>
-      <translation>Edit position...</translation>
+      <translation type="unfinished">Edit position...</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="235"/>
       <source>Show all values</source>
-      <translation>Show all values</translation>
+      <translation type="unfinished">Show all values</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="245"/>
       <source>Mission Edit</source>
-      <translation>Mission Edit</translation>
+      <translation type="unfinished">Mission Edit</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="245"/>
       <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
-      <translation>You have made changes to the mission item which cannot be shown in Simple Mode</translation>
+      <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="258"/>
       <source>Item #%1</source>
-      <translation>Item #%1</translation>
+      <translation type="unfinished">Item #%1</translation>
     </message>
   </context>
   <context>
@@ -10194,7 +10194,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionItemStatus.qml" line="46"/>
       <source>Terrain Altitude</source>
-      <translation>Terrain Altitude</translation>
+      <translation type="unfinished">Terrain Altitude</translation>
     </message>
   </context>
   <context>
@@ -10202,7 +10202,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/MissionManager.cc" line="112"/>
       <source>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</source>
-      <translation>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
+      <translation type="unfinished">Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
     </message>
   </context>
   <context>
@@ -10210,72 +10210,72 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="42"/>
       <source>Firmware</source>
-      <translation>Firmware</translation>
+      <translation type="unfinished">Firmware</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="43"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="131"/>
       <source>Flight speed</source>
-      <translation>Flight speed</translation>
+      <translation type="unfinished">Flight speed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="158"/>
       <source>Above camera commands will take affect immediately upon mission start.</source>
-      <translation>Above camera commands will take affect immediately upon mission start.</translation>
+      <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="251"/>
       <source>Launch Position</source>
-      <translation>Launch Position</translation>
+      <translation type="unfinished">Launch Position</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="287"/>
       <source>Set To Map Center</source>
-      <translation>Set To Map Center</translation>
+      <translation type="unfinished">Set To Map Center</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="169"/>
       <source>Vehicle Info</source>
-      <translation>Vehicle Info</translation>
+      <translation type="unfinished">Vehicle Info</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="68"/>
       <source>All Altitudes</source>
-      <translation>All Altitudes</translation>
+      <translation type="unfinished">All Altitudes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="115"/>
       <source>Initial Waypoint Alt</source>
-      <translation>Initial Waypoint Alt</translation>
+      <translation type="unfinished">Initial Waypoint Alt</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="220"/>
       <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
+      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="225"/>
       <source>Cruise speed</source>
-      <translation>Cruise speed</translation>
+      <translation type="unfinished">Cruise speed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="236"/>
       <source>Hover speed</source>
-      <translation>Hover speed</translation>
+      <translation type="unfinished">Hover speed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="270"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="282"/>
       <source>Actual position set by vehicle at flight time.</source>
-      <translation>Actual position set by vehicle at flight time.</translation>
+      <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
     </message>
   </context>
   <context>
@@ -10283,12 +10283,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/MissionSettingsItem.cc" line="287"/>
       <source>L</source>
-      <translation>L</translation>
+      <translation type="unfinished">L</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionSettingsItem.cc" line="287"/>
       <source>Launch</source>
-      <translation>Launch</translation>
+      <translation type="unfinished">Launch</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/MissionSettingsItem.h" line="75"/>
@@ -10348,7 +10348,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Comms/MockLink/MockConfiguration.h" line="37"/>
       <source>Mock Link Settings</source>
-      <translation>Mock Link Settings</translation>
+      <translation type="unfinished">Mock Link Settings</translation>
     </message>
   </context>
   <context>
@@ -10501,7 +10501,7 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="50"/>
       <source>Warning: Unable to determine motor count</source>
-      <translation>Warning: Unable to determine motor count</translation>
+      <translation type="unfinished">Warning: Unable to determine motor count</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="63"/>
@@ -10521,7 +10521,7 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="100"/>
       <source>All</source>
-      <translation>All</translation>
+      <translation type="unfinished">All</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="110"/>
@@ -10541,12 +10541,12 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/MotorComponent.h" line="23"/>
       <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation>Motors Setup is used to manually test motor control and direction.</translation>
+      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
     </message>
   </context>
   <context>
@@ -10554,77 +10554,77 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
       <source>Multirotor Initial Checks</source>
-      <translation>Multirotor Initial Checks</translation>
+      <translation type="unfinished">Multirotor Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
       <source>Hardware</source>
-      <translation>Hardware</translation>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
       <source>Props mounted and secured?</source>
-      <translation>Props mounted and secured?</translation>
+      <translation type="unfinished">Props mounted and secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>Please arm the vehicle here</translation>
+      <translation type="unfinished">Please arm the vehicle here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
       <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation>Propellers free? Then throttle up gently. Working properly?</translation>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
       <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation>Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
       <source>Last preparations before launch</source>
-      <translation>Last preparations before launch</translation>
+      <translation type="unfinished">Last preparations before launch</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
       <source>Payload</source>
-      <translation>Payload</translation>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
       <source>Configured and started? Payload lid closed?</source>
-      <translation>Configured and started? Payload lid closed?</translation>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
       <source>Wind &amp; weather</source>
-      <translation>Wind &amp; weather</translation>
+      <translation type="unfinished">Wind &amp; weather</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
       <source>OK for your platform?</source>
-      <translation>OK for your platform?</translation>
+      <translation type="unfinished">OK for your platform?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
       <source>Flight area</source>
-      <translation>Flight area</translation>
+      <translation type="unfinished">Flight area</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
       <source>Launch area and path free of obstacles/people?</source>
-      <translation>Launch area and path free of obstacles/people?</translation>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
     </message>
   </context>
   <context>
@@ -10632,12 +10632,12 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="198"/>
       <source>Armed</source>
-      <translation>Armed</translation>
+      <translation type="unfinished">Armed</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="198"/>
       <source>Disarmed</source>
-      <translation>Disarmed</translation>
+      <translation type="unfinished">Disarmed</translation>
     </message>
   </context>
   <context>
@@ -10645,12 +10645,12 @@ Do you wish to proceed?</translation>
     <message>
       <location filename="../src/Vehicle/MultiVehicleManager.cc" line="141"/>
       <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation>Warning: A vehicle is using the same system id as %1: %2</translation>
+      <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/MultiVehicleManager.cc" line="159"/>
       <source>Connected to Vehicle %1</source>
-      <translation>Connected to Vehicle %1</translation>
+      <translation type="unfinished">Connected to Vehicle %1</translation>
     </message>
   </context>
   <context>
@@ -10659,7 +10659,7 @@ Do you wish to proceed?</translation>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="52"/>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="113"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="52"/>
@@ -10843,22 +10843,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
       <source>Vehicle Information</source>
-      <translation>Vehicle Information</translation>
+      <translation type="unfinished">Vehicle Information</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
       <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
+      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
       <source>Firmware</source>
-      <translation>Firmware</translation>
+      <translation type="unfinished">Firmware</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
   </context>
   <context>
@@ -10874,27 +10874,27 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="334"/>
       <source>Select Tuning:</source>
-      <translation>Select Tuning:</translation>
+      <translation type="unfinished">Select Tuning:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="360"/>
       <source>Clipboard Values:</source>
-      <translation>Clipboard Values:</translation>
+      <translation type="unfinished">Clipboard Values:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
       <source>Save To Clipboard</source>
-      <translation>Save To Clipboard</translation>
+      <translation type="unfinished">Save To Clipboard</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="391"/>
       <source>Restore From Clipboard</source>
-      <translation>Restore From Clipboard</translation>
+      <translation type="unfinished">Restore From Clipboard</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="251"/>
       <source>Clear</source>
-      <translation>Clear</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="122"/>
@@ -10904,27 +10904,27 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="256"/>
       <source>Stop</source>
-      <translation>Stop</translation>
+      <translation type="unfinished">Stop</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="256"/>
       <source>Start</source>
-      <translation>Start</translation>
+      <translation type="unfinished">Start</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="279"/>
       <source>Automatic Flight Mode Switching</source>
-      <translation>Automatic Flight Mode Switching</translation>
+      <translation type="unfinished">Automatic Flight Mode Switching</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="289"/>
       <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
-      <translation>Switches to &apos;Stabilized&apos; when you click Start.</translation>
+      <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="294"/>
       <source>Switches to &apos;%1&apos; when you click Stop.</source>
-      <translation>Switches to &apos;%1&apos; when you click Stop.</translation>
+      <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="310"/>
@@ -10942,7 +10942,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="147"/>
       <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
+      <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
     </message>
   </context>
   <context>
@@ -10978,122 +10978,122 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="35"/>
       <source>Manual</source>
-      <translation>Manual</translation>
+      <translation type="unfinished">Manual</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="36"/>
       <source>Acro</source>
-      <translation>Acro</translation>
+      <translation type="unfinished">Acro</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="37"/>
       <source>Stabilized</source>
-      <translation>Stabilized</translation>
+      <translation type="unfinished">Stabilized</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="38"/>
       <source>Rattitude</source>
-      <translation>Rattitude</translation>
+      <translation type="unfinished">Rattitude</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
       <source>Position</source>
-      <translation>Position</translation>
+      <translation type="unfinished">Position</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
       <source>Offboard</source>
-      <translation>Offboard</translation>
+      <translation type="unfinished">Offboard</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
       <source>Ready</source>
-      <translation>Ready</translation>
+      <translation type="unfinished">Ready</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
       <source>Hold</source>
-      <translation>Hold</translation>
+      <translation type="unfinished">Hold</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
       <source>Return</source>
-      <translation>Return</translation>
+      <translation type="unfinished">Return</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
       <source>Land</source>
-      <translation>Land</translation>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
       <source>Precision Land</source>
-      <translation>Precision Land</translation>
+      <translation type="unfinished">Precision Land</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
       <source>Return to Groundstation</source>
-      <translation>Return to Groundstation</translation>
+      <translation type="unfinished">Return to Groundstation</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
       <source>Follow Me</source>
-      <translation>Follow Me</translation>
+      <translation type="unfinished">Follow Me</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
       <source>Simple</source>
-      <translation>Simple</translation>
+      <translation type="unfinished">Simple</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
       <source>Orbit</source>
-      <translation>Orbit</translation>
+      <translation type="unfinished">Orbit</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="136"/>
       <source>Unknown %1:%2</source>
-      <translation>Unknown %1:%2</translation>
+      <translation type="unfinished">Unknown %1:%2</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="342"/>
       <source>Unable to takeoff, vehicle position not known.</source>
-      <translation>Unable to takeoff, vehicle position not known.</translation>
+      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="410"/>
       <source>Unable to go to location, vehicle position not known.</source>
-      <translation>Unable to go to location, vehicle position not known.</translation>
+      <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="481"/>
       <source>Unable to pause vehicle.</source>
-      <translation>Unable to pause vehicle.</translation>
+      <translation type="unfinished">Unable to pause vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="490"/>
       <source>Unable to change altitude, home position unknown.</source>
-      <translation>Unable to change altitude, home position unknown.</translation>
+      <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="494"/>
       <source>Unable to change altitude, home position altitude unknown.</source>
-      <translation>Unable to change altitude, home position altitude unknown.</translation>
+      <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="555"/>
@@ -11113,17 +11113,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="589"/>
       <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation>Unable to start mission: Vehicle rejected arming.</translation>
+      <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="593"/>
       <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
-      <translation>Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
+      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="710"/>
       <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>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
+      <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
     </message>
   </context>
   <context>
@@ -11131,32 +11131,32 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="152"/>
       <source>Programming new version...</source>
-      <translation>Programming new version...</translation>
+      <translation type="unfinished">Programming new version...</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="162"/>
       <source>Verifying program...</source>
-      <translation>Verifying program...</translation>
+      <translation type="unfinished">Verifying program...</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="166"/>
       <source>Verify complete</source>
-      <translation>Verify complete</translation>
+      <translation type="unfinished">Verify complete</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="173"/>
       <source>Rebooting board</source>
-      <translation>Rebooting board</translation>
+      <translation type="unfinished">Rebooting board</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="197"/>
       <source>Erasing previous program...</source>
-      <translation>Erasing previous program...</translation>
+      <translation type="unfinished">Erasing previous program...</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="201"/>
       <source>Erase complete</source>
-      <translation>Erase complete</translation>
+      <translation type="unfinished">Erase complete</translation>
     </message>
   </context>
   <context>
@@ -11164,12 +11164,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
       <source>Flight Behavior</source>
-      <translation>Flight Behavior</translation>
+      <translation type="unfinished">Flight Behavior</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
       <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation>Flight Behavior is used to configure flight characteristics.</translation>
+      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
     </message>
   </context>
   <context>
@@ -11177,17 +11177,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
       <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
+      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
       <source>Responsiveness</source>
-      <translation>Responsiveness</translation>
+      <translation type="unfinished">Responsiveness</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
       <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
+      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="80"/>
@@ -11197,22 +11197,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
       <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
+      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
       <source>Horizontal velocity (m/s)</source>
-      <translation>Horizontal velocity (m/s)</translation>
+      <translation type="unfinished">Horizontal velocity (m/s)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
       <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation>Limit the horizonal velocity (applies to all modes).</translation>
+      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
       <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
+      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
@@ -11222,17 +11222,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
       <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation>Limit the vertical velocity (applies to all modes).</translation>
+      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
       <source>Mission Turning Radius</source>
-      <translation>Mission Turning Radius</translation>
+      <translation type="unfinished">Mission Turning Radius</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
       <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
+      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
     </message>
   </context>
   <context>
@@ -11495,12 +11495,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
-      <translation>Enabled</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
   </context>
   <context>
@@ -11508,12 +11508,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="17"/>
       <source>Radio</source>
-      <translation>Radio</translation>
+      <translation type="unfinished">Radio</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="28"/>
       <source>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</source>
-      <translation>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
+      <translation type="unfinished">Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
     </message>
   </context>
   <context>
@@ -11521,7 +11521,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
@@ -11529,44 +11529,44 @@ Is this really what you want?</translation>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
       <source>Throttle</source>
-      <translation>Throttle</translation>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
       <source>Flaps</source>
-      <translation>Flaps</translation>
+      <translation type="unfinished">Flaps</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
       <source>Aux1</source>
-      <translation>Aux1</translation>
+      <translation type="unfinished">Aux1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
       <source>Aux2</source>
-      <translation>Aux2</translation>
+      <translation type="unfinished">Aux2</translation>
     </message>
   </context>
   <context>
@@ -11574,22 +11574,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
       <source>Flight Mode Settings</source>
-      <translation>Flight Mode Settings</translation>
+      <translation type="unfinished">Flight Mode Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
       <source>Mode Channel</source>
-      <translation>Mode Channel</translation>
+      <translation type="unfinished">Mode Channel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
       <source>Flight Mode %1</source>
-      <translation>Flight Mode %1</translation>
+      <translation type="unfinished">Flight Mode %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
       <source>Switch Settings</source>
-      <translation>Switch Settings</translation>
+      <translation type="unfinished">Switch Settings</translation>
     </message>
   </context>
   <context>
@@ -11597,12 +11597,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
       <source>PID Tuning</source>
-      <translation>PID Tuning</translation>
+      <translation type="unfinished">PID Tuning</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
       <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation>Tuning Setup is used to tune the flight controllers.</translation>
+      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
     </message>
   </context>
   <context>
@@ -11610,22 +11610,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="22"/>
       <source>Rate Controller</source>
-      <translation>Rate Controller</translation>
+      <translation type="unfinished">Rate Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="26"/>
       <source>Attitude Controller</source>
-      <translation>Attitude Controller</translation>
+      <translation type="unfinished">Attitude Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="30"/>
       <source>Velocity Controller</source>
-      <translation>Velocity Controller</translation>
+      <translation type="unfinished">Velocity Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
       <source>Position Controller</source>
-      <translation>Position Controller</translation>
+      <translation type="unfinished">Position Controller</translation>
     </message>
   </context>
   <context>
@@ -11633,43 +11633,43 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="31"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="38"/>
       <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation>Proportional Gain (MC_ROLL_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="39"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="56"/>
       <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation>Increase for more responsiveness, reduce if the attitude overshoots.</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="48"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="55"/>
       <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation>Proportional Gain (MC_PITCH_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="65"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="72"/>
       <source>Proportional Gain (MC_YAW_P)</source>
-      <translation>Proportional Gain (MC_YAW_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="73"/>
       <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
     </message>
   </context>
   <context>
@@ -11677,38 +11677,38 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
       <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation>Position control mode (set this to &apos;simple&apos; during tuning):</translation>
+      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="46"/>
       <source>Horizontal</source>
-      <translation>Horizontal</translation>
+      <translation type="unfinished">Horizontal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="47"/>
       <source>Horizontal (Y direction, sidewards)</source>
-      <translation>Horizontal (Y direction, sidewards)</translation>
+      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="54"/>
       <source>Proportional gain (MPC_XY_P)</source>
-      <translation>Proportional gain (MPC_XY_P)</translation>
+      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="55"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="72"/>
       <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="64"/>
       <source>Vertical</source>
-      <translation>Vertical</translation>
+      <translation type="unfinished">Vertical</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="71"/>
       <source>Proportional gain (MPC_Z_P)</source>
-      <translation>Proportional gain (MPC_Z_P)</translation>
+      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
     </message>
   </context>
   <context>
@@ -11736,77 +11736,77 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="79"/>
       <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation>Overall Multiplier (MC_ROLLRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="146"/>
       <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
+      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="87"/>
       <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation>Differential Gain (MC_ROLLRATE_D)</translation>
+      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="88"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="121"/>
       <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
+      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="95"/>
       <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation>Integral Gain (MC_ROLLRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="96"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="129"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="154"/>
       <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation>Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
+      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="112"/>
       <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation>Overall Multiplier (MC_PITCHRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="120"/>
       <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation>Differential Gain (MC_PITCHRATE_D)</translation>
+      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="128"/>
       <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation>Integral Gain (MC_PITCHRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="145"/>
       <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation>Overall Multiplier (MC_YAWRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="153"/>
       <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation>Integral Gain (MC_YAWRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
     </message>
   </context>
   <context>
@@ -11814,74 +11814,74 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
       <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation>Position control mode (set this to &apos;simple&apos; during tuning):</translation>
+      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="46"/>
       <source>Horizontal</source>
-      <translation>Horizontal</translation>
+      <translation type="unfinished">Horizontal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="47"/>
       <source>Horizontal (Y direction, sidewards)</source>
-      <translation>Horizontal (Y direction, sidewards)</translation>
+      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="54"/>
       <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation>Proportional gain (MPC_XY_VEL_P_ACC)</translation>
+      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="55"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="88"/>
       <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="62"/>
       <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation>Integral gain (MPC_XY_VEL_I_ACC)</translation>
+      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="63"/>
       <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation>Increase to reduce steady-state error (e.g. wind)</translation>
+      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="70"/>
       <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation>Differential gain (MPC_XY_VEL_D_ACC)</translation>
+      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="71"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="104"/>
       <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
+      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="80"/>
       <source>Vertical</source>
-      <translation>Vertical</translation>
+      <translation type="unfinished">Vertical</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="87"/>
       <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation>Proportional gain (MPC_Z_VEL_P_ACC)</translation>
+      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="95"/>
       <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation>Integral gain (MPC_Z_VEL_I_ACC)</translation>
+      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="96"/>
       <source>Increase to reduce steady-state error</source>
-      <translation>Increase to reduce steady-state error</translation>
+      <translation type="unfinished">Increase to reduce steady-state error</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="103"/>
       <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation>Differential gain (MPC_Z_VEL_D_ACC)</translation>
+      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
     </message>
   </context>
   <context>
@@ -12051,17 +12051,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="31"/>
       <source>Altitude &amp; Airspeed</source>
-      <translation>Altitude &amp; Airspeed</translation>
+      <translation type="unfinished">Altitude &amp; Airspeed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="40"/>
       <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation>Height rate feed forward (FW_T_HRATE_FF)</translation>
+      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="41"/>
       <source>TODO</source>
-      <translation>TODO</translation>
+      <translation type="unfinished">TODO</translation>
     </message>
   </context>
   <context>
@@ -12069,7 +12069,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="21"/>
       <source>Multirotor</source>
-      <translation>Multirotor</translation>
+      <translation type="unfinished">Multirotor</translation>
     </message>
   </context>
   <context>
@@ -12077,42 +12077,42 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
       <source>Load Parameters</source>
-      <translation>Load Parameters</translation>
+      <translation type="unfinished">Load Parameters</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="39"/>
       <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
+      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="40"/>
       <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation>There are no differences between the file loaded and the current settings on the Vehicle.</translation>
+      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="68"/>
       <source>Comp ID</source>
-      <translation>Comp ID</translation>
+      <translation type="unfinished">Comp ID</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="75"/>
       <source>Name</source>
-      <translation>Name</translation>
+      <translation type="unfinished">Name</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="81"/>
       <source>File</source>
-      <translation>File</translation>
+      <translation type="unfinished">File</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="87"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
       <source>N/A</source>
-      <translation>N/A</translation>
+      <translation type="unfinished">N/A</translation>
     </message>
   </context>
   <context>
@@ -12120,63 +12120,63 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="155"/>
       <source>Clear</source>
-      <translation>Clear</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="165"/>
       <source>Show modified only</source>
-      <translation>Show modified only</translation>
+      <translation type="unfinished">Show modified only</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="174"/>
       <source>Tools</source>
-      <translation>Tools</translation>
+      <translation type="unfinished">Tools</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="54"/>
       <source>Refresh</source>
-      <translation>Refresh</translation>
+      <translation type="unfinished">Refresh</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="58"/>
       <source>Reset all to firmware&apos;s defaults</source>
-      <translation>Reset all to firmware&apos;s defaults</translation>
+      <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="59"/>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="67"/>
       <source>Reset All</source>
-      <translation>Reset All</translation>
+      <translation type="unfinished">Reset All</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="65"/>
       <source>Reset to vehicle&apos;s configuration defaults</source>
-      <translation>Reset to vehicle&apos;s configuration defaults</translation>
+      <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="76"/>
       <source>Load Parameters</source>
-      <translation>Load Parameters</translation>
+      <translation type="unfinished">Load Parameters</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="81"/>
       <source>Save to file...</source>
-      <translation>Save to file...</translation>
+      <translation type="unfinished">Save to file...</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="83"/>
       <source>Save Parameters</source>
-      <translation>Save Parameters</translation>
+      <translation type="unfinished">Save Parameters</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="89"/>
       <source>Clear all RC to Param</source>
-      <translation>Clear all RC to Param</translation>
+      <translation type="unfinished">Clear all RC to Param</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="107"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="150"/>
@@ -12188,7 +12188,7 @@ Is this really what you want?</translation>
       <source>Select Reset to reset all parameters to their defaults.
 
 Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation>Select Reset to reset all parameters to their defaults.
+      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
 
 Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
     </message>
@@ -12201,22 +12201,22 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
       <location filename="../src/QmlControls/ParameterEditor.qml" line="95"/>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="96"/>
       <source>Reboot Vehicle</source>
-      <translation>Reboot Vehicle</translation>
+      <translation type="unfinished">Reboot Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="107"/>
       <source>Parameter Files (*.%1)</source>
-      <translation>Parameter Files (*.%1)</translation>
+      <translation type="unfinished">Parameter Files (*.%1)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="68"/>
       <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
-      <translation>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
+      <translation type="unfinished">Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
       <source>Select Ok to reboot vehicle.</source>
-      <translation>Select Ok to reboot vehicle.</translation>
+      <translation type="unfinished">Select Ok to reboot vehicle.</translation>
     </message>
   </context>
   <context>
@@ -12224,12 +12224,12 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/ParameterEditorController.cc" line="321"/>
       <source>Unable to create file: %1</source>
-      <translation>Unable to create file: %1</translation>
+      <translation type="unfinished">Unable to create file: %1</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorController.cc" line="362"/>
       <source>Unable to open file: %1</source>
-      <translation>Unable to open file: %1</translation>
+      <translation type="unfinished">Unable to open file: %1</translation>
     </message>
   </context>
   <context>
@@ -12242,17 +12242,17 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="193"/>
       <source>Min: </source>
-      <translation>Min: </translation>
+      <translation type="unfinished">Min: </translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="198"/>
       <source>Max: </source>
-      <translation>Max: </translation>
+      <translation type="unfinished">Max: </translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="203"/>
       <source>Default: </source>
-      <translation>Default: </translation>
+      <translation type="unfinished">Default: </translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="25"/>
@@ -12272,32 +12272,32 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="221"/>
       <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
-      <translation>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
+      <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="222"/>
       <source>Make sure you know what you are doing and double-check your values before Save!</source>
-      <translation>Make sure you know what you are doing and double-check your values before Save!</translation>
+      <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="229"/>
       <source>Force save (dangerous!)</source>
-      <translation>Force save (dangerous!)</translation>
+      <translation type="unfinished">Force save (dangerous!)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="234"/>
       <source>Advanced settings</source>
-      <translation>Advanced settings</translation>
+      <translation type="unfinished">Advanced settings</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
       <source>Manual Entry</source>
-      <translation>Manual Entry</translation>
+      <translation type="unfinished">Manual Entry</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
       <source>Set RC to Param</source>
-      <translation>Set RC to Param</translation>
+      <translation type="unfinished">Set RC to Param</translation>
     </message>
   </context>
   <context>
@@ -12305,39 +12305,39 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="690"/>
       <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation>Parameter write failed: veh:%1 comp:%2 param:%3</translation>
+      <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="712"/>
       <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation>Parameter read failed: veh:%1 comp:%2 param:%3</translation>
+      <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="933"/>
       <source>Parameter cache CRC match failed</source>
-      <translation>Parameter cache CRC match failed</translation>
+      <translation type="unfinished">Parameter cache CRC match failed</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="984"/>
       <source>Parameters not loaded since they are not currently on the vehicle: %1
 </source>
-      <translation>Parameters not loaded since they are not currently on the vehicle: %1
+      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
 </translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="988"/>
       <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation>Parameters not loaded due to type mismatch: %1</translation>
+      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="1133"/>
       <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>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
+      <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="1158"/>
       <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>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
+      <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
     </message>
   </context>
   <context>
@@ -12350,7 +12350,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
       <source>Free Space: </source>
-      <translation>Free Space: </translation>
+      <translation type="unfinished">Free Space: </translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="62"/>
@@ -12360,122 +12360,122 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="246"/>
       <source>Battery: </source>
-      <translation>Battery: </translation>
+      <translation type="unfinished">Battery: </translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="317"/>
       <source>Settings</source>
-      <translation>Settings</translation>
+      <translation type="unfinished">Settings</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
       <source>Video Stream</source>
-      <translation>Video Stream</translation>
+      <translation type="unfinished">Video Stream</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
       <source>Thermal View Mode</source>
-      <translation>Thermal View Mode</translation>
+      <translation type="unfinished">Thermal View Mode</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="355"/>
       <source>Blend Opacity</source>
-      <translation>Blend Opacity</translation>
+      <translation type="unfinished">Blend Opacity</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
       <source>Photo Mode</source>
-      <translation>Photo Mode</translation>
+      <translation type="unfinished">Photo Mode</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
       <source>Photo Interval (seconds)</source>
-      <translation>Photo Interval (seconds)</translation>
+      <translation type="unfinished">Photo Interval (seconds)</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
       <source>Video Grid Lines</source>
-      <translation>Video Grid Lines</translation>
+      <translation type="unfinished">Video Grid Lines</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
       <source>Video Screen Fit</source>
-      <translation>Video Screen Fit</translation>
+      <translation type="unfinished">Video Screen Fit</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
       <source>Reset Camera Defaults</source>
-      <translation>Reset Camera Defaults</translation>
+      <translation type="unfinished">Reset Camera Defaults</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="399"/>
       <source>Storage</source>
-      <translation>Storage</translation>
+      <translation type="unfinished">Storage</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Off</source>
-      <translation>Off</translation>
+      <translation type="unfinished">Off</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Blend</source>
-      <translation>Blend</translation>
+      <translation type="unfinished">Blend</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Full</source>
-      <translation>Full</translation>
+      <translation type="unfinished">Full</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Picture In Picture</source>
-      <translation>Picture In Picture</translation>
+      <translation type="unfinished">Picture In Picture</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="500"/>
       <source>Single</source>
-      <translation>Single</translation>
+      <translation type="unfinished">Single</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="500"/>
       <source>Time Lapse</source>
-      <translation>Time Lapse</translation>
+      <translation type="unfinished">Time Lapse</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="534"/>
       <source>Reset</source>
-      <translation>Reset</translation>
+      <translation type="unfinished">Reset</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
       <source>Reset Camera to Factory Settings</source>
-      <translation>Reset Camera to Factory Settings</translation>
+      <translation type="unfinished">Reset Camera to Factory Settings</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
       <source>Confirm resetting all settings?</source>
-      <translation>Confirm resetting all settings?</translation>
+      <translation type="unfinished">Confirm resetting all settings?</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="558"/>
       <source>Format</source>
-      <translation>Format</translation>
+      <translation type="unfinished">Format</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="563"/>
       <source>Format Camera Storage</source>
-      <translation>Format Camera Storage</translation>
+      <translation type="unfinished">Format Camera Storage</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="564"/>
       <source>Confirm erasing all files?</source>
-      <translation>Confirm erasing all files?</translation>
+      <translation type="unfinished">Confirm erasing all files?</translation>
     </message>
   </context>
   <context>
@@ -12483,82 +12483,82 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="183"/>
       <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
-      <translation>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
+      <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="188"/>
       <source>Mission request list failed, maximum retries exceeded.</source>
-      <translation>Mission request list failed, maximum retries exceeded.</translation>
+      <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="192"/>
       <source>Retrying %1 REQUEST_LIST retry Count</source>
-      <translation>Retrying %1 REQUEST_LIST retry Count</translation>
+      <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="199"/>
       <source>Mission read failed, maximum retries exceeded.</source>
-      <translation>Mission read failed, maximum retries exceeded.</translation>
+      <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="203"/>
       <source>Retrying %1 MISSION_REQUEST retry Count</source>
-      <translation>Retrying %1 MISSION_REQUEST retry Count</translation>
+      <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
       <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation>Mission write failed, vehicle failed to send final ack.</translation>
+      <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="216"/>
       <source>Mission write mission count failed, maximum retries exceeded.</source>
-      <translation>Mission write mission count failed, maximum retries exceeded.</translation>
+      <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="225"/>
       <source>Vehicle did not request all items from ground station: %1</source>
-      <translation>Vehicle did not request all items from ground station: %1</translation>
+      <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="233"/>
       <source>Mission remove all, maximum retries exceeded.</source>
-      <translation>Mission remove all, maximum retries exceeded.</translation>
+      <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="237"/>
       <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
-      <translation>Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
+      <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="244"/>
       <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation>Vehicle did not respond to mission item communication: %1</translation>
+      <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="357"/>
       <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
+      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="515"/>
       <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
+      <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="629"/>
       <source>Vehicle remove all failed. Error: %1</source>
-      <translation>Vehicle remove all failed. Error: %1</translation>
+      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="704"/>
       <source>Item #%1 Command: %2</source>
-      <translation>Item #%1 Command: %2</translation>
+      <translation type="unfinished">Item #%1 Command: %2</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="708"/>
       <source>Frame: %1</source>
-      <translation>Frame: %1</translation>
+      <translation type="unfinished">Frame: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="714"/>
@@ -12569,92 +12569,92 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
       <location filename="../src/MissionManager/PlanManager.cc" line="729"/>
       <location filename="../src/MissionManager/PlanManager.cc" line="732"/>
       <source>Value: %1</source>
-      <translation>Value: %1</translation>
+      <translation type="unfinished">Value: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="751"/>
       <source>Mission accepted.</source>
-      <translation>Mission accepted.</translation>
+      <translation type="unfinished">Mission accepted.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="754"/>
       <source>Unspecified error.</source>
-      <translation>Unspecified error.</translation>
+      <translation type="unfinished">Unspecified error.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="757"/>
       <source>Coordinate frame is not supported.</source>
-      <translation>Coordinate frame is not supported.</translation>
+      <translation type="unfinished">Coordinate frame is not supported.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="760"/>
       <source>Command is not supported.</source>
-      <translation>Command is not supported.</translation>
+      <translation type="unfinished">Command is not supported.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="763"/>
       <source>Mission item exceeds storage space.</source>
-      <translation>Mission item exceeds storage space.</translation>
+      <translation type="unfinished">Mission item exceeds storage space.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="766"/>
       <source>One of the parameters has an invalid value.</source>
-      <translation>One of the parameters has an invalid value.</translation>
+      <translation type="unfinished">One of the parameters has an invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="769"/>
       <source>Param 1 invalid value.</source>
-      <translation>Param 1 invalid value.</translation>
+      <translation type="unfinished">Param 1 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="772"/>
       <source>Param 2 invalid value.</source>
-      <translation>Param 2 invalid value.</translation>
+      <translation type="unfinished">Param 2 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="775"/>
       <source>Param 3 invalid value.</source>
-      <translation>Param 3 invalid value.</translation>
+      <translation type="unfinished">Param 3 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="778"/>
       <source>Param 4 invalid value.</source>
-      <translation>Param 4 invalid value.</translation>
+      <translation type="unfinished">Param 4 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="781"/>
       <source>Param 5 invalid value.</source>
-      <translation>Param 5 invalid value.</translation>
+      <translation type="unfinished">Param 5 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="784"/>
       <source>Param 6 invalid value.</source>
-      <translation>Param 6 invalid value.</translation>
+      <translation type="unfinished">Param 6 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="787"/>
       <source>Param 7 invalid value.</source>
-      <translation>Param 7 invalid value.</translation>
+      <translation type="unfinished">Param 7 invalid value.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="790"/>
       <source>Received mission item out of sequence.</source>
-      <translation>Received mission item out of sequence.</translation>
+      <translation type="unfinished">Received mission item out of sequence.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="793"/>
       <source>Not accepting any mission commands.</source>
-      <translation>Not accepting any mission commands.</translation>
+      <translation type="unfinished">Not accepting any mission commands.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="797"/>
       <source>Unknown error: %1.</source>
-      <translation>Unknown error: %1.</translation>
+      <translation type="unfinished">Unknown error: %1.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="640"/>
       <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation>Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
+      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
     </message>
   </context>
   <context>
@@ -12662,43 +12662,43 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="207"/>
       <source>Download not supported on high latency links.</source>
-      <translation>Download not supported on high latency links.</translation>
+      <translation type="unfinished">Download not supported on high latency links.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="311"/>
       <source>Upload not supported on high latency links.</source>
-      <translation>Upload not supported on high latency links.</translation>
+      <translation type="unfinished">Upload not supported on high latency links.</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="334"/>
       <source>Error loading Plan file (%1). %2</source>
-      <translation>Error loading Plan file (%1). %2</translation>
+      <translation type="unfinished">Error loading Plan file (%1). %2</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="458"/>
       <source>Plan save error %1 : %2</source>
-      <translation>Plan save error %1 : %2</translation>
+      <translation type="unfinished">Plan save error %1 : %2</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="490"/>
       <source>KML save error %1 : %2</source>
-      <translation>KML save error %1 : %2</translation>
+      <translation type="unfinished">KML save error %1 : %2</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="561"/>
       <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
-      <translation>Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
+      <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="562"/>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="571"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="571"/>
       <source>Plan Files (*.%1)</source>
-      <translation>Plan Files (*.%1)</translation>
+      <translation type="unfinished">Plan Files (*.%1)</translation>
     </message>
   </context>
   <context>
@@ -12706,27 +12706,27 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="132"/>
       <source>Selected Waypoint</source>
-      <translation>Selected Waypoint</translation>
+      <translation type="unfinished">Selected Waypoint</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="137"/>
       <source>Alt diff:</source>
-      <translation>Alt diff:</translation>
+      <translation type="unfinished">Alt diff:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="146"/>
       <source>Azimuth:</source>
-      <translation>Azimuth:</translation>
+      <translation type="unfinished">Azimuth:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="190"/>
       <source>Distance:</source>
-      <translation>Distance:</translation>
+      <translation type="unfinished">Distance:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="162"/>
       <source>Gradient:</source>
-      <translation>Gradient:</translation>
+      <translation type="unfinished">Gradient:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="62"/>
@@ -12747,42 +12747,42 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="171"/>
       <source>Heading:</source>
-      <translation>Heading:</translation>
+      <translation type="unfinished">Heading:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="185"/>
       <source>Total Mission</source>
-      <translation>Total Mission</translation>
+      <translation type="unfinished">Total Mission</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="199"/>
       <source>Max telem dist:</source>
-      <translation>Max telem dist:</translation>
+      <translation type="unfinished">Max telem dist:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="206"/>
       <source>Time:</source>
-      <translation>Time:</translation>
+      <translation type="unfinished">Time:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="221"/>
       <source>Battery</source>
-      <translation>Battery</translation>
+      <translation type="unfinished">Battery</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="226"/>
       <source>Batteries required:</source>
-      <translation>Batteries required:</translation>
+      <translation type="unfinished">Batteries required:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="102"/>
       <source>Upload Required</source>
-      <translation>Upload Required</translation>
+      <translation type="unfinished">Upload Required</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanToolBarIndicators.qml" line="102"/>
       <source>Upload</source>
-      <translation>Upload</translation>
+      <translation type="unfinished">Upload</translation>
     </message>
   </context>
   <context>
@@ -12790,156 +12790,156 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="70"/>
       <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
+      <translation type="unfinished">Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="108"/>
       <source>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</source>
-      <translation>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
+      <translation type="unfinished">You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1108"/>
       <source>You need at least one item to create a KML.</source>
-      <translation>You need at least one item to create a KML.</translation>
+      <translation type="unfinished">You need at least one item to create a KML.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="184"/>
       <source>Plan is waiting on terrain data from server for correct altitude values.</source>
-      <translation>Plan is waiting on terrain data from server for correct altitude values.</translation>
+      <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="210"/>
       <source>Plan Upload</source>
-      <translation>Plan Upload</translation>
+      <translation type="unfinished">Plan Upload</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="222"/>
       <source>Select Plan File</source>
-      <translation>Select Plan File</translation>
+      <translation type="unfinished">Select Plan File</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="232"/>
       <source>Save Plan</source>
-      <translation>Save Plan</translation>
+      <translation type="unfinished">Save Plan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="246"/>
       <source>Save KML</source>
-      <translation>Save KML</translation>
+      <translation type="unfinished">Save KML</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="577"/>
       <source>File</source>
-      <translation>File</translation>
+      <translation type="unfinished">File</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="598"/>
       <source>Waypoint</source>
-      <translation>Waypoint</translation>
+      <translation type="unfinished">Waypoint</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="605"/>
       <source>ROI</source>
-      <translation>ROI</translation>
+      <translation type="unfinished">ROI</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="621"/>
       <source>Pattern</source>
-      <translation>Pattern</translation>
+      <translation type="unfinished">Pattern</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="648"/>
       <source>Center</source>
-      <translation>Center</translation>
+      <translation type="unfinished">Center</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="107"/>
       <source>Apply new altitude</source>
-      <translation>Apply new altitude</translation>
+      <translation type="unfinished">Apply new altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="118"/>
       <source>Plan View - Vehicle Disconnected</source>
-      <translation>Plan View - Vehicle Disconnected</translation>
+      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="118"/>
       <source>Plan View - Vehicle Changed</source>
-      <translation>Plan View - Vehicle Changed</translation>
+      <translation type="unfinished">Plan View - Vehicle Changed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="126"/>
       <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
+      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="127"/>
       <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
+      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="134"/>
       <source>Discard Unsaved Changes</source>
-      <translation>Discard Unsaved Changes</translation>
+      <translation type="unfinished">Discard Unsaved Changes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="135"/>
       <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation>Discard Unsaved Changes, Load New Plan From Vehicle</translation>
+      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="136"/>
       <source>Load New Plan From Vehicle</source>
-      <translation>Load New Plan From Vehicle</translation>
+      <translation type="unfinished">Load New Plan From Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="147"/>
       <source>Keep Current Plan</source>
-      <translation>Keep Current Plan</translation>
+      <translation type="unfinished">Keep Current Plan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="148"/>
       <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation>Keep Current Plan, Don&apos;t Update From Vehicle</translation>
+      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="211"/>
       <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
 
 Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
+      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
 
 Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="207"/>
       <source>Send To Vehicle</source>
-      <translation>Send To Vehicle</translation>
+      <translation type="unfinished">Send To Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="207"/>
       <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation>Current mission must be paused prior to uploading a new Plan</translation>
+      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="586"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="598"/>
       <source>Rally Point</source>
-      <translation>Rally Point</translation>
+      <translation type="unfinished">Rally Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="605"/>
       <source>Cancel ROI</source>
-      <translation>Cancel ROI</translation>
+      <translation type="unfinished">Cancel ROI</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="635"/>
       <source>Return</source>
-      <translation>Return</translation>
+      <translation type="unfinished">Return</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="637"/>
@@ -12949,24 +12949,24 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="638"/>
       <source>Land</source>
-      <translation>Land</translation>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="708"/>
       <location filename="../src/QmlControls/PlanView.qml" line="725"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="711"/>
       <source>Fence</source>
-      <translation>Fence</translation>
+      <translation type="unfinished">Fence</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="715"/>
       <location filename="../src/QmlControls/PlanView.qml" line="728"/>
       <source>Rally</source>
-      <translation>Rally</translation>
+      <translation type="unfinished">Rally</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="733"/>
@@ -12981,61 +12981,61 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="954"/>
       <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>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
+      <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="877"/>
       <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>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
+      <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="898"/>
       <location filename="../src/QmlControls/PlanView.qml" line="1152"/>
       <source>Clear</source>
-      <translation>Clear</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="899"/>
       <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation>Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
+      <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="933"/>
       <source>Create complex pattern:</source>
-      <translation>Create complex pattern:</translation>
+      <translation type="unfinished">Create complex pattern:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="977"/>
       <source>You have unsaved changes.</source>
-      <translation>You have unsaved changes.</translation>
+      <translation type="unfinished">You have unsaved changes.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1063"/>
       <source>Open...</source>
-      <translation>Open...</translation>
+      <translation type="unfinished">Open...</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="178"/>
       <location filename="../src/QmlControls/PlanView.qml" line="183"/>
       <location filename="../src/QmlControls/PlanView.qml" line="1077"/>
       <source>Save</source>
-      <translation>Save</translation>
+      <translation type="unfinished">Save</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="179"/>
       <location filename="../src/QmlControls/PlanView.qml" line="184"/>
       <source>Unable to %1</source>
-      <translation>Unable to %1</translation>
+      <translation type="unfinished">Unable to %1</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="179"/>
       <source>Plan has incomplete items. Complete all items and %1 again.</source>
-      <translation>Plan has incomplete items. Complete all items and %1 again.</translation>
+      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="887"/>
       <source>Are you sure you want to remove current plan and create a new plan? </source>
-      <translation>Are you sure you want to remove current plan and create a new plan? </translation>
+      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="969"/>
@@ -13045,50 +13045,50 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="976"/>
       <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation>You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
+      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="886"/>
       <location filename="../src/QmlControls/PlanView.qml" line="984"/>
       <source>Create Plan</source>
-      <translation>Create Plan</translation>
+      <translation type="unfinished">Create Plan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1053"/>
       <source>Storage</source>
-      <translation>Storage</translation>
+      <translation type="unfinished">Storage</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1091"/>
       <source>Save As...</source>
-      <translation>Save As...</translation>
+      <translation type="unfinished">Save As...</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1103"/>
       <source>Save Mission Waypoints As KML...</source>
-      <translation>Save Mission Waypoints As KML...</translation>
+      <translation type="unfinished">Save Mission Waypoints As KML...</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1108"/>
       <source>KML</source>
-      <translation>KML</translation>
+      <translation type="unfinished">KML</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="178"/>
       <location filename="../src/QmlControls/PlanView.qml" line="183"/>
       <location filename="../src/QmlControls/PlanView.qml" line="1129"/>
       <source>Upload</source>
-      <translation>Upload</translation>
+      <translation type="unfinished">Upload</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1120"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1140"/>
       <source>Download</source>
-      <translation>Download</translation>
+      <translation type="unfinished">Download</translation>
     </message>
   </context>
   <context>
@@ -13149,103 +13149,103 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="534"/>
       <source>ESC Calibration</source>
-      <translation>ESC Calibration</translation>
+      <translation type="unfinished">ESC Calibration</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
       <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</source>
-      <translation>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
+      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
       <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</source>
-      <translation>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
+      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="541"/>
       <source>Performing calibration. This will take a few seconds..</source>
-      <translation>Performing calibration. This will take a few seconds..</translation>
+      <translation type="unfinished">Performing calibration. This will take a few seconds..</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
       <source>ESC Calibration failed</source>
-      <translation>ESC Calibration failed</translation>
+      <translation type="unfinished">ESC Calibration failed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="542"/>
       <source>ESC Calibration failed. </source>
-      <translation>ESC Calibration failed. </translation>
+      <translation type="unfinished">ESC Calibration failed. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="543"/>
       <source>Calibration complete. You can disconnect your battery now if you like.</source>
-      <translation>Calibration complete. You can disconnect your battery now if you like.</translation>
+      <translation type="unfinished">Calibration complete. You can disconnect your battery now if you like.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="550"/>
       <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
+      <translation type="unfinished">WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="550"/>
       <source> Connect the battery now and calibration will begin.</source>
-      <translation> Connect the battery now and calibration will begin.</translation>
+      <translation type="unfinished"> Connect the battery now and calibration will begin.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
       <source>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</source>
-      <translation>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
+      <translation type="unfinished">You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
       <source>Battery </source>
-      <translation>Battery </translation>
+      <translation type="unfinished">Battery </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="256"/>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="271"/>
       <source>Source</source>
-      <translation>Source</translation>
+      <translation type="unfinished">Source</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="436"/>
       <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</source>
-      <translation>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
+      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
       <source>Measured voltage:</source>
-      <translation>Measured voltage:</translation>
+      <translation type="unfinished">Measured voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
       <source>Vehicle voltage:</source>
-      <translation>Vehicle voltage:</translation>
+      <translation type="unfinished">Vehicle voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="449"/>
       <source>Voltage divider:</source>
-      <translation>Voltage divider:</translation>
+      <translation type="unfinished">Voltage divider:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="494"/>
       <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>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
+      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="501"/>
       <source>Measured current:</source>
-      <translation>Measured current:</translation>
+      <translation type="unfinished">Measured current:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="504"/>
       <source>Vehicle current:</source>
-      <translation>Vehicle current:</translation>
+      <translation type="unfinished">Vehicle current:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="507"/>
       <source>Amps per volt:</source>
-      <translation>Amps per volt:</translation>
+      <translation type="unfinished">Amps per volt:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="329"/>
@@ -13253,178 +13253,178 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="454"/>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="512"/>
       <source>Calculate</source>
-      <translation>Calculate</translation>
+      <translation type="unfinished">Calculate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="293"/>
       <source>Number of Cells (in Series)</source>
-      <translation>Number of Cells (in Series)</translation>
+      <translation type="unfinished">Number of Cells (in Series)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="312"/>
       <source>Full Voltage (per cell)</source>
-      <translation>Full Voltage (per cell)</translation>
+      <translation type="unfinished">Full Voltage (per cell)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="299"/>
       <source>Battery Max:</source>
-      <translation>Battery Max:</translation>
+      <translation type="unfinished">Battery Max:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="302"/>
       <source>Empty Voltage (per cell)</source>
-      <translation>Empty Voltage (per cell)</translation>
+      <translation type="unfinished">Empty Voltage (per cell)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="308"/>
       <source>Battery Min:</source>
-      <translation>Battery Min:</translation>
+      <translation type="unfinished">Battery Min:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="321"/>
       <source>Voltage divider</source>
-      <translation>Voltage divider</translation>
+      <translation type="unfinished">Voltage divider</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="417"/>
       <source>Calculate Voltage Divider</source>
-      <translation>Calculate Voltage Divider</translation>
+      <translation type="unfinished">Calculate Voltage Divider</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
       <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. </source>
-      <translation>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. </translation>
+      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="341"/>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="365"/>
       <source>Click the Calculate button for help with calculating a new value.</source>
-      <translation>Click the Calculate button for help with calculating a new value.</translation>
+      <translation type="unfinished">Click the Calculate button for help with calculating a new value.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="345"/>
       <source>Amps per volt</source>
-      <translation>Amps per volt</translation>
+      <translation type="unfinished">Amps per volt</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="475"/>
       <source>Calculate Amps per Volt</source>
-      <translation>Calculate Amps per Volt</translation>
+      <translation type="unfinished">Calculate Amps per Volt</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
       <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. </source>
-      <translation>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. </translation>
+      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
       <source>ESC PWM Minimum and Maximum Calibration</source>
-      <translation>ESC PWM Minimum and Maximum Calibration</translation>
+      <translation type="unfinished">ESC PWM Minimum and Maximum Calibration</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
       <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
+      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
       <source>You must use USB connection for this operation.</source>
-      <translation>You must use USB connection for this operation.</translation>
+      <translation type="unfinished">You must use USB connection for this operation.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
       <source>Calibrate</source>
-      <translation>Calibrate</translation>
+      <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
       <source>Show UAVCAN Settings</source>
-      <translation>Show UAVCAN Settings</translation>
+      <translation type="unfinished">Show UAVCAN Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
       <source>UAVCAN Bus Configuration</source>
-      <translation>UAVCAN Bus Configuration</translation>
+      <translation type="unfinished">UAVCAN Bus Configuration</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
       <source>Change required restart</source>
-      <translation>Change required restart</translation>
+      <translation type="unfinished">Change required restart</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
       <source>UAVCAN Motor Index and Direction Assignment</source>
-      <translation>UAVCAN Motor Index and Direction Assignment</translation>
+      <translation type="unfinished">UAVCAN Motor Index and Direction Assignment</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
       <source>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</source>
-      <translation>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
+      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
       <source>ESC parameters will only be accessible in the editor after assignment.</source>
-      <translation>ESC parameters will only be accessible in the editor after assignment.</translation>
+      <translation type="unfinished">ESC parameters will only be accessible in the editor after assignment.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
       <source>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</source>
-      <translation>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
+      <translation type="unfinished">Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
       <source>Start Assignment</source>
-      <translation>Start Assignment</translation>
+      <translation type="unfinished">Start Assignment</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
       <source>Stop Assignment</source>
-      <translation>Stop Assignment</translation>
+      <translation type="unfinished">Stop Assignment</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="372"/>
       <source>Show Advanced Settings</source>
-      <translation>Show Advanced Settings</translation>
+      <translation type="unfinished">Show Advanced Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="377"/>
       <source>Voltage Drop on Full Load (per cell)</source>
-      <translation>Voltage Drop on Full Load (per cell)</translation>
+      <translation type="unfinished">Voltage Drop on Full Load (per cell)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
       <source>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </source>
-      <translation>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
+      <translation type="unfinished">Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="394"/>
       <source>throttle, divided by the number of battery cells. Leave at the default if unsure. </source>
-      <translation>throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
+      <translation type="unfinished">throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="395"/>
       <source>If this value is set too high, the battery might be deep discharged and damaged.</source>
-      <translation>If this value is set too high, the battery might be deep discharged and damaged.</translation>
+      <translation type="unfinished">If this value is set too high, the battery might be deep discharged and damaged.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="400"/>
       <source>Compensated Minimum Voltage:</source>
-      <translation>Compensated Minimum Voltage:</translation>
+      <translation type="unfinished">Compensated Minimum Voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="404"/>
       <source> V</source>
-      <translation> V</translation>
+      <translation type="unfinished"> V</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="20"/>
       <source>Power</source>
-      <translation>Power</translation>
+      <translation type="unfinished">Power</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="31"/>
       <source>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</source>
-      <translation>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
+      <translation type="unfinished">Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
     </message>
   </context>
   <context>
@@ -13432,17 +13432,17 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
       <source>Battery Full</source>
-      <translation>Battery Full</translation>
+      <translation type="unfinished">Battery Full</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
       <source>Battery Empty</source>
-      <translation>Battery Empty</translation>
+      <translation type="unfinished">Battery Empty</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
       <source>Number of Cells</source>
-      <translation>Number of Cells</translation>
+      <translation type="unfinished">Number of Cells</translation>
     </message>
   </context>
   <context>
@@ -13450,22 +13450,22 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="18"/>
       <source>Battery</source>
-      <translation>Battery</translation>
+      <translation type="unfinished">Battery</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="19"/>
       <source>Battery connector firmly plugged?</source>
-      <translation>Battery connector firmly plugged?</translation>
+      <translation type="unfinished">Battery connector firmly plugged?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="22"/>
       <source>Warning - Battery charge below %1%.</source>
-      <translation>Warning - Battery charge below %1%.</translation>
+      <translation type="unfinished">Warning - Battery charge below %1%.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="23"/>
       <source>Battery charge below %1%. Please recharge.</source>
-      <translation>Battery charge below %1%. Please recharge.</translation>
+      <translation type="unfinished">Battery charge below %1%. Please recharge.</translation>
     </message>
   </context>
   <context>
@@ -13473,7 +13473,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="53"/>
       <source>Passed</source>
-      <translation>Passed</translation>
+      <translation type="unfinished">Passed</translation>
     </message>
   </context>
   <context>
@@ -13481,7 +13481,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
       <source> (passed)</source>
-      <translation> (passed)</translation>
+      <translation type="unfinished"> (passed)</translation>
     </message>
   </context>
   <context>
@@ -13489,12 +13489,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
       <source>(Passed)</source>
-      <translation>(Passed)</translation>
+      <translation type="unfinished">(Passed)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
       <source>In Progress</source>
-      <translation>In Progress</translation>
+      <translation type="unfinished">In Progress</translation>
     </message>
   </context>
   <context>
@@ -13502,7 +13502,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
       <source>Checklist</source>
-      <translation>Checklist</translation>
+      <translation type="unfinished">Checklist</translation>
     </message>
   </context>
   <context>
@@ -13510,22 +13510,22 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="17"/>
       <source>GPS</source>
-      <translation>GPS</translation>
+      <translation type="unfinished">GPS</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="20"/>
       <source>Waiting for 3D lock.</source>
-      <translation>Waiting for 3D lock.</translation>
+      <translation type="unfinished">Waiting for 3D lock.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
       <source>Warning - Sat count below %1.</source>
-      <translation>Warning - Sat count below %1.</translation>
+      <translation type="unfinished">Warning - Sat count below %1.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
       <source>Waiting for sat count above %1.</source>
-      <translation>Waiting for sat count above %1.</translation>
+      <translation type="unfinished">Waiting for sat count above %1.</translation>
     </message>
   </context>
   <context>
@@ -13533,17 +13533,17 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="17"/>
       <source>Radio Control</source>
-      <translation>Radio Control</translation>
+      <translation type="unfinished">Radio Control</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="18"/>
       <source>Receiving signal. Perform range test &amp; confirm.</source>
-      <translation>Receiving signal. Perform range test &amp; confirm.</translation>
+      <translation type="unfinished">Receiving signal. Perform range test &amp; confirm.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="19"/>
       <source>No signal or invalid autopilot-RC config. Check RC and console.</source>
-      <translation>No signal or invalid autopilot-RC config. Check RC and console.</translation>
+      <translation type="unfinished">No signal or invalid autopilot-RC config. Check RC and console.</translation>
     </message>
   </context>
   <context>
@@ -13551,42 +13551,42 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="17"/>
       <source>Sensors</source>
-      <translation>Sensors</translation>
+      <translation type="unfinished">Sensors</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="35"/>
       <source>Failure. Magnetometer issues. Check console.</source>
-      <translation>Failure. Magnetometer issues. Check console.</translation>
+      <translation type="unfinished">Failure. Magnetometer issues. Check console.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="36"/>
       <source>Failure. Accelerometer issues. Check console.</source>
-      <translation>Failure. Accelerometer issues. Check console.</translation>
+      <translation type="unfinished">Failure. Accelerometer issues. Check console.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="37"/>
       <source>Failure. Gyroscope issues. Check console.</source>
-      <translation>Failure. Gyroscope issues. Check console.</translation>
+      <translation type="unfinished">Failure. Gyroscope issues. Check console.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="38"/>
       <source>Failure. Barometer issues. Check console.</source>
-      <translation>Failure. Barometer issues. Check console.</translation>
+      <translation type="unfinished">Failure. Barometer issues. Check console.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="39"/>
       <source>Failure. Airspeed sensor issues. Check console.</source>
-      <translation>Failure. Airspeed sensor issues. Check console.</translation>
+      <translation type="unfinished">Failure. Airspeed sensor issues. Check console.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="40"/>
       <source>Failure. AHRS issues. Check console.</source>
-      <translation>Failure. AHRS issues. Check console.</translation>
+      <translation type="unfinished">Failure. AHRS issues. Check console.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="41"/>
       <source>Failure. GPS issues. Check console.</source>
-      <translation>Failure. GPS issues. Check console.</translation>
+      <translation type="unfinished">Failure. GPS issues. Check console.</translation>
     </message>
   </context>
   <context>
@@ -13594,17 +13594,17 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="16"/>
       <source>Sound output</source>
-      <translation>Sound output</translation>
+      <translation type="unfinished">Sound output</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="17"/>
       <source>QGC audio output enabled. System audio output enabled, too?</source>
-      <translation>QGC audio output enabled. System audio output enabled, too?</translation>
+      <translation type="unfinished">QGC audio output enabled. System audio output enabled, too?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="18"/>
       <source>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</source>
-      <translation>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
+      <translation type="unfinished">QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
     </message>
   </context>
   <context>
@@ -13612,7 +13612,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
       <source>--.--</source>
-      <translation>--.--</translation>
+      <translation type="unfinished">--.--</translation>
     </message>
   </context>
   <context>
@@ -13620,27 +13620,27 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QGCApplication.cc" line="377"/>
       <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>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
+      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
     </message>
     <message>
       <location filename="../src/QGCApplication.cc" line="403"/>
       <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
-      <translation>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
+      <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
     </message>
     <message>
       <location filename="../src/QGCApplication.cc" line="451"/>
       <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>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
+      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
     </message>
     <message>
       <location filename="../src/QGCApplication.cc" line="588"/>
       <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation>There is a newer version of %1 available. You can download it from %2.</translation>
+      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
     </message>
     <message>
       <location filename="../src/QGCApplication.cc" line="588"/>
       <source>New Version Available</source>
-      <translation>New Version Available</translation>
+      <translation type="unfinished">New Version Available</translation>
     </message>
   </context>
   <context>
@@ -13664,32 +13664,32 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="103"/>
       <source>Vibration</source>
-      <translation>Vibration</translation>
+      <translation type="unfinished">Vibration</translation>
     </message>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="83"/>
       <source>Log Download</source>
-      <translation>Log Download</translation>
+      <translation type="unfinished">Log Download</translation>
     </message>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="88"/>
       <source>GeoTag Images</source>
-      <translation>GeoTag Images</translation>
+      <translation type="unfinished">GeoTag Images</translation>
     </message>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="93"/>
       <source>MAVLink Console</source>
-      <translation>MAVLink Console</translation>
+      <translation type="unfinished">MAVLink Console</translation>
     </message>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="98"/>
       <source>MAVLink Inspector</source>
-      <translation>MAVLink Inspector</translation>
+      <translation type="unfinished">MAVLink Inspector</translation>
     </message>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="152"/>
       <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>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
+      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
     </message>
   </context>
   <context>
@@ -13697,7 +13697,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/QGCFenceCircle.cc" line="73"/>
       <source>GeoFence Circle only supports version %1</source>
-      <translation>GeoFence Circle only supports version %1</translation>
+      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
     </message>
   </context>
   <context>
@@ -13705,7 +13705,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/QGCFencePolygon.cc" line="66"/>
       <source>GeoFence Polygon only supports version %1</source>
-      <translation>GeoFence Polygon only supports version %1</translation>
+      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
     </message>
   </context>
   <context>
@@ -13713,33 +13713,33 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="135"/>
       <source>Path: %1</source>
-      <translation>Path: %1</translation>
+      <translation type="unfinished">Path: %1</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="166"/>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="271"/>
       <source>Delete</source>
-      <translation>Delete</translation>
+      <translation type="unfinished">Delete</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="177"/>
       <source>No files</source>
-      <translation>No files</translation>
+      <translation type="unfinished">No files</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="217"/>
       <source>New file name:</source>
-      <translation>New file name:</translation>
+      <translation type="unfinished">New file name:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="231"/>
       <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation>The file %1 exists. Click Save again to replace it.</translation>
+      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGCFileDialog.qml" line="239"/>
       <source>Save to existing file:</source>
-      <translation>Save to existing file:</translation>
+      <translation type="unfinished">Save to existing file:</translation>
     </message>
   </context>
   <context>
@@ -13747,27 +13747,27 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="146"/>
       <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation>Unabled to find writable download location. Tried downloads and temp directory.</translation>
+      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
     </message>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="156"/>
       <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation>Could not save downloaded file to %1. Error: %2</translation>
+      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="177"/>
       <source>Download cancelled</source>
-      <translation>Download cancelled</translation>
+      <translation type="unfinished">Download cancelled</translation>
     </message>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="180"/>
       <source>Error: File Not Found</source>
-      <translation>Error: File Not Found</translation>
+      <translation type="unfinished">Error: File Not Found</translation>
     </message>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="183"/>
       <source>Error during download. Error: %1</source>
-      <translation>Error during download. Error: %1</translation>
+      <translation type="unfinished">Error during download. Error: %1</translation>
     </message>
   </context>
   <context>
@@ -13931,12 +13931,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkSystem.cc" line="136"/>
       <source>Comp All</source>
-      <translation>Comp All</translation>
+      <translation type="unfinished">Comp All</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkSystem.cc" line="142"/>
       <source>Comp %1</source>
-      <translation>Comp %1</translation>
+      <translation type="unfinished">Comp %1</translation>
     </message>
   </context>
   <context>
@@ -13944,68 +13944,68 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="224"/>
       <source>Select Polygon File</source>
-      <translation>Select Polygon File</translation>
+      <translation type="unfinished">Select Polygon File</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="251"/>
       <source>Remove vertex</source>
-      <translation>Remove vertex</translation>
+      <translation type="unfinished">Remove vertex</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="51"/>
       <source>Polygon Tools</source>
-      <translation>Polygon Tools</translation>
+      <translation type="unfinished">Polygon Tools</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="52"/>
       <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
+      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="264"/>
       <source>Set radius...</source>
-      <translation>Set radius...</translation>
+      <translation type="unfinished">Set radius...</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="270"/>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="276"/>
       <source>Edit position...</source>
-      <translation>Edit position...</translation>
+      <translation type="unfinished">Edit position...</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="524"/>
       <source>Edit Center Position</source>
-      <translation>Edit Center Position</translation>
+      <translation type="unfinished">Edit Center Position</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="540"/>
       <source>Edit Vertex Position</source>
-      <translation>Edit Vertex Position</translation>
+      <translation type="unfinished">Edit Vertex Position</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="593"/>
       <source>Basic</source>
-      <translation>Basic</translation>
+      <translation type="unfinished">Basic</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="600"/>
       <source>Circular</source>
-      <translation>Circular</translation>
+      <translation type="unfinished">Circular</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="607"/>
       <source>Done Tracing</source>
-      <translation>Done Tracing</translation>
+      <translation type="unfinished">Done Tracing</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="607"/>
       <source>Trace</source>
-      <translation>Trace</translation>
+      <translation type="unfinished">Trace</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolygonVisuals.qml" line="625"/>
       <source>Load KML/SHP...</source>
-      <translation>Load KML/SHP...</translation>
+      <translation type="unfinished">Load KML/SHP...</translation>
     </message>
   </context>
   <context>
@@ -14013,12 +14013,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="40"/>
       <source>Polyline Tools</source>
-      <translation>Polyline Tools</translation>
+      <translation type="unfinished">Polyline Tools</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="41"/>
       <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
+      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="127"/>
@@ -14028,27 +14028,27 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="148"/>
       <source>Remove vertex</source>
-      <translation>Remove vertex</translation>
+      <translation type="unfinished">Remove vertex</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="153"/>
       <source>Edit position...</source>
-      <translation>Edit position...</translation>
+      <translation type="unfinished">Edit position...</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="332"/>
       <source>Basic</source>
-      <translation>Basic</translation>
+      <translation type="unfinished">Basic</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="339"/>
       <source>Done Tracing</source>
-      <translation>Done Tracing</translation>
+      <translation type="unfinished">Done Tracing</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="339"/>
       <source>Trace</source>
-      <translation>Trace</translation>
+      <translation type="unfinished">Trace</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/MapItems/QGCMapPolylineVisuals.qml" line="356"/>
@@ -14061,7 +14061,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
       <source>Options</source>
-      <translation>Options</translation>
+      <translation type="unfinished">Options</translation>
     </message>
   </context>
   <context>
@@ -14153,7 +14153,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/QGCTextField.qml" line="120"/>
       <source>?</source>
-      <translation>?</translation>
+      <translation type="unfinished">?</translation>
     </message>
   </context>
   <context>
@@ -14217,52 +14217,52 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="321"/>
       <source>32 bit</source>
-      <translation>32 bit</translation>
+      <translation type="unfinished">32 bit</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="325"/>
       <source>64 bit</source>
-      <translation>64 bit</translation>
+      <translation type="unfinished">64 bit</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="339"/>
       <source>(AMSL)</source>
-      <translation>(AMSL)</translation>
+      <translation type="unfinished">(AMSL)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="341"/>
       <source>(CalcT)</source>
-      <translation>(CalcT)</translation>
+      <translation type="unfinished">(CalcT)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="361"/>
       <source>AMSL</source>
-      <translation>AMSL</translation>
+      <translation type="unfinished">AMSL</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="363"/>
       <source>Calc Above Terrain</source>
-      <translation>Calc Above Terrain</translation>
+      <translation type="unfinished">Calc Above Terrain</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="367"/>
       <source>Mixed Modes</source>
-      <translation>Mixed Modes</translation>
+      <translation type="unfinished">Mixed Modes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="343"/>
       <source>(TerrF)</source>
-      <translation>(TerrF)</translation>
+      <translation type="unfinished">(TerrF)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="359"/>
       <source>Relative To Launch</source>
-      <translation>Relative To Launch</translation>
+      <translation type="unfinished">Relative To Launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="365"/>
       <source>Terrain Frame</source>
-      <translation>Terrain Frame</translation>
+      <translation type="unfinished">Terrain Frame</translation>
     </message>
   </context>
   <context>
@@ -14271,32 +14271,32 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
       <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
       <location filename="../src/Vehicle/Vehicle.cc" line="84"/>
       <source>Guided mode not supported by Vehicle.</source>
-      <translation>Guided mode not supported by Vehicle.</translation>
+      <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="64"/>
       <source>The following required keys are missing: %1</source>
-      <translation>The following required keys are missing: %1</translation>
+      <translation type="unfinished">The following required keys are missing: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="74"/>
       <source>value for coordinate is not array</source>
-      <translation>value for coordinate is not array</translation>
+      <translation type="unfinished">value for coordinate is not array</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="81"/>
       <source>Coordinate array must contain %1 values</source>
-      <translation>Coordinate array must contain %1 values</translation>
+      <translation type="unfinished">Coordinate array must contain %1 values</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="87"/>
       <source>Coordinate array may only contain double values, found: %1</source>
-      <translation>Coordinate array may only contain double values, found: %1</translation>
+      <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="153"/>
       <source>Incorrect value type - key:type:expected %1:%2:%3</source>
-      <translation>Incorrect value type - key:type:expected %1:%2:%3</translation>
+      <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="183"/>
@@ -14306,17 +14306,17 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="206"/>
       <source>Incorrect file type key expected:%1 actual:%2</source>
-      <translation>Incorrect file type key expected:%1 actual:%2</translation>
+      <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="212"/>
       <source>File version %1 is no longer supported</source>
-      <translation>File version %1 is no longer supported</translation>
+      <translation type="unfinished">File version %1 is no longer supported</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="217"/>
       <source>File version %1 is newer than current supported version %2</source>
-      <translation>File version %1 is newer than current supported version %2</translation>
+      <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="326"/>
@@ -14341,23 +14341,23 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="366"/>
       <source>value for coordinate array is not array</source>
-      <translation>value for coordinate array is not array</translation>
+      <translation type="unfinished">value for coordinate array is not array</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="468"/>
       <source>Unknown type: %1</source>
-      <translation>Unknown type: %1</translation>
+      <translation type="unfinished">Unknown type: %1</translation>
     </message>
     <message>
       <location filename="../src/main.cc" line="109"/>
       <location filename="../src/main.cc" line="120"/>
       <source>Error</source>
-      <translation>Error</translation>
+      <translation type="unfinished">Error</translation>
     </message>
     <message>
       <location filename="../src/main.cc" line="110"/>
       <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
-      <translation>A second instance of %1 is already running. Please close the other instance and try again.</translation>
+      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
     </message>
     <message>
       <location filename="../src/main.cc" line="121"/>
@@ -14526,7 +14526,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/UI/toolbar/RCRSSIIndicator.qml" line="39"/>
       <source>RC RSSI Status</source>
-      <translation>RC RSSI Status</translation>
+      <translation type="unfinished">RC RSSI Status</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/RCRSSIIndicator.qml" line="42"/>
@@ -14539,52 +14539,52 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="23"/>
       <source>RC To Param</source>
-      <translation>RC To Param</translation>
+      <translation type="unfinished">RC To Param</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="41"/>
       <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
+      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="47"/>
       <source>Waiting on parameter update from Vehicle.</source>
-      <translation>Waiting on parameter update from Vehicle.</translation>
+      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="58"/>
       <source>Parameter</source>
-      <translation>Parameter</translation>
+      <translation type="unfinished">Parameter</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
       <source>Tuning ID</source>
-      <translation>Tuning ID</translation>
+      <translation type="unfinished">Tuning ID</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="69"/>
       <source>Scale</source>
-      <translation>Scale</translation>
+      <translation type="unfinished">Scale</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="75"/>
       <source>Center Value</source>
-      <translation>Center Value</translation>
+      <translation type="unfinished">Center Value</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="81"/>
       <source>Min Value</source>
-      <translation>Min Value</translation>
+      <translation type="unfinished">Min Value</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="87"/>
       <source>Max Value</source>
-      <translation>Max Value</translation>
+      <translation type="unfinished">Max Value</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="98"/>
       <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation>Double check that all values are correct prior to confirming dialog.</translation>
+      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
     </message>
   </context>
   <context>
@@ -14592,22 +14592,22 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="52"/>
       <source>Reboot required</source>
-      <translation>Reboot required</translation>
+      <translation type="unfinished">Reboot required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="52"/>
       <source>Your stick mappings have changed, you must reboot the vehicle for correct operation.</source>
-      <translation>Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
+      <translation type="unfinished">Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="53"/>
       <source>Throttle channel reversed</source>
-      <translation>Throttle channel reversed</translation>
+      <translation type="unfinished">Throttle channel reversed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="53"/>
       <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>Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</translation>
+      <translation type="unfinished">Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="72"/>
@@ -14633,92 +14633,92 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="402"/>
       <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>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.</translation>
+      <translation type="unfinished">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.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="324"/>
       <source>Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
 
 %1</source>
-      <translation>Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
+      <translation type="unfinished">Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
 
 %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="325"/>
       <source>Please ensure all motor power is disconnected AND all props are removed from the vehicle.</source>
-      <translation>Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
+      <translation type="unfinished">Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="318"/>
       <source>Please turn on transmitter.</source>
-      <translation>Please turn on transmitter.</translation>
+      <translation type="unfinished">Please turn on transmitter.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="320"/>
       <source>%1 channels or more are needed to fly.</source>
-      <translation>%1 channels or more are needed to fly.</translation>
+      <translation type="unfinished">%1 channels or more are needed to fly.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="81"/>
       <source>DSM2 Mode</source>
-      <translation>DSM2 Mode</translation>
+      <translation type="unfinished">DSM2 Mode</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="87"/>
       <source>DSMX (7 channels or less)</source>
-      <translation>DSMX (7 channels or less)</translation>
+      <translation type="unfinished">DSMX (7 channels or less)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="94"/>
       <source>DSMX (8 channels or more)</source>
-      <translation>DSMX (8 channels or more)</translation>
+      <translation type="unfinished">DSMX (8 channels or more)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="150"/>
       <source>Not Mapped</source>
-      <translation>Not Mapped</translation>
+      <translation type="unfinished">Not Mapped</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="176"/>
       <source>Attitude Controls</source>
-      <translation>Attitude Controls</translation>
+      <translation type="unfinished">Attitude Controls</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="184"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="213"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="242"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="271"/>
       <source>Throttle</source>
-      <translation>Throttle</translation>
+      <translation type="unfinished">Throttle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="299"/>
       <source>Skip</source>
-      <translation>Skip</translation>
+      <translation type="unfinished">Skip</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="305"/>
       <source>Cancel</source>
-      <translation>Cancel</translation>
+      <translation type="unfinished">Cancel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="312"/>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="315"/>
       <source>Calibrate</source>
-      <translation>Calibrate</translation>
+      <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="317"/>
@@ -14738,29 +14738,29 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="350"/>
       <source>Additional Radio setup:</source>
-      <translation>Additional Radio setup:</translation>
+      <translation type="unfinished">Additional Radio setup:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="60"/>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="387"/>
       <source>Spektrum Bind</source>
-      <translation>Spektrum Bind</translation>
+      <translation type="unfinished">Spektrum Bind</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="400"/>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="401"/>
       <source>Copy Trims</source>
-      <translation>Copy Trims</translation>
+      <translation type="unfinished">Copy Trims</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="427"/>
       <source>Mode 1</source>
-      <translation>Mode 1</translation>
+      <translation type="unfinished">Mode 1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="433"/>
       <source>Mode 2</source>
-      <translation>Mode 2</translation>
+      <translation type="unfinished">Mode 2</translation>
     </message>
   </context>
   <context>
@@ -14772,7 +14772,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
 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>Lower the Throttle stick all the way down as shown in diagram.
+      <translation type="unfinished">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.
 
@@ -14786,7 +14786,7 @@ 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>Lower the Throttle stick all the way down as shown in diagram.
+      <translation type="unfinished">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.
@@ -14796,57 +14796,57 @@ Click Next to continue</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="76"/>
       <source>Move the Throttle stick all the way up and hold it there...</source>
-      <translation>Move the Throttle stick all the way up and hold it there...</translation>
+      <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="77"/>
       <source>Move the Throttle stick all the way down and leave it there...</source>
-      <translation>Move the Throttle stick all the way down and leave it there...</translation>
+      <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="78"/>
       <source>Move the Yaw stick all the way to the left and hold it there...</source>
-      <translation>Move the Yaw stick all the way to the left and hold it there...</translation>
+      <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="79"/>
       <source>Move the Yaw stick all the way to the right and hold it there...</source>
-      <translation>Move the Yaw stick all the way to the right and hold it there...</translation>
+      <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="80"/>
       <source>Move the Roll stick all the way to the left and hold it there...</source>
-      <translation>Move the Roll stick all the way to the left and hold it there...</translation>
+      <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="81"/>
       <source>Move the Roll stick all the way to the right and hold it there...</source>
-      <translation>Move the Roll stick all the way to the right and hold it there...</translation>
+      <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="82"/>
       <source>Move the Pitch stick all the way down and hold it there...</source>
-      <translation>Move the Pitch stick all the way down and hold it there...</translation>
+      <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="83"/>
       <source>Move the Pitch stick all the way up and hold it there...</source>
-      <translation>Move the Pitch stick all the way up and hold it there...</translation>
+      <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="84"/>
       <source>Allow the Pitch stick to move back to center...</source>
-      <translation>Allow the Pitch stick to move back to center...</translation>
+      <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="85"/>
       <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-      <translation>Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
+      <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="86"/>
       <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-      <translation>All settings have been captured. Click Next to write the new parameters to your board.</translation>
+      <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="163"/>
@@ -14856,7 +14856,7 @@ Reset all transmitter trims to center.
 Please ensure all motor power is disconnected from the vehicle.
 
 Click Next to continue</source>
-      <translation>Center the Throttle stick as shown in diagram.
+      <translation type="unfinished">Center the Throttle stick as shown in diagram.
 Reset all transmitter trims to center.
 
 Please ensure all motor power is disconnected from the vehicle.
@@ -14866,19 +14866,19 @@ Click Next to continue</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="772"/>
       <source>Next</source>
-      <translation>Next</translation>
+      <translation type="unfinished">Next</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="796"/>
       <source>Calibrate</source>
-      <translation>Calibrate</translation>
+      <translation type="unfinished">Calibrate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="826"/>
       <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>The current calibration settings are now displayed for each channel on screen.
+      <translation type="unfinished">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.</translation>
     </message>
@@ -14888,12 +14888,12 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/MissionManager/RallyPointController.cc" line="103"/>
       <source>Rally: %1</source>
-      <translation>Rally: %1</translation>
+      <translation type="unfinished">Rally: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/RallyPointController.cc" line="106"/>
       <source>Rally Points supports version %1</source>
-      <translation>Rally Points supports version %1</translation>
+      <translation type="unfinished">Rally Points supports version %1</translation>
     </message>
   </context>
   <context>
@@ -14901,12 +14901,12 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/QmlControls/RallyPointEditorHeader.qml" line="30"/>
       <source>Rally Points</source>
-      <translation>Rally Points</translation>
+      <translation type="unfinished">Rally Points</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RallyPointEditorHeader.qml" line="51"/>
       <source>Rally Points provide alternate landing points when performing a Return to Launch (RTL).</source>
-      <translation>Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
+      <translation type="unfinished">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
     </message>
   </context>
   <context>
@@ -14914,12 +14914,12 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/QmlControls/RallyPointItemEditor.qml" line="51"/>
       <source>Rally Point</source>
-      <translation>Rally Point</translation>
+      <translation type="unfinished">Rally Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RallyPointItemEditor.qml" line="74"/>
       <source>Delete</source>
-      <translation>Delete</translation>
+      <translation type="unfinished">Delete</translation>
     </message>
   </context>
   <context>
@@ -14928,7 +14928,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <location filename="../src/QmlControls/RallyPointMapVisuals.qml" line="72"/>
       <source>R</source>
       <comment>rally point map item label</comment>
-      <translation>R</translation>
+      <translation type="unfinished">R</translation>
     </message>
   </context>
   <context>
@@ -15148,67 +15148,67 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
       <source>Rover Initial Checks</source>
-      <translation>Rover Initial Checks</translation>
+      <translation type="unfinished">Rover Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
       <source>Hardware</source>
-      <translation>Hardware</translation>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
       <source>Battery mounted and secured?</source>
-      <translation>Battery mounted and secured?</translation>
+      <translation type="unfinished">Battery mounted and secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>Please arm the vehicle here</translation>
+      <translation type="unfinished">Please arm the vehicle here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
       <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation>Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
       <source>Last preparations before launch</source>
-      <translation>Last preparations before launch</translation>
+      <translation type="unfinished">Last preparations before launch</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
       <source>Payload</source>
-      <translation>Payload</translation>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
       <source>Configured and started? Payload lid closed?</source>
-      <translation>Configured and started? Payload lid closed?</translation>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
       <source>Wind &amp; weather</source>
-      <translation>Wind &amp; weather</translation>
+      <translation type="unfinished">Wind &amp; weather</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
       <source>OK for your platform?</source>
-      <translation>OK for your platform?</translation>
+      <translation type="unfinished">OK for your platform?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
       <source>Mission area</source>
-      <translation>Mission area</translation>
+      <translation type="unfinished">Mission area</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
       <source>Mission area and path free of obstacles/people?</source>
-      <translation>Mission area and path free of obstacles/people?</translation>
+      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
     </message>
   </context>
   <context>
@@ -15289,7 +15289,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/Utilities/Shape/SHPFileHelper.cc" line="32"/>
       <source>SHP file load failed. %1</source>
-      <translation>SHP file load failed. %1</translation>
+      <translation type="unfinished">SHP file load failed. %1</translation>
     </message>
   </context>
   <context>
@@ -15297,188 +15297,188 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="65"/>
       <source>Low Battery Failsafe Trigger</source>
-      <translation>Low Battery Failsafe Trigger</translation>
+      <translation type="unfinished">Low Battery Failsafe Trigger</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="93"/>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="275"/>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="327"/>
       <source>Failsafe Action:</source>
-      <translation>Failsafe Action:</translation>
+      <translation type="unfinished">Failsafe Action:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="105"/>
       <source>Battery Warn Level:</source>
-      <translation>Battery Warn Level:</translation>
+      <translation type="unfinished">Battery Warn Level:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="114"/>
       <source>Battery Failsafe Level:</source>
-      <translation>Battery Failsafe Level:</translation>
+      <translation type="unfinished">Battery Failsafe Level:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="123"/>
       <source>Battery Emergency Level:</source>
-      <translation>Battery Emergency Level:</translation>
+      <translation type="unfinished">Battery Emergency Level:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="135"/>
       <source>Object Detection</source>
-      <translation>Object Detection</translation>
+      <translation type="unfinished">Object Detection</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="163"/>
       <source>Collision Prevention:</source>
-      <translation>Collision Prevention:</translation>
+      <translation type="unfinished">Collision Prevention:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="168"/>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="187"/>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="608"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="168"/>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="187"/>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="608"/>
       <source>Enabled</source>
-      <translation>Enabled</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="183"/>
       <source>Obstacle Avoidance:</source>
-      <translation>Obstacle Avoidance:</translation>
+      <translation type="unfinished">Obstacle Avoidance:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="200"/>
       <source>Minimum Distance: (</source>
-      <translation>Minimum Distance: (</translation>
+      <translation type="unfinished">Minimum Distance: (</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="236"/>
       <source>Show obstacle distance overlay</source>
-      <translation>Show obstacle distance overlay</translation>
+      <translation type="unfinished">Show obstacle distance overlay</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="247"/>
       <source>RC Loss Failsafe Trigger</source>
-      <translation>RC Loss Failsafe Trigger</translation>
+      <translation type="unfinished">RC Loss Failsafe Trigger</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="287"/>
       <source>RC Loss Timeout:</source>
-      <translation>RC Loss Timeout:</translation>
+      <translation type="unfinished">RC Loss Timeout:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="299"/>
       <source>Data Link Loss Failsafe Trigger</source>
-      <translation>Data Link Loss Failsafe Trigger</translation>
+      <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="339"/>
       <source>Data Link Loss Timeout:</source>
-      <translation>Data Link Loss Timeout:</translation>
+      <translation type="unfinished">Data Link Loss Timeout:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="351"/>
       <source>Geofence Failsafe Trigger</source>
-      <translation>Geofence Failsafe Trigger</translation>
+      <translation type="unfinished">Geofence Failsafe Trigger</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="380"/>
       <source>Action on breach:</source>
-      <translation>Action on breach:</translation>
+      <translation type="unfinished">Action on breach:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="393"/>
       <source>Max Radius:</source>
-      <translation>Max Radius:</translation>
+      <translation type="unfinished">Max Radius:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="406"/>
       <source>Max Altitude:</source>
-      <translation>Max Altitude:</translation>
+      <translation type="unfinished">Max Altitude:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="421"/>
       <source>Return To Launch Settings</source>
-      <translation>Return To Launch Settings</translation>
+      <translation type="unfinished">Return To Launch Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="460"/>
       <source>Return to launch, then:</source>
-      <translation>Return to launch, then:</translation>
+      <translation type="unfinished">Return to launch, then:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="603"/>
       <source>Telemetry logging to vehicle storage:</source>
-      <translation>Telemetry logging to vehicle storage:</translation>
+      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="449"/>
       <source>Climb to altitude of:</source>
-      <translation>Climb to altitude of:</translation>
+      <translation type="unfinished">Climb to altitude of:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="469"/>
       <source>Land immediately</source>
-      <translation>Land immediately</translation>
+      <translation type="unfinished">Land immediately</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="479"/>
       <source>Loiter and do not land</source>
-      <translation>Loiter and do not land</translation>
+      <translation type="unfinished">Loiter and do not land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="489"/>
       <source>Loiter and land after specified time</source>
-      <translation>Loiter and land after specified time</translation>
+      <translation type="unfinished">Loiter and land after specified time</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="495"/>
       <source>Loiter Time</source>
-      <translation>Loiter Time</translation>
+      <translation type="unfinished">Loiter Time</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="505"/>
       <source>Loiter Altitude</source>
-      <translation>Loiter Altitude</translation>
+      <translation type="unfinished">Loiter Altitude</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="518"/>
       <source>Land Mode Settings</source>
-      <translation>Land Mode Settings</translation>
+      <translation type="unfinished">Land Mode Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="547"/>
       <source>Landing Descent Rate:</source>
-      <translation>Landing Descent Rate:</translation>
+      <translation type="unfinished">Landing Descent Rate:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="561"/>
       <source>Disarm After:</source>
-      <translation>Disarm After:</translation>
+      <translation type="unfinished">Disarm After:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="576"/>
       <source>Vehicle Telemetry Logging</source>
-      <translation>Vehicle Telemetry Logging</translation>
+      <translation type="unfinished">Vehicle Telemetry Logging</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="626"/>
       <source>Hardware in the Loop Simulation</source>
-      <translation>Hardware in the Loop Simulation</translation>
+      <translation type="unfinished">Hardware in the Loop Simulation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="655"/>
       <source>HITL Enabled:</source>
-      <translation>HITL Enabled:</translation>
+      <translation type="unfinished">HITL Enabled:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="18"/>
       <source>Safety</source>
-      <translation>Safety</translation>
+      <translation type="unfinished">Safety</translation>
     </message>
   </context>
   <context>
@@ -15486,57 +15486,57 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
       <source>Low Battery Failsafe</source>
-      <translation>Low Battery Failsafe</translation>
+      <translation type="unfinished">Low Battery Failsafe</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
       <source>RC Loss Failsafe</source>
-      <translation>RC Loss Failsafe</translation>
+      <translation type="unfinished">RC Loss Failsafe</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
       <source>RC Loss Timeout</source>
-      <translation>RC Loss Timeout</translation>
+      <translation type="unfinished">RC Loss Timeout</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
       <source>Data Link Loss Failsafe</source>
-      <translation>Data Link Loss Failsafe</translation>
+      <translation type="unfinished">Data Link Loss Failsafe</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
       <source>RTL Climb To</source>
-      <translation>RTL Climb To</translation>
+      <translation type="unfinished">RTL Climb To</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
       <source>RTL, Then</source>
-      <translation>RTL, Then</translation>
+      <translation type="unfinished">RTL, Then</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
       <source>Land immediately</source>
-      <translation>Land immediately</translation>
+      <translation type="unfinished">Land immediately</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
       <source>Loiter and do not land</source>
-      <translation>Loiter and do not land</translation>
+      <translation type="unfinished">Loiter and do not land</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
       <source>Loiter and land after specified time</source>
-      <translation>Loiter and land after specified time</translation>
+      <translation type="unfinished">Loiter and land after specified time</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
       <source>Loiter Alt</source>
-      <translation>Loiter Alt</translation>
+      <translation type="unfinished">Loiter Alt</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
       <source>Land Delay</source>
-      <translation>Land Delay</translation>
+      <translation type="unfinished">Land Delay</translation>
     </message>
   </context>
   <context>
@@ -15544,12 +15544,12 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="16"/>
       <source>Sensors</source>
-      <translation>Sensors</translation>
+      <translation type="unfinished">Sensors</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="37"/>
       <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation>Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
+      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
     </message>
   </context>
   <context>
@@ -15557,52 +15557,52 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="167"/>
       <source>Calibration complete</source>
-      <translation>Calibration complete</translation>
+      <translation type="unfinished">Calibration complete</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="184"/>
       <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation>Calibration failed. Calibration log will be displayed.</translation>
+      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="274"/>
       <source>Unsupported calibration firmware version, using log</source>
-      <translation>Unsupported calibration firmware version, using log</translation>
+      <translation type="unfinished">Unsupported calibration firmware version, using log</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="306"/>
       <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation>Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
+      <translation type="unfinished">Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="391"/>
       <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation>Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
+      <translation type="unfinished">Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
       <source>Hold still in the current orientation</source>
-      <translation>Hold still in the current orientation</translation>
+      <translation type="unfinished">Hold still in the current orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="431"/>
       <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation>Place you vehicle into one of the orientations shown below and hold it still</translation>
+      <translation type="unfinished">Place you vehicle into one of the orientations shown below and hold it still</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="440"/>
       <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
+      <translation type="unfinished">Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="500"/>
       <source>Reset successful</source>
-      <translation>Reset successful</translation>
+      <translation type="unfinished">Reset successful</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="507"/>
       <source>Reset failed</source>
-      <translation>Reset failed</translation>
+      <translation type="unfinished">Reset failed</translation>
     </message>
   </context>
   <context>
@@ -15610,14 +15610,14 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="28"/>
       <source>Compass 0</source>
-      <translation>Compass 0</translation>
+      <translation type="unfinished">Compass 0</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
@@ -15626,27 +15626,27 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
       <source>Ready</source>
-      <translation>Ready</translation>
+      <translation type="unfinished">Ready</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="33"/>
       <source>Compass 1</source>
-      <translation>Compass 1</translation>
+      <translation type="unfinished">Compass 1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="39"/>
       <source>Compass 2</source>
-      <translation>Compass 2</translation>
+      <translation type="unfinished">Compass 2</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="45"/>
       <source>Gyro</source>
-      <translation>Gyro</translation>
+      <translation type="unfinished">Gyro</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="50"/>
       <source>Accelerometer</source>
-      <translation>Accelerometer</translation>
+      <translation type="unfinished">Accelerometer</translation>
     </message>
   </context>
   <context>
@@ -15654,7 +15654,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="26"/>
       <source>Compass:</source>
-      <translation>Compass:</translation>
+      <translation type="unfinished">Compass:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="27"/>
@@ -15662,7 +15662,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
       <source>Setup required</source>
-      <translation>Setup required</translation>
+      <translation type="unfinished">Setup required</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="27"/>
@@ -15670,22 +15670,22 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
       <source>Ready</source>
-      <translation>Ready</translation>
+      <translation type="unfinished">Ready</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="31"/>
       <source>Gyro:</source>
-      <translation>Gyro:</translation>
+      <translation type="unfinished">Gyro:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="36"/>
       <source>Accelerometer:</source>
-      <translation>Accelerometer:</translation>
+      <translation type="unfinished">Accelerometer:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="41"/>
       <source>Airspeed:</source>
-      <translation>Airspeed:</translation>
+      <translation type="unfinished">Airspeed:</translation>
     </message>
   </context>
   <context>
@@ -15694,173 +15694,173 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
       <source>If the orientation is in the direction of flight, select ROTATION_NONE.</source>
-      <translation>If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
+      <translation type="unfinished">If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
       <source>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
+      <translation type="unfinished">For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
       <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation>Start the individual calibration steps by clicking one of the buttons to the left.</translation>
+      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="210"/>
       <source>Compass Calibration Complete</source>
-      <translation>Compass Calibration Complete</translation>
+      <translation type="unfinished">Compass Calibration Complete</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="231"/>
       <source>Calibration Cancel</source>
-      <translation>Calibration Cancel</translation>
+      <translation type="unfinished">Calibration Cancel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="223"/>
       <source>Sensor Calibration</source>
-      <translation>Sensor Calibration</translation>
+      <translation type="unfinished">Sensor Calibration</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="223"/>
       <source>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</source>
-      <translation>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
+      <translation type="unfinished">Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="232"/>
       <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation>Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
+      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="285"/>
       <source>Set autopilot orientation before calibrating.</source>
-      <translation>Set autopilot orientation before calibrating.</translation>
+      <translation type="unfinished">Set autopilot orientation before calibrating.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
       <source>Reboot Vehicle</source>
-      <translation>Reboot Vehicle</translation>
+      <translation type="unfinished">Reboot Vehicle</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
       <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation>For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
+      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
       <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
+      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
       <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
+      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation>To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
+      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="290"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="346"/>
       <source>Autopilot Orientation</source>
-      <translation>Autopilot Orientation</translation>
+      <translation type="unfinished">Autopilot Orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="300"/>
       <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation>ROTATION_NONE indicates component points in direction of flight.</translation>
+      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="306"/>
       <source>Click Ok to start calibration.</source>
-      <translation>Click Ok to start calibration.</translation>
+      <translation type="unfinished">Click Ok to start calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
       <source>Reboot the vehicle prior to flight.</source>
-      <translation>Reboot the vehicle prior to flight.</translation>
+      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="338"/>
       <source>Adjust orientations as needed.
 
 ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation>Adjust orientations as needed.
+      <translation type="unfinished">Adjust orientations as needed.
 
 ROTATION_NONE indicates component points in direction of flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="367"/>
       <source>Mag %1 Orientation</source>
-      <translation>Mag %1 Orientation</translation>
+      <translation type="unfinished">Mag %1 Orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="395"/>
       <source>Compass</source>
-      <translation>Compass</translation>
+      <translation type="unfinished">Compass</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="402"/>
       <source>Calibrate Compass</source>
-      <translation>Calibrate Compass</translation>
+      <translation type="unfinished">Calibrate Compass</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="409"/>
       <source>Gyroscope</source>
-      <translation>Gyroscope</translation>
+      <translation type="unfinished">Gyroscope</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="416"/>
       <source>Calibrate Gyro</source>
-      <translation>Calibrate Gyro</translation>
+      <translation type="unfinished">Calibrate Gyro</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="423"/>
       <source>Accelerometer</source>
-      <translation>Accelerometer</translation>
+      <translation type="unfinished">Accelerometer</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="430"/>
       <source>Calibrate Accelerometer</source>
-      <translation>Calibrate Accelerometer</translation>
+      <translation type="unfinished">Calibrate Accelerometer</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="437"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
       <source>Level Horizon</source>
-      <translation>Level Horizon</translation>
+      <translation type="unfinished">Level Horizon</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="452"/>
       <source>Airspeed</source>
-      <translation>Airspeed</translation>
+      <translation type="unfinished">Airspeed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="461"/>
       <source>Calibrate Airspeed</source>
-      <translation>Calibrate Airspeed</translation>
+      <translation type="unfinished">Calibrate Airspeed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="468"/>
       <source>Cancel</source>
-      <translation>Cancel</translation>
+      <translation type="unfinished">Cancel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="477"/>
       <source>Next</source>
-      <translation>Next</translation>
+      <translation type="unfinished">Next</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="485"/>
       <source>Orientations</source>
-      <translation>Orientations</translation>
+      <translation type="unfinished">Orientations</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="490"/>
       <source>Set Orientations</source>
-      <translation>Set Orientations</translation>
+      <translation type="unfinished">Set Orientations</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="561"/>
@@ -15870,7 +15870,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="597"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="606"/>
       <source>Rotate</source>
-      <translation>Rotate</translation>
+      <translation type="unfinished">Rotate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="561"/>
@@ -15880,12 +15880,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="597"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="606"/>
       <source>Hold Still</source>
-      <translation>Hold Still</translation>
+      <translation type="unfinished">Hold Still</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="613"/>
       <source>Factory reset</source>
-      <translation>Factory reset</translation>
+      <translation type="unfinished">Factory reset</translation>
     </message>
   </context>
   <context>
@@ -15893,7 +15893,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Comms/SerialLink.h" line="53"/>
       <source>Serial Link Settings</source>
-      <translation>Serial Link Settings</translation>
+      <translation type="unfinished">Serial Link Settings</translation>
     </message>
   </context>
   <context>
@@ -15914,62 +15914,62 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="92"/>
       <source>Baud rate name not in combo box</source>
-      <translation>Baud rate name not in combo box</translation>
+      <translation type="unfinished">Baud rate name not in combo box</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="114"/>
       <source>Enable Flow Control</source>
-      <translation>Enable Flow Control</translation>
+      <translation type="unfinished">Enable Flow Control</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="31"/>
       <source>Serial Port</source>
-      <translation>Serial Port</translation>
+      <translation type="unfinished">Serial Port</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="65"/>
       <source>None Available</source>
-      <translation>None Available</translation>
+      <translation type="unfinished">None Available</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="73"/>
       <source>Baud Rate</source>
-      <translation>Baud Rate</translation>
+      <translation type="unfinished">Baud Rate</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="102"/>
       <source>Advanced Settings</source>
-      <translation>Advanced Settings</translation>
+      <translation type="unfinished">Advanced Settings</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="119"/>
       <source>Parity</source>
-      <translation>Parity</translation>
+      <translation type="unfinished">Parity</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="122"/>
       <source>None</source>
-      <translation>None</translation>
+      <translation type="unfinished">None</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="122"/>
       <source>Even</source>
-      <translation>Even</translation>
+      <translation type="unfinished">Even</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="122"/>
       <source>Odd</source>
-      <translation>Odd</translation>
+      <translation type="unfinished">Odd</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="157"/>
       <source>Data Bits</source>
-      <translation>Data Bits</translation>
+      <translation type="unfinished">Data Bits</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="165"/>
       <source>Stop Bits</source>
-      <translation>Stop Bits</translation>
+      <translation type="unfinished">Stop Bits</translation>
     </message>
   </context>
   <context>
@@ -16093,12 +16093,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="42"/>
       <source>armed</source>
-      <translation>armed</translation>
+      <translation type="unfinished">armed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="42"/>
       <source>flying</source>
-      <translation>flying</translation>
+      <translation type="unfinished">flying</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="44"/>
@@ -16108,12 +16108,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="67"/>
       <source>Advanced</source>
-      <translation>Advanced</translation>
+      <translation type="unfinished">Advanced</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SetupPage.qml" line="78"/>
       <source> (Disabled while the vehicle is %1)</source>
-      <translation> (Disabled while the vehicle is %1)</translation>
+      <translation type="unfinished"> (Disabled while the vehicle is %1)</translation>
     </message>
   </context>
   <context>
@@ -16121,47 +16121,47 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="33"/>
       <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation>This operation cannot be performed while the vehicle is armed.</translation>
+      <translation type="unfinished">This operation cannot be performed while the vehicle is armed.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="36"/>
       <source>missing message panel text</source>
-      <translation>missing message panel text</translation>
+      <translation type="unfinished">missing message panel text</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="74"/>
       <source>%1 setup must be completed prior to %2 setup.</source>
-      <translation>%1 setup must be completed prior to %2 setup.</translation>
+      <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="132"/>
       <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation>%1 does not currently support setup of your vehicle type. </translation>
+      <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="150"/>
       <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation>Vehicle settings and info will display after connecting your vehicle.</translation>
+      <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="171"/>
       <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation>You are currently connected to a vehicle but it did not return the full parameter list. </translation>
+      <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="172"/>
       <source>As a result, the full set of vehicle setup options are not available.</source>
-      <translation>As a result, the full set of vehicle setup options are not available.</translation>
+      <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="215"/>
       <source>Summary</source>
-      <translation>Summary</translation>
+      <translation type="unfinished">Summary</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="273"/>
       <source>Firmware</source>
-      <translation>Firmware</translation>
+      <translation type="unfinished">Firmware</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="223"/>
@@ -16171,7 +16171,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="233"/>
       <source>Joystick</source>
-      <translation>Joystick</translation>
+      <translation type="unfinished">Joystick</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="233"/>
@@ -16181,7 +16181,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="263"/>
       <source>Parameters</source>
-      <translation>Parameters</translation>
+      <translation type="unfinished">Parameters</translation>
     </message>
   </context>
   <context>
@@ -16189,7 +16189,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Utilities/Shape/ShapeFileHelper.h" line="49"/>
       <source>Shape file load failed. %1</source>
-      <translation>Shape file load failed. %1</translation>
+      <translation type="unfinished">Shape file load failed. %1</translation>
     </message>
     <message>
       <location filename="../src/Utilities/Shape/ShapeFileHelper.cc" line="33"/>
@@ -16212,87 +16212,87 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="75"/>
       <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation>Move &apos;%1&apos; %2 to the %3 location. %4</translation>
+      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="156"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="37"/>
       <source>Internal Error</source>
-      <translation>Internal Error</translation>
+      <translation type="unfinished">Internal Error</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="64"/>
       <source>Provides advanced access to all commands/parameters. Be very careful!</source>
-      <translation>Provides advanced access to all commands/parameters. Be very careful!</translation>
+      <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="76"/>
       <source>T</source>
-      <translation>T</translation>
+      <translation type="unfinished">T</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="77"/>
       <source>Transition Direction</source>
-      <translation>Transition Direction</translation>
+      <translation type="unfinished">Transition Direction</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="77"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="78"/>
       <source>desired</source>
-      <translation>desired</translation>
+      <translation type="unfinished">desired</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="78"/>
       <source>climbout</source>
-      <translation>climbout</translation>
+      <translation type="unfinished">climbout</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="79"/>
       <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation>Ensure distance from launch to transition direction is far enough to complete transition.</translation>
+      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="86"/>
       <source>Ensure clear of obstacles and into the wind.</source>
-      <translation>Ensure clear of obstacles and into the wind.</translation>
+      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="93"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="104"/>
       <source>Click in map to set planned Takeoff location.</source>
-      <translation>Click in map to set planned Takeoff location.</translation>
+      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="105"/>
       <source>Click in map to set planned Launch location.</source>
-      <translation>Click in map to set planned Launch location.</translation>
+      <translation type="unfinished">Click in map to set planned Launch location.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="128"/>
       <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
+      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="182"/>
       <source>Actual AMSL alt sent: %1 %2</source>
-      <translation>Actual AMSL alt sent: %1 %2</translation>
+      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="242"/>
       <source>Flight Speed</source>
-      <translation>Flight Speed</translation>
+      <translation type="unfinished">Flight Speed</translation>
     </message>
   </context>
   <context>
@@ -16300,42 +16300,42 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="375"/>
       <source>Unknown: %1</source>
-      <translation>Unknown: %1</translation>
+      <translation type="unfinished">Unknown: %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="382"/>
       <source>L</source>
-      <translation>L</translation>
+      <translation type="unfinished">L</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="386"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="388"/>
       <source>Land</source>
-      <translation>Land</translation>
+      <translation type="unfinished">Land</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="390"/>
       <source>Transition Direction</source>
-      <translation>Transition Direction</translation>
+      <translation type="unfinished">Transition Direction</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="392"/>
       <source>VTOL Land</source>
-      <translation>VTOL Land</translation>
+      <translation type="unfinished">VTOL Land</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="395"/>
       <source>ROI</source>
-      <translation>ROI</translation>
+      <translation type="unfinished">ROI</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="400"/>
       <source>Loiter</source>
-      <translation>Loiter</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
   </context>
   <context>
@@ -16400,19 +16400,19 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="223"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation>%1 does not support loading this complex mission item type: %2:%3</translation>
+      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="229"/>
       <source>%1 version %2 not supported</source>
-      <translation>%1 version %2 not supported</translation>
+      <translation type="unfinished">%1 version %2 not supported</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="25"/>
       <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
       <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
       <source>Structure Scan</source>
-      <translation>Structure Scan</translation>
+      <translation type="unfinished">Structure Scan</translation>
     </message>
   </context>
   <context>
@@ -16420,119 +16420,119 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="62"/>
       <source>Use the Polygon Tools to create the polygon which outlines the structure.</source>
-      <translation>Use the Polygon Tools to create the polygon which outlines the structure.</translation>
+      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="77"/>
       <source>Grid</source>
-      <translation>Grid</translation>
+      <translation type="unfinished">Grid</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="78"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="88"/>
       <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
-      <translation>Note: Polygon respresents structure surface not vehicle flight path.</translation>
+      <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="95"/>
       <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
+      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="105"/>
       <source>Scan Distance</source>
-      <translation>Scan Distance</translation>
+      <translation type="unfinished">Scan Distance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="106"/>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="193"/>
       <source>Layer Height</source>
-      <translation>Layer Height</translation>
+      <translation type="unfinished">Layer Height</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="107"/>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="208"/>
       <source>Trigger Distance</source>
-      <translation>Trigger Distance</translation>
+      <translation type="unfinished">Trigger Distance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="113"/>
       <source>Scan</source>
-      <translation>Scan</translation>
+      <translation type="unfinished">Scan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="130"/>
       <source>Start Scan From Bottom</source>
-      <translation>Start Scan From Bottom</translation>
+      <translation type="unfinished">Start Scan From Bottom</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="130"/>
       <source>Start Scan From Top</source>
-      <translation>Start Scan From Top</translation>
+      <translation type="unfinished">Start Scan From Top</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="136"/>
       <source>Structure Height</source>
-      <translation>Structure Height</translation>
+      <translation type="unfinished">Structure Height</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="143"/>
       <source>Scan Bottom Alt</source>
-      <translation>Scan Bottom Alt</translation>
+      <translation type="unfinished">Scan Bottom Alt</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="150"/>
       <source>Entrance/Exit Alt</source>
-      <translation>Entrance/Exit Alt</translation>
+      <translation type="unfinished">Entrance/Exit Alt</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="158"/>
       <source>Gimbal Pitch</source>
-      <translation>Gimbal Pitch</translation>
+      <translation type="unfinished">Gimbal Pitch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="174"/>
       <source>Rotate entry point</source>
-      <translation>Rotate entry point</translation>
+      <translation type="unfinished">Rotate entry point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="182"/>
       <source>Statistics</source>
-      <translation>Statistics</translation>
+      <translation type="unfinished">Statistics</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="190"/>
       <source>Layers</source>
-      <translation>Layers</translation>
+      <translation type="unfinished">Layers</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="196"/>
       <source>Top Layer Alt</source>
-      <translation>Top Layer Alt</translation>
+      <translation type="unfinished">Top Layer Alt</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="199"/>
       <source>Bottom Layer Alt</source>
-      <translation>Bottom Layer Alt</translation>
+      <translation type="unfinished">Bottom Layer Alt</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="202"/>
       <source>Photo Count</source>
-      <translation>Photo Count</translation>
+      <translation type="unfinished">Photo Count</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="205"/>
       <source>Photo Interval</source>
-      <translation>Photo Interval</translation>
+      <translation type="unfinished">Photo Interval</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/StructureScanEditor.qml" line="206"/>
       <source>secs</source>
-      <translation>secs</translation>
+      <translation type="unfinished">secs</translation>
     </message>
   </context>
   <context>
@@ -16540,67 +16540,67 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
       <source>Submarine Initial checks</source>
-      <translation>Submarine Initial checks</translation>
+      <translation type="unfinished">Submarine Initial checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
       <source>Hardware</source>
-      <translation>Hardware</translation>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
       <source>All seals in place?</source>
-      <translation>All seals in place?</translation>
+      <translation type="unfinished">All seals in place?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>Please arm the vehicle here</translation>
+      <translation type="unfinished">Please arm the vehicle here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
       <source>Actuators</source>
-      <translation>Actuators</translation>
+      <translation type="unfinished">Actuators</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
       <source>Move all control surfaces. Did they work properly?</source>
-      <translation>Move all control surfaces. Did they work properly?</translation>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
       <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation>Propellers free? Then throttle up gently. Working properly?</translation>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
       <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation>Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
       <source>Last preparations before launch</source>
-      <translation>Last preparations before launch</translation>
+      <translation type="unfinished">Last preparations before launch</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
       <source>Payload</source>
-      <translation>Payload</translation>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
       <source>Configured and started? Payload lid closed?</source>
-      <translation>Configured and started? Payload lid closed?</translation>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
   </context>
   <context>
@@ -16608,30 +16608,30 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/SurveyComplexItem.cc" line="126"/>
       <source>Survey items do not support version %1</source>
-      <translation>Survey items do not support version %1</translation>
+      <translation type="unfinished">Survey items do not support version %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SurveyComplexItem.cc" line="183"/>
       <location filename="../src/MissionManager/SurveyComplexItem.cc" line="239"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation>%1 does not support loading this complex mission item type: %2:%3</translation>
+      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SurveyComplexItem.cc" line="287"/>
       <source>%1 but %2 object is missing</source>
-      <translation>%1 but %2 object is missing</translation>
+      <translation type="unfinished">%1 but %2 object is missing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SurveyComplexItem.cc" line="29"/>
       <location filename="../src/MissionManager/SurveyComplexItem.h" line="59"/>
       <location filename="../src/MissionManager/SurveyComplexItem.h" line="60"/>
       <source>Survey</source>
-      <translation>Survey</translation>
+      <translation type="unfinished">Survey</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SurveyComplexItem.h" line="61"/>
       <source>S</source>
-      <translation>S</translation>
+      <translation type="unfinished">S</translation>
     </message>
   </context>
   <context>
@@ -16639,47 +16639,47 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="17"/>
       <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation>Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
+      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="18"/>
       <source>Transects</source>
-      <translation>Transects</translation>
+      <translation type="unfinished">Transects</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="38"/>
       <source>Angle</source>
-      <translation>Angle</translation>
+      <translation type="unfinished">Angle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="60"/>
       <source>Turnaround dist</source>
-      <translation>Turnaround dist</translation>
+      <translation type="unfinished">Turnaround dist</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="76"/>
       <source>Hover and capture image</source>
-      <translation>Hover and capture image</translation>
+      <translation type="unfinished">Hover and capture image</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="82"/>
       <source>Refly at 90 deg offset</source>
-      <translation>Refly at 90 deg offset</translation>
+      <translation type="unfinished">Refly at 90 deg offset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="88"/>
       <source>Images in turnarounds</source>
-      <translation>Images in turnarounds</translation>
+      <translation type="unfinished">Images in turnarounds</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="94"/>
       <source>Fly alternate transects</source>
-      <translation>Fly alternate transects</translation>
+      <translation type="unfinished">Fly alternate transects</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="106"/>
       <source>Select Polygon File</source>
-      <translation>Select Polygon File</translation>
+      <translation type="unfinished">Select Polygon File</translation>
     </message>
   </context>
   <context>
@@ -16687,17 +16687,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MAVLink/SysStatusSensorInfo.cc" line="98"/>
       <source>Error</source>
-      <translation>Error</translation>
+      <translation type="unfinished">Error</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/SysStatusSensorInfo.cc" line="104"/>
       <source>Normal</source>
-      <translation>Normal</translation>
+      <translation type="unfinished">Normal</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/SysStatusSensorInfo.cc" line="110"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
   </context>
   <context>
@@ -16705,17 +16705,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="43"/>
       <source>Radio Settings</source>
-      <translation>Radio Settings</translation>
+      <translation type="unfinished">Radio Settings</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="61"/>
       <source>Channel</source>
-      <translation>Channel</translation>
+      <translation type="unfinished">Channel</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="86"/>
       <source>Address</source>
-      <translation>Address</translation>
+      <translation type="unfinished">Address</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="106"/>
@@ -16725,7 +16725,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="112"/>
       <source>Data Rate</source>
-      <translation>Data Rate</translation>
+      <translation type="unfinished">Data Rate</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="126"/>
@@ -16735,12 +16735,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="14"/>
       <source>Syslink</source>
-      <translation>Syslink</translation>
+      <translation type="unfinished">Syslink</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.h" line="23"/>
       <source>The Syslink Component is used to setup the radio connection on Crazyflies.</source>
-      <translation>The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
+      <translation type="unfinished">The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
     </message>
   </context>
   <context>
@@ -16748,7 +16748,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Comms/TCPLink.h" line="45"/>
       <source>TCP Link Settings</source>
-      <translation>TCP Link Settings</translation>
+      <translation type="unfinished">TCP Link Settings</translation>
     </message>
   </context>
   <context>
@@ -16805,7 +16805,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TakeoffItemMapVisual.qml" line="132"/>
       <source>Launch</source>
-      <translation>Launch</translation>
+      <translation type="unfinished">Launch</translation>
     </message>
   </context>
   <context>
@@ -16813,12 +16813,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/TcpSettings.qml" line="29"/>
       <source>Server Address</source>
-      <translation>Server Address</translation>
+      <translation type="unfinished">Server Address</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TcpSettings.qml" line="36"/>
       <source>Port</source>
-      <translation>Port</translation>
+      <translation type="unfinished">Port</translation>
     </message>
   </context>
   <context>
@@ -16826,12 +16826,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="55"/>
       <source>Telemetry RSSI Status</source>
-      <translation>Telemetry RSSI Status</translation>
+      <translation type="unfinished">Telemetry RSSI Status</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
       <source>Local RSSI:</source>
-      <translation>Local RSSI:</translation>
+      <translation type="unfinished">Local RSSI:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="59"/>
@@ -16842,32 +16842,32 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="63"/>
       <source>Remote RSSI:</source>
-      <translation>Remote RSSI:</translation>
+      <translation type="unfinished">Remote RSSI:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
       <source>RX Errors:</source>
-      <translation>RX Errors:</translation>
+      <translation type="unfinished">RX Errors:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="73"/>
       <source>Errors Fixed:</source>
-      <translation>Errors Fixed:</translation>
+      <translation type="unfinished">Errors Fixed:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="78"/>
       <source>TX Buffer:</source>
-      <translation>TX Buffer:</translation>
+      <translation type="unfinished">TX Buffer:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="83"/>
       <source>Local Noise:</source>
-      <translation>Local Noise:</translation>
+      <translation type="unfinished">Local Noise:</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/TelemetryRSSIIndicator.qml" line="88"/>
       <source>Remote Noise:</source>
-      <translation>Remote Noise:</translation>
+      <translation type="unfinished">Remote Noise:</translation>
     </message>
   </context>
   <context>
@@ -17033,12 +17033,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
       <source>Terrain Load Progress</source>
-      <translation>Terrain Load Progress</translation>
+      <translation type="unfinished">Terrain Load Progress</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
   </context>
   <context>
@@ -17046,7 +17046,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TerrainStatus.qml" line="45"/>
       <source>Height AMSL (%1)</source>
-      <translation>Height AMSL (%1)</translation>
+      <translation type="unfinished">Height AMSL (%1)</translation>
     </message>
   </context>
   <context>
@@ -17062,18 +17062,18 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="215"/>
       <source>TransectStyleComplexItem version %2 not supported</source>
-      <translation>TransectStyleComplexItem version %2 not supported</translation>
+      <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="101"/>
       <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="102"/>
       <source>Transect</source>
-      <translation>Transect</translation>
+      <translation type="unfinished">Transect</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
       <source>T</source>
-      <translation>T</translation>
+      <translation type="unfinished">T</translation>
     </message>
   </context>
   <context>
@@ -17081,94 +17081,94 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="35"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="91"/>
       <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
+      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="101"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="102"/>
       <source>Trigger Dist</source>
-      <translation>Trigger Dist</translation>
+      <translation type="unfinished">Trigger Dist</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="103"/>
       <source>Spacing</source>
-      <translation>Spacing</translation>
+      <translation type="unfinished">Spacing</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="122"/>
       <source>Rotate Entry Point</source>
-      <translation>Rotate Entry Point</translation>
+      <translation type="unfinished">Rotate Entry Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="130"/>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="231"/>
       <source>Statistics</source>
-      <translation>Statistics</translation>
+      <translation type="unfinished">Statistics</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="162"/>
       <source>Presets</source>
-      <translation>Presets</translation>
+      <translation type="unfinished">Presets</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="177"/>
       <source>Apply Preset</source>
-      <translation>Apply Preset</translation>
+      <translation type="unfinished">Apply Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="184"/>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="192"/>
       <source>Delete Preset</source>
-      <translation>Delete Preset</translation>
+      <translation type="unfinished">Delete Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="193"/>
       <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation>Are you sure you want to delete &apos;%1&apos; preset?</translation>
+      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="209"/>
       <source>Save Settings As New Preset</source>
-      <translation>Save Settings As New Preset</translation>
+      <translation type="unfinished">Save Settings As New Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="246"/>
       <source>Save Preset</source>
-      <translation>Save Preset</translation>
+      <translation type="unfinished">Save Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="263"/>
       <source>Save the current settings as a named preset.</source>
-      <translation>Save the current settings as a named preset.</translation>
+      <translation type="unfinished">Save the current settings as a named preset.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="268"/>
       <source>Preset Name</source>
-      <translation>Preset Name</translation>
+      <translation type="unfinished">Preset Name</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="274"/>
       <source>Enter preset name</source>
-      <translation>Enter preset name</translation>
+      <translation type="unfinished">Enter preset name</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="281"/>
       <source>Preset name cannot be blank.</source>
-      <translation>Preset name cannot be blank.</translation>
+      <translation type="unfinished">Preset name cannot be blank.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="284"/>
       <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation>Preset name cannot include the &quot;/&quot; character.</translation>
+      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
     </message>
   </context>
   <context>
@@ -17176,27 +17176,27 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemStats.qml" line="16"/>
       <source>Survey Area</source>
-      <translation>Survey Area</translation>
+      <translation type="unfinished">Survey Area</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemStats.qml" line="19"/>
       <source>Photo Count</source>
-      <translation>Photo Count</translation>
+      <translation type="unfinished">Photo Count</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemStats.qml" line="22"/>
       <source>Photo Interval</source>
-      <translation>Photo Interval</translation>
+      <translation type="unfinished">Photo Interval</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemStats.qml" line="23"/>
       <source>secs</source>
-      <translation>secs</translation>
+      <translation type="unfinished">secs</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemStats.qml" line="25"/>
       <source>Trigger Distance</source>
-      <translation>Trigger Distance</translation>
+      <translation type="unfinished">Trigger Distance</translation>
     </message>
   </context>
   <context>
@@ -17204,17 +17204,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
       <source>Tolerance</source>
-      <translation>Tolerance</translation>
+      <translation type="unfinished">Tolerance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
       <source>Max Climb Rate</source>
-      <translation>Max Climb Rate</translation>
+      <translation type="unfinished">Max Climb Rate</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
       <source>Max Descent Rate</source>
-      <translation>Max Descent Rate</translation>
+      <translation type="unfinished">Max Descent Rate</translation>
     </message>
   </context>
   <context>
@@ -17222,7 +17222,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Comms/UDPLink.h" line="90"/>
       <source>UDP Link Settings</source>
-      <translation>UDP Link Settings</translation>
+      <translation type="unfinished">UDP Link Settings</translation>
     </message>
   </context>
   <context>
@@ -17230,7 +17230,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="625"/>
       <source>UDP Link Error</source>
-      <translation>UDP Link Error</translation>
+      <translation type="unfinished">UDP Link Error</translation>
     </message>
     <message>
       <location filename="../src/Comms/UDPLink.cc" line="625"/>
@@ -17440,32 +17440,32 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="31"/>
       <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
+      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="37"/>
       <source>Port</source>
-      <translation>Port</translation>
+      <translation type="unfinished">Port</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="48"/>
       <source>Server Addresses (optional)</source>
-      <translation>Server Addresses (optional)</translation>
+      <translation type="unfinished">Server Addresses (optional)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="62"/>
       <source>Remove</source>
-      <translation>Remove</translation>
+      <translation type="unfinished">Remove</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="74"/>
       <source>Example: 127.0.0.1:14550</source>
-      <translation>Example: 127.0.0.1:14550</translation>
+      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="77"/>
       <source>Add Server</source>
-      <translation>Add Server</translation>
+      <translation type="unfinished">Add Server</translation>
     </message>
   </context>
   <context>
@@ -17473,52 +17473,52 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
       <source>Measurement Units</source>
-      <translation>Measurement Units</translation>
+      <translation type="unfinished">Measurement Units</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
       <source>Horizontal Distance</source>
-      <translation>Horizontal Distance</translation>
+      <translation type="unfinished">Horizontal Distance</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
       <source>Vertical Distance</source>
-      <translation>Vertical Distance</translation>
+      <translation type="unfinished">Vertical Distance</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
       <source>Area</source>
-      <translation>Area</translation>
+      <translation type="unfinished">Area</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
       <source>Speed</source>
-      <translation>Speed</translation>
+      <translation type="unfinished">Speed</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
       <source>Temperature</source>
-      <translation>Temperature</translation>
+      <translation type="unfinished">Temperature</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="68"/>
       <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
-      <translation>Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
+      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="88"/>
       <source>System of units</source>
-      <translation>System of units</translation>
+      <translation type="unfinished">System of units</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="101"/>
       <source>Metric System</source>
-      <translation>Metric System</translation>
+      <translation type="unfinished">Metric System</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="101"/>
       <source>Imperial System</source>
-      <translation>Imperial System</translation>
+      <translation type="unfinished">Imperial System</translation>
     </message>
   </context>
   <context>
@@ -17636,82 +17636,82 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
       <source>VTOL Initial Checks</source>
-      <translation>VTOL Initial Checks</translation>
+      <translation type="unfinished">VTOL Initial Checks</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
       <source>Hardware</source>
-      <translation>Hardware</translation>
+      <translation type="unfinished">Hardware</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
       <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation>Props mounted? Wings secured? Tail secured?</translation>
+      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>Please arm the vehicle here</translation>
+      <translation type="unfinished">Please arm the vehicle here</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
       <source>Actuators</source>
-      <translation>Actuators</translation>
+      <translation type="unfinished">Actuators</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
       <source>Move all control surfaces. Did they work properly?</source>
-      <translation>Move all control surfaces. Did they work properly?</translation>
+      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
       <source>Motors</source>
-      <translation>Motors</translation>
+      <translation type="unfinished">Motors</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
       <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation>Propellers free? Then throttle up gently. Working properly?</translation>
+      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
       <source>Mission</source>
-      <translation>Mission</translation>
+      <translation type="unfinished">Mission</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
       <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation>Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
+      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
       <source>Last preparations before launch</source>
-      <translation>Last preparations before launch</translation>
+      <translation type="unfinished">Last preparations before launch</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
       <source>Payload</source>
-      <translation>Payload</translation>
+      <translation type="unfinished">Payload</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
       <source>Configured and started? Payload lid closed?</source>
-      <translation>Configured and started? Payload lid closed?</translation>
+      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
       <source>OK for your platform? Lauching into the wind?</source>
-      <translation>OK for your platform? Lauching into the wind?</translation>
+      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
       <source>Flight area</source>
-      <translation>Flight area</translation>
+      <translation type="unfinished">Flight area</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
       <source>Launch area and path free of obstacles/people?</source>
-      <translation>Launch area and path free of obstacles/people?</translation>
+      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
     </message>
   </context>
   <context>
@@ -17719,12 +17719,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="25"/>
       <source>VTOL Landing</source>
-      <translation>VTOL Landing</translation>
+      <translation type="unfinished">VTOL Landing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="92"/>
       <source>%1 complex item version %2 not supported</source>
-      <translation>%1 complex item version %2 not supported</translation>
+      <translation type="unfinished">%1 complex item version %2 not supported</translation>
     </message>
   </context>
   <context>
@@ -17732,98 +17732,98 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="40"/>
       <source>Set to vehicle heading</source>
-      <translation>Set to vehicle heading</translation>
+      <translation type="unfinished">Set to vehicle heading</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="41"/>
       <source>Set to vehicle location</source>
-      <translation>Set to vehicle location</translation>
+      <translation type="unfinished">Set to vehicle location</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="58"/>
       <source>Final approach</source>
-      <translation>Final approach</translation>
+      <translation type="unfinished">Final approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="70"/>
       <source>Use loiter to altitude</source>
-      <translation>Use loiter to altitude</translation>
+      <translation type="unfinished">Use loiter to altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="79"/>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="141"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="88"/>
       <source>Radius</source>
-      <translation>Radius</translation>
+      <translation type="unfinished">Radius</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="102"/>
       <source>Loiter clockwise</source>
-      <translation>Loiter clockwise</translation>
+      <translation type="unfinished">Loiter clockwise</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="118"/>
       <source>Landing point</source>
-      <translation>Landing point</translation>
+      <translation type="unfinished">Landing point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="134"/>
       <source>Heading</source>
-      <translation>Heading</translation>
+      <translation type="unfinished">Heading</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="149"/>
       <source>Landing Dist</source>
-      <translation>Landing Dist</translation>
+      <translation type="unfinished">Landing Dist</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="169"/>
       <source>Altitudes relative to launch</source>
-      <translation>Altitudes relative to launch</translation>
+      <translation type="unfinished">Altitudes relative to launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="179"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="217"/>
       <source>* Actual flight path will vary.</source>
-      <translation>* Actual flight path will vary.</translation>
+      <translation type="unfinished">* Actual flight path will vary.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="226"/>
       <source>* Avoid tailwind on approach to land.</source>
-      <translation>* Avoid tailwind on approach to land.</translation>
+      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="235"/>
       <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation>* Ensure landing distance is enough to complete transition.</translation>
+      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="261"/>
       <source>Click in map to set landing point.</source>
-      <translation>Click in map to set landing point.</translation>
+      <translation type="unfinished">Click in map to set landing point.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="268"/>
       <source>- or -</source>
-      <translation>- or -</translation>
+      <translation type="unfinished">- or -</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="300"/>
       <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
+      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="304"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
   </context>
   <context>
@@ -17831,17 +17831,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternMapVisual.qml" line="237"/>
       <source>Loiter</source>
-      <translation>Loiter</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternMapVisual.qml" line="237"/>
       <source>Approach</source>
-      <translation>Approach</translation>
+      <translation type="unfinished">Approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternMapVisual.qml" line="258"/>
       <source>Land</source>
-      <translation>Land</translation>
+      <translation type="unfinished">Land</translation>
     </message>
   </context>
   <context>
@@ -17849,47 +17849,47 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1775"/>
       <source>Mission transfer failed. Error: %1</source>
-      <translation>Mission transfer failed. Error: %1</translation>
+      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1781"/>
       <source>GeoFence transfer failed. Error: %1</source>
-      <translation>GeoFence transfer failed. Error: %1</translation>
+      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1787"/>
       <source>Rally Point transfer failed. Error: %1</source>
-      <translation>Rally Point transfer failed. Error: %1</translation>
+      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1056"/>
       <source>battery %1 level low</source>
-      <translation>battery %1 level low</translation>
+      <translation type="unfinished">battery %1 level low</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1062"/>
       <source>battery %1 level is critical</source>
-      <translation>battery %1 level is critical</translation>
+      <translation type="unfinished">battery %1 level is critical</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1068"/>
       <source>battery %1 level emergency</source>
-      <translation>battery %1 level emergency</translation>
+      <translation type="unfinished">battery %1 level emergency</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1074"/>
       <source>battery %1 failed</source>
-      <translation>battery %1 failed</translation>
+      <translation type="unfinished">battery %1 failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1080"/>
       <source>battery %1 unhealthy</source>
-      <translation>battery %1 unhealthy</translation>
+      <translation type="unfinished">battery %1 unhealthy</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1092"/>
       <source>warning</source>
-      <translation>warning</translation>
+      <translation type="unfinished">warning</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="3711"/>
@@ -17929,27 +17929,27 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2008"/>
       <source>Vehicle %1 </source>
-      <translation>Vehicle %1 </translation>
+      <translation type="unfinished">Vehicle %1 </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="3083"/>
       <source>Vehicle reboot failed.</source>
-      <translation>Vehicle reboot failed.</translation>
+      <translation type="unfinished">Vehicle reboot failed.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2016"/>
       <source>%1 %2 flight mode</source>
-      <translation>%1 %2 flight mode</translation>
+      <translation type="unfinished">%1 %2 flight mode</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2022"/>
       <source>armed</source>
-      <translation>armed</translation>
+      <translation type="unfinished">armed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2022"/>
       <source>disarmed</source>
-      <translation>disarmed</translation>
+      <translation type="unfinished">disarmed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2311"/>
@@ -17959,47 +17959,47 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Unable to send command: %1.</source>
-      <translation>Unable to send command: %1.</translation>
+      <translation type="unfinished">Unable to send command: %1.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation>Internal error - MAV_COMP_ID_ALL not supported</translation>
+      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Waiting on previous response to same command.</source>
-      <translation>Waiting on previous response to same command.</translation>
+      <translation type="unfinished">Waiting on previous response to same command.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2719"/>
       <source>Vehicle did not respond to command: %1</source>
-      <translation>Vehicle did not respond to command: %1</translation>
+      <translation type="unfinished">Vehicle did not respond to command: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2853"/>
       <source>Bootloader flash succeeded</source>
-      <translation>Bootloader flash succeeded</translation>
+      <translation type="unfinished">Bootloader flash succeeded</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2807"/>
       <source>%1 command temporarily rejected</source>
-      <translation>%1 command temporarily rejected</translation>
+      <translation type="unfinished">%1 command temporarily rejected</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2810"/>
       <source>%1 command denied</source>
-      <translation>%1 command denied</translation>
+      <translation type="unfinished">%1 command denied</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2813"/>
       <source>%1 command not supported</source>
-      <translation>%1 command not supported</translation>
+      <translation type="unfinished">%1 command not supported</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2816"/>
       <source>%1 command failed</source>
-      <translation>%1 command failed</translation>
+      <translation type="unfinished">%1 command failed</translation>
     </message>
   </context>
   <context>
@@ -18007,42 +18007,42 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="203"/>
       <source>Airship</source>
-      <translation>Airship</translation>
+      <translation type="unfinished">Airship</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="205"/>
       <source>Fixed Wing</source>
-      <translation>Fixed Wing</translation>
+      <translation type="unfinished">Fixed Wing</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="207"/>
       <source>Rover-Boat</source>
-      <translation>Rover-Boat</translation>
+      <translation type="unfinished">Rover-Boat</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="209"/>
       <source>Sub</source>
-      <translation>Sub</translation>
+      <translation type="unfinished">Sub</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="211"/>
       <source>Multi-Rotor</source>
-      <translation>Multi-Rotor</translation>
+      <translation type="unfinished">Multi-Rotor</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="213"/>
       <source>VTOL</source>
-      <translation>VTOL</translation>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="215"/>
       <source>Generic</source>
-      <translation>Generic</translation>
+      <translation type="unfinished">Generic</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="217"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
   </context>
   <context>
@@ -18050,49 +18050,49 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <source>%1Communication regained on %2 link</source>
-      <translation>%1Communication regained on %2 link</translation>
+      <translation type="unfinished">%1Communication regained on %2 link</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>primary</source>
-      <translation>primary</translation>
+      <translation type="unfinished">primary</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>secondary</source>
-      <translation>secondary</translation>
+      <translation type="unfinished">secondary</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="77"/>
       <source>%1Communication regained</source>
-      <translation>%1Communication regained</translation>
+      <translation type="unfinished">%1Communication regained</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="83"/>
       <source>%1Switching communication to new primary link</source>
-      <translation>%1Switching communication to new primary link</translation>
+      <translation type="unfinished">%1Switching communication to new primary link</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>%1Communication lost on %2 link.</source>
-      <translation>%1Communication lost on %2 link.</translation>
+      <translation type="unfinished">%1Communication lost on %2 link.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="142"/>
       <source>%1Switching communication to secondary link.</source>
-      <translation>%1Switching communication to secondary link.</translation>
+      <translation type="unfinished">%1Switching communication to secondary link.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="166"/>
       <source>%1Communication lost</source>
-      <translation>%1Communication lost</translation>
+      <translation type="unfinished">%1Communication lost</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="418"/>
       <source>Comm Lost</source>
-      <translation>Comm Lost</translation>
+      <translation type="unfinished">Comm Lost</translation>
     </message>
   </context>
   <context>
@@ -18100,7 +18100,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightMap/MapItems/VehicleMapItem.qml" line="147"/>
       <source>Vehicle %1</source>
-      <translation>Vehicle %1</translation>
+      <translation type="unfinished">Vehicle %1</translation>
     </message>
   </context>
   <context>
@@ -18121,17 +18121,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VehicleRotationCal.qml" line="25"/>
       <source>Hold Still</source>
-      <translation>Hold Still</translation>
+      <translation type="unfinished">Hold Still</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VehicleRotationCal.qml" line="57"/>
       <source>Completed</source>
-      <translation>Completed</translation>
+      <translation type="unfinished">Completed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VehicleRotationCal.qml" line="57"/>
       <source>Incomplete</source>
-      <translation>Incomplete</translation>
+      <translation type="unfinished">Incomplete</translation>
     </message>
   </context>
   <context>
@@ -18139,12 +18139,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/VehicleSummary.qml" line="88"/>
       <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
+      <translation type="unfinished">Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/VehicleSummary.qml" line="89"/>
       <source>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</source>
-      <translation>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
+      <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
     </message>
   </context>
   <context>
@@ -18152,12 +18152,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
       <source>No GPS Lock for Vehicle</source>
-      <translation>No GPS Lock for Vehicle</translation>
+      <translation type="unfinished">No GPS Lock for Vehicle</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
       <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
-      <translation>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
+      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
     </message>
   </context>
   <context>
@@ -18165,7 +18165,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
       <source>Analyze vibration associated with your vehicle.</source>
-      <translation>Analyze vibration associated with your vehicle.</translation>
+      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="98"/>
@@ -18200,12 +18200,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="198"/>
       <source>Clip count</source>
-      <translation>Clip count</translation>
+      <translation type="unfinished">Clip count</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="224"/>
       <source>Not Available</source>
-      <translation>Not Available</translation>
+      <translation type="unfinished">Not Available</translation>
     </message>
   </context>
   <context>
@@ -18213,12 +18213,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/VideoManager/VideoManager.cc" line="170"/>
       <source>Invalid video format defined.</source>
-      <translation>Invalid video format defined.</translation>
+      <translation type="unfinished">Invalid video format defined.</translation>
     </message>
     <message>
       <location filename="../src/VideoManager/VideoManager.cc" line="178"/>
       <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation>Unabled to record video. Video save path must be specified in Settings.</translation>
+      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
     </message>
   </context>
   <context>
@@ -18226,32 +18226,32 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="55"/>
       <source>No Video Available</source>
-      <translation>No Video Available</translation>
+      <translation type="unfinished">No Video Available</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="56"/>
       <source>Video Stream Disabled</source>
-      <translation>Video Stream Disabled</translation>
+      <translation type="unfinished">Video Stream Disabled</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="57"/>
       <source>RTSP Video Stream</source>
-      <translation>RTSP Video Stream</translation>
+      <translation type="unfinished">RTSP Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="58"/>
       <source>UDP h.264 Video Stream</source>
-      <translation>UDP h.264 Video Stream</translation>
+      <translation type="unfinished">UDP h.264 Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="59"/>
       <source>UDP h.265 Video Stream</source>
-      <translation>UDP h.265 Video Stream</translation>
+      <translation type="unfinished">UDP h.265 Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="60"/>
       <source>TCP-MPEG2 Video Stream</source>
-      <translation>TCP-MPEG2 Video Stream</translation>
+      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="61"/>
@@ -18261,17 +18261,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="62"/>
       <source>3DR Solo (requires restart)</source>
-      <translation>3DR Solo (requires restart)</translation>
+      <translation type="unfinished">3DR Solo (requires restart)</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="63"/>
       <source>Parrot Discovery</source>
-      <translation>Parrot Discovery</translation>
+      <translation type="unfinished">Parrot Discovery</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="64"/>
       <source>Yuneec Mantis G</source>
-      <translation>Yuneec Mantis G</translation>
+      <translation type="unfinished">Yuneec Mantis G</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="65"/>
diff --git a/translations/qgc_source_uk_UA.ts b/translations/qgc_source_uk_UA.ts
index 87fe47cf4b88..2fcdc37ef8c5 100644
--- a/translations/qgc_source_uk_UA.ts
+++ b/translations/qgc_source_uk_UA.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_source_zh_CN.ts b/translations/qgc_source_zh_CN.ts
index 4fad8e4e86b6..33e5dec0cd7a 100644
--- a/translations/qgc_source_zh_CN.ts
+++ b/translations/qgc_source_zh_CN.ts
@@ -27,7 +27,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
       <source> To change this configuration, select the desired frame class below and then reboot the vehicle.</source>
-      <translation> 要更改此配置，请在下方选择所需的帧类，然后重启载具。</translation>
+      <translation type="unfinished"> To change this configuration, select the desired frame class below and then reboot the vehicle.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
@@ -99,12 +99,12 @@
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="30"/>
       <source>- disabled</source>
-      <translation>- 已禁用</translation>
+      <translation>禁用</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="34"/>
       <source>Low Voltage Failsafe</source>
-      <translation>低电压故障安全</translation>
+      <translation>低电压故障保护</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="38"/>
@@ -116,13 +116,13 @@
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="45"/>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="75"/>
       <source>Voltage Trigger</source>
-      <translation>电压（V）触发器</translation>
+      <translation>电压触发器</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="54"/>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="84"/>
       <source>mAh Trigger</source>
-      <translation>电量（mAh）触发器</translation>
+      <translation>mAh 触发器</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMBatteryIndicator.qml" line="64"/>
@@ -318,22 +318,22 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="197"/>
       <source>Channel 15</source>
-      <translation>通道15</translation>
+      <translation type="unfinished">Channel 15</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="198"/>
       <source>Channel 16</source>
-      <translation>通道16</translation>
+      <translation type="unfinished">Channel 16</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="203"/>
       <source>Show all settings (advanced)</source>
-      <translation>显示所有设置(高级)</translation>
+      <translation type="unfinished">Show all settings (advanced)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="208"/>
       <source>Camera mount tilt speed:</source>
-      <translation>相机挂载倾斜速度：</translation>
+      <translation type="unfinished">Camera mount tilt speed:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="290"/>
@@ -443,7 +443,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="84"/>
       <source>Loiter</source>
-      <translation>盘旋</translation>
+      <translation>悬停</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="85"/>
@@ -458,7 +458,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="87"/>
       <source>Land</source>
-      <translation>降落</translation>
+      <translation>着陆</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="88"/>
@@ -473,7 +473,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="90"/>
       <source>Flip</source>
-      <translation>翻转</translation>
+      <translation>翻滚</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="91"/>
@@ -483,7 +483,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="92"/>
       <source>Position Hold</source>
-      <translation>位置保持</translation>
+      <translation>保持位置</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="93"/>
@@ -518,7 +518,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="99"/>
       <source>Follow</source>
-      <translation>追踪模式</translation>
+      <translation>跟随</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="100"/>
@@ -543,7 +543,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.h" line="104"/>
       <source>Turtle</source>
-      <translation>乌龟模式</translation>
+      <translation>海龟模式</translation>
     </message>
   </context>
   <context>
@@ -551,7 +551,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.h" line="102"/>
       <source>Guided</source>
-      <translation>引导模式</translation>
+      <translation>引导</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.h" line="103"/>
@@ -584,12 +584,12 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="857"/>
       <source>Unable to pause vehicle.</source>
-      <translation>Unable to pause vehicle.</translation>
+      <translation type="unfinished">Unable to pause vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="933"/>
       <source>Vehicle does not support guided rotate</source>
-      <translation>载具不支持引导模式下旋转</translation>
+      <translation type="unfinished">Vehicle does not support guided rotate</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="987"/>
@@ -648,22 +648,22 @@
     <message>
       <location filename="../src/UI/toolbar/APMFlightModeIndicator.qml" line="33"/>
       <source>Return to Launch</source>
-      <translation>返回起飞点</translation>
+      <translation type="unfinished">Return to Launch</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMFlightModeIndicator.qml" line="46"/>
       <source>Return At</source>
-      <translation>返回于</translation>
+      <translation type="unfinished">Return At</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMFlightModeIndicator.qml" line="52"/>
       <source>Current alttiude</source>
-      <translation>当前高度</translation>
+      <translation type="unfinished">Current alttiude</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMFlightModeIndicator.qml" line="52"/>
       <source>Specified altitude</source>
-      <translation>指定高度</translation>
+      <translation type="unfinished">Specified altitude</translation>
     </message>
   </context>
   <context>
@@ -840,7 +840,7 @@
     <message>
       <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>跟随模式的载具参数设置不支持。使用此设置可能将导致不可预测或危险的结果。</translation>
+      <translation>跟随模式的车辆参数设置不支持。使用此设置可能将导致不可预测或危险的结果。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
@@ -865,7 +865,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
       <source>Point Vehicle</source>
-      <translation>载具点</translation>
+      <translation>点式车辆</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
@@ -885,7 +885,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
       <source>Vehicle Offsets</source>
-      <translation>载具补偿值</translation>
+      <translation>车辆补偿值</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
@@ -915,7 +915,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.h" line="34"/>
       <source>Follow Me</source>
-      <translation>跟随我</translation>
+      <translation type="unfinished">Follow Me</translation>
     </message>
   </context>
   <context>
@@ -923,12 +923,12 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="29"/>
       <source>Follow Enabled</source>
-      <translation>跟随启用</translation>
+      <translation type="unfinished">Follow Enabled</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="30"/>
       <source>Follow System ID</source>
-      <translation>跟随系统ID</translation>
+      <translation type="unfinished">Follow System ID</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="31"/>
@@ -1210,7 +1210,7 @@
     <message>
       <location filename="../src/UI/toolbar/APMMainStatusIndicatorContentItem.qml" line="32"/>
       <source>Vehicle Action</source>
-      <translation>载具动作</translation>
+      <translation type="unfinished">Vehicle Action</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/APMMainStatusIndicatorContentItem.qml" line="40"/>
@@ -1244,7 +1244,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="67"/>
       <source>Manual</source>
-      <translation>手动</translation>
+      <translation type="unfinished">Manual</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="68"/>
@@ -1299,7 +1299,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="78"/>
       <source>Loiter</source>
-      <translation>盘旋</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="79"/>
@@ -1309,7 +1309,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="80"/>
       <source>Avoid ADSB</source>
-      <translation>关闭ADSB</translation>
+      <translation type="unfinished">Avoid ADSB</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="81"/>
@@ -1334,7 +1334,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="85"/>
       <source>QuadPlane Loiter</source>
-      <translation>旋翼固定翼复合机盘旋</translation>
+      <translation type="unfinished">QuadPlane Loiter</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="86"/>
@@ -1364,7 +1364,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="91"/>
       <source>Loiter to QLand</source>
-      <translation>盘旋至指定点着陆</translation>
+      <translation type="unfinished">Loiter to QLand</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.h" line="92"/>
@@ -1445,7 +1445,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
       <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation>- 将播放解锁提示音(如果载具有蜂鸣器)</translation>
+      <translation>解锁的声音将会播放（如果设备有接蜂鸣器的话）</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
@@ -1558,7 +1558,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="510"/>
       <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>如果载具所报告的电流与使用电流表的电流读数有较大偏差的话，你可以调整“安培/伏特”的值来修正它。点击“计算”按钮可以帮助你计算新的参数值。</translation>
+      <translation>如果飞机所报告的电流与使用电流表的电流读数有较大偏差的话，你可以调整“安培/伏特”的值来修正它。点击“计算”按钮可以帮助你计算新的参数值。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
@@ -1578,7 +1578,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="530"/>
       <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>如果飞行器在电流很小或为零时却报告有高电流读数，那就调整电流偏移量。该偏移量应等于电流为零时传感器所报告的电压值。 </translation>
+      <translation>若车辆没有电流通过而传感器读数过高，请调整电流补偿。此值应等于零电流时传感器报告的电压值。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="554"/>
@@ -1735,7 +1735,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="58"/>
       <source>Manual</source>
-      <translation>手动</translation>
+      <translation type="unfinished">Manual</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="59"/>
@@ -1760,7 +1760,7 @@
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="63"/>
       <source>Loiter</source>
-      <translation>盘旋</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h" line="64"/>
@@ -1980,7 +1980,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="605"/>
       <source>Loiter above Home for:</source>
-      <translation>在Home点上方盘旋：</translation>
+      <translation>在Home点上方留待：</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="623"/>
@@ -2000,7 +2000,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="755"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>警告：关闭解锁检查有可能导致载具失控。</translation>
+      <translation>警告：关闭解锁检查有可能导致飞机失控</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.h" line="34"/>
@@ -2147,7 +2147,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="471"/>
       <source>Loiter above Home for:</source>
-      <translation>在HOME点上方盘旋：</translation>
+      <translation>在HOME点上方留待：</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="490"/>
@@ -2157,7 +2157,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="511"/>
       <source>Final loiter altitude:</source>
-      <translation>最终盘旋高度：</translation>
+      <translation>最终留待高度：</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="533"/>
@@ -2167,7 +2167,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="564"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>警告：关闭解锁检查有可能导致载具失控。</translation>
+      <translation>警告：关闭解锁检查有可能导致飞机失控。</translation>
     </message>
   </context>
   <context>
@@ -2263,7 +2263,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="173"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>警告：关闭解锁检查有可能导致载具失控。</translation>
+      <translation>警告：关闭解锁检查有可能导致飞机失控</translation>
     </message>
   </context>
   <context>
@@ -2291,7 +2291,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
       <source>Logic when Dry:</source>
-      <translation>Logic when Dry:</translation>
+      <translation type="unfinished">Logic when Dry:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
@@ -2301,17 +2301,17 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="177"/>
       <source>Power module not set up</source>
-      <translation>电源模块未配置</translation>
+      <translation type="unfinished">Power module not set up</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="185"/>
       <source>Voltage:</source>
-      <translation>Voltage:</translation>
+      <translation type="unfinished">Voltage:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="199"/>
       <source>Remaining Capacity:</source>
-      <translation>Remaining Capacity:</translation>
+      <translation type="unfinished">Remaining Capacity:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="221"/>
@@ -2326,7 +2326,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="267"/>
       <source>Timeout:</source>
-      <translation>Timeout:</translation>
+      <translation type="unfinished">Timeout:</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="290"/>
@@ -2352,7 +2352,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="387"/>
       <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation>警告：关闭解锁检查有可能导致载具失控。</translation>
+      <translation>警告：关闭解锁检查有可能导致飞机失控</translation>
     </message>
   </context>
   <context>
@@ -2731,22 +2731,22 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
       <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation>要校准罗盘，你需要在几个不同的位置旋转你的载具。</translation>
+      <translation>要校准罗盘，你需要在几个不同的位置旋转你的飞机。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
       <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation>要校准陀螺仪，你需要将你的载具放在平面上，并保持静止。</translation>
+      <translation>要校准陀螺仪，你需要将你的飞机放在平面上，并保持静止。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
       <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation>要校准加速度计，你需要将你的载具6个面分别置于水平位置上，并静止数秒。</translation>
+      <translation>要校准加速度计，你需要将你的飞机6个面分别置于水平位置上，并静止数秒。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation>要校平地平线，你需要将载具置于水平位置，然后点OK。</translation>
+      <translation>要校平地平线，你需要将飞机置于平飞位置，然后点OK。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
@@ -2761,7 +2761,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
       <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation>请检查你载具内的罗盘位置，然后重做校准。</translation>
+      <translation>请检查你飞机内的罗盘位置，然后重做校准。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="99"/>
@@ -2794,7 +2794,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="189"/>
       <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation>等待载具响应以取消。这可能需要几秒钟。</translation>
+      <translation>等待飞机响应以取消。这可能需要几秒钟。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="127"/>
@@ -2828,7 +2828,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="136"/>
       <source>, </source>
-      <translation>, </translation>
+      <translation type="unfinished">, </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="138"/>
@@ -2867,7 +2867,7 @@
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="292"/>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="321"/>
       <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation>每次校准后，您必须重新启动载具。</translation>
+      <translation>每次校准后，您必须重新启动飞机！</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="296"/>
@@ -2908,42 +2908,42 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="476"/>
       <source>Simple accelerometer calibration is less precise but allows calibrating without rotating the vehicle. Check this if you have a large/heavy vehicle.</source>
-      <translation>简单加速度计校准精度较低，但无需旋转载具即可完成校准。如果你拥有大型/重型飞行器，可勾选此项。</translation>
+      <translation type="unfinished">Simple accelerometer calibration is less precise but allows calibrating without rotating the vehicle. Check this if you have a large/heavy vehicle.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="494"/>
       <source>Magnetic Declination</source>
-      <translation>Magnetic Declination</translation>
+      <translation type="unfinished">Magnetic Declination</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="506"/>
       <source>Manual Magnetic Declination</source>
-      <translation>手动设置磁偏角</translation>
+      <translation type="unfinished">Manual Magnetic Declination</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="528"/>
       <source>Fast compass calibration given vehicle position and yaw. This </source>
-      <translation>根据载具位置和偏航角快速校准罗盘。 </translation>
+      <translation type="unfinished">Fast compass calibration given vehicle position and yaw. This </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="529"/>
       <source>results in zero diagonal and off-diagonal elements, so is only </source>
-      <translation>会导致对角线和非对角线元素为零，因此仅 </translation>
+      <translation type="unfinished">results in zero diagonal and off-diagonal elements, so is only </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
       <source>suitable for vehicles where the field is close to spherical. It is </source>
-      <translation>适用于磁场接近球形的载具。  </translation>
+      <translation type="unfinished">suitable for vehicles where the field is close to spherical. It is </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="531"/>
       <source>useful for large vehicles where moving the vehicle to calibrate it </source>
-      <translation>对于难以移动载具进行校准的大型载具，它很有用。 </translation>
+      <translation type="unfinished">useful for large vehicles where moving the vehicle to calibrate it </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="532"/>
       <source>is difficult. Point the vehicle North before using it.</source>
-      <translation>在使用前将载具朝向北方。</translation>
+      <translation type="unfinished">is difficult. Point the vehicle North before using it.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="545"/>
@@ -2953,7 +2953,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="553"/>
       <source>Vehicle has no Valid positon, please provide it</source>
-      <translation>飞行器没有有效位置，请提供位置信息。</translation>
+      <translation type="unfinished">Vehicle has no Valid positon, please provide it</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="559"/>
@@ -2978,7 +2978,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="612"/>
       <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation>推荐在载具上只装了一个内置罗盘，而且特别容易被电机、电源线等干扰的的情况下，采取这种措施。 </translation>
+      <translation>推荐在飞机上只装了一个内置罗盘，而且特别容易被电机、电源线等干扰的的情况下，采取这种措施。 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="613"/>
@@ -3018,7 +3018,7 @@
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="700"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation>要校平地平线，你需要将载具置于水平位置，然后点OK。</translation>
+      <translation>要校平地平线，你需要将飞机置于平飞位置，然后点OK。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="725"/>
@@ -3045,9 +3045,9 @@
       <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
 
 Click Ok to start calibration.</source>
-      <translation>要校准陀螺仪，你需要将你的载具放在平面上，并保持静止。
+      <translation>要校准陀螺仪，你需要将你的飞机放在平面上，并保持静止。
 
-点击“Ok”开始校准。</translation>
+点击“OK”开始校准。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="666"/>
@@ -3072,7 +3072,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="697"/>
       <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation>加速度计必须在载具校平地平线之前校准。</translation>
+      <translation>加速度计必须在飞机校平地平线之前校准。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="709"/>
@@ -3137,7 +3137,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.h" line="27"/>
       <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation>传感器设置，用于校准你的载具内的传感器。</translation>
+      <translation>传感器设置，用于校准你的飞机内的传感器。</translation>
     </message>
   </context>
   <context>
@@ -3155,7 +3155,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="222"/>
       <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation>在每个轴向上随机旋转载具，一直到进度条完全填满。</translation>
+      <translation>在每个轴向上随机旋转飞机，一直到进度条完全填满。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="329"/>
@@ -3175,7 +3175,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="340"/>
       <source>Hold the vehicle in its level flight position.</source>
-      <translation>将载具保持在其水平飞行位置。</translation>
+      <translation>将飞机保持在其水平飞行位置。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
@@ -3227,7 +3227,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="567"/>
       <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation>您现在必须重新启动您的载具，才能使新的设置生效</translation>
+      <translation>您现在必须重新启动您的飞机，才能使新的设置生效！</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="570"/>
@@ -3237,7 +3237,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="571"/>
       <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation>您现在必须重新启动您的载具，并在飞行前重试罗盘校准</translation>
+      <translation>您现在必须重新启动您的飞机，并在飞行前重试罗盘校准！</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="575"/>
@@ -3266,12 +3266,12 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="73"/>
       <source>Accelerometer(s):</source>
-      <translation>加速计：</translation>
+      <translation type="unfinished">Accelerometer(s):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="86"/>
       <source>Barometer(s):</source>
-      <translation>气压计：</translation>
+      <translation type="unfinished">Barometer(s):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="87"/>
@@ -3294,12 +3294,12 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.h" line="24"/>
       <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
+      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="202"/>
       <source>Frame selection</source>
-      <translation>Frame selection</translation>
+      <translation type="unfinished">Frame selection</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="211"/>
@@ -3314,17 +3314,17 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="218"/>
       <source>Yes, Load default parameter set for %1</source>
-      <translation>Yes, Load default parameter set for %1</translation>
+      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="231"/>
       <source>No, set frame only</source>
-      <translation>No, set frame only</translation>
+      <translation type="unfinished">No, set frame only</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="232"/>
       <source>Confirm frame %1</source>
-      <translation>Confirm frame %1</translation>
+      <translation type="unfinished">Confirm frame %1</translation>
     </message>
   </context>
   <context>
@@ -3356,7 +3356,7 @@ Click Ok to start calibration.</source>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="125"/>
       <source>Manual</source>
-      <translation>手动</translation>
+      <translation type="unfinished">Manual</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h" line="126"/>
@@ -3470,7 +3470,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.h" line="24"/>
       <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation>调试设置，用于调整载具的飞行特性。</translation>
+      <translation>调试设置，用于调整飞机的飞行特性。</translation>
     </message>
   </context>
   <context>
@@ -3699,27 +3699,27 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorActions.cc" line="18"/>
       <source>Beep</source>
-      <translation>蜂鸣声</translation>
+      <translation type="unfinished">Beep</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorActions.cc" line="19"/>
       <source>3D mode: On</source>
-      <translation>3D模式：开</translation>
+      <translation type="unfinished">3D mode: On</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorActions.cc" line="20"/>
       <source>3D mode: Off</source>
-      <translation>3D模式：关</translation>
+      <translation type="unfinished">3D mode: Off</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorActions.cc" line="21"/>
       <source>Set Spin Direction 1</source>
-      <translation>设置旋转方向 1</translation>
+      <translation type="unfinished">Set Spin Direction 1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorActions.cc" line="22"/>
       <source>Set Spin Direction 2</source>
-      <translation>设置旋转方向 2</translation>
+      <translation type="unfinished">Set Spin Direction 2</translation>
     </message>
   </context>
   <context>
@@ -3727,7 +3727,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorActions.cc" line="54"/>
       <source>Actuator action command failed</source>
-      <translation>执行器动作命令失败</translation>
+      <translation type="unfinished">Actuator action command failed</translation>
     </message>
   </context>
   <context>
@@ -3811,27 +3811,27 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorTesting.cc" line="49"/>
       <source>All Motors</source>
-      <translation>所有电机</translation>
+      <translation type="unfinished">All Motors</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorTesting.cc" line="148"/>
       <source>Actuator test command temporarily rejected</source>
-      <translation>执行器测试命令暂时被拒绝</translation>
+      <translation type="unfinished">Actuator test command temporarily rejected</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorTesting.cc" line="150"/>
       <source>Actuator test command denied</source>
-      <translation>执行器测试命令被拒绝</translation>
+      <translation type="unfinished">Actuator test command denied</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorTesting.cc" line="152"/>
       <source>Actuator test command not supported</source>
-      <translation>执行器测试命令不支持</translation>
+      <translation type="unfinished">Actuator test command not supported</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/ActuatorTesting.cc" line="154"/>
       <source>Actuator test command failed</source>
-      <translation>执行器测试命令失败</translation>
+      <translation type="unfinished">Actuator test command failed</translation>
     </message>
   </context>
   <context>
@@ -3885,7 +3885,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="44"/>
       <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation>您的载具正在使用自定义机身配置。 </translation>
+      <translation>您的飞机正在使用自定义机身配置。 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
@@ -3908,7 +3908,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="121"/>
       <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>单击 &apos;应用 &apos;将保存您对机身配置所做的更改。&lt;br&gt;&lt;br&gt;                                                        除无线电校准之外的所有载具参数都将被重置。&lt;br&gt;&lt;br&gt;                                                                          您的载具也将重新启动以完成该过程。</translation>
+      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;                                                                        All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;                                                                        Your vehicle will also be restarted in order to complete the process.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="111"/>
@@ -3947,7 +3947,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="89"/>
       <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation>你不能在同时连接多部载具时，改变机身配置。</translation>
+      <translation>你不能在同时连接多部飞机时，改变机身配置。</translation>
     </message>
   </context>
   <context>
@@ -3971,7 +3971,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
@@ -4002,115 +4002,115 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
       <source>Select Altitude Mode</source>
-      <translation>Select Altitude Mode</translation>
+      <translation type="unfinished">Select Altitude Mode</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="51"/>
       <source>Relative To Launch</source>
-      <translation>Relative To Launch</translation>
+      <translation type="unfinished">Relative To Launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
       <source>Specified altitudes are relative to launch position height.</source>
-      <translation>Specified altitudes are relative to launch position height.</translation>
+      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="56"/>
       <source>AMSL</source>
-      <translation>AMSL</translation>
+      <translation type="unfinished">AMSL</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
       <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation>Specified altitudes are Above Mean Sea Level.</translation>
+      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="61"/>
       <source>Calculated Above Terrain</source>
-      <translation>Calculated Above Terrain</translation>
+      <translation type="unfinished">Calculated Above Terrain</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
       <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
+      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="66"/>
       <source>Terrain Frame</source>
-      <translation>Terrain Frame</translation>
+      <translation type="unfinished">Terrain Frame</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
       <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
+      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="71"/>
       <source>Mixed Modes</source>
-      <translation>Mixed Modes</translation>
+      <translation type="unfinished">Mixed Modes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/AltModeDialog.qml" line="72"/>
       <source>The altitude mode can differ for each individual item.</source>
-      <translation>The altitude mode can differ for each individual item.</translation>
+      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
-      <translation>GStreamer Debug Level</translation>
+      <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
-      <translation>Logging categories</translation>
+      <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
-      <translation>搜索：</translation>
+      <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
-      <translation>清除</translation>
+      <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
-      <translation>清除全部</translation>
+      <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
-      <translation>日志文件(*.txt)</translation>
+      <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
-      <translation>所有文件 (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
-      <translation>选择日志保存文件</translation>
+      <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
-      <translation>保存应用日志</translation>
+      <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
-      <translation>显示最新</translation>
+      <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
-      <translation>设置日志记录</translation>
+      <translation type="unfinished">Set Logging</translation>
     </message>
   </context>
   <context>
@@ -4148,7 +4148,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.h" line="113"/>
       <source>CrashLogs</source>
-      <translation>CrashLogs</translation>
+      <translation type="unfinished">CrashLogs</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.h" line="114"/>
@@ -4158,22 +4158,22 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="117"/>
       <source>Save to SD card specified for application data. But no SD card present. Using internal storage.</source>
-      <translation>应用数据保存到指定 SD 卡。没有SD卡存在时，使用内部存储。</translation>
+      <translation type="unfinished">Save to SD card specified for application data. But no SD card present. Using internal storage.</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="120"/>
       <source>Save to SD card specified for application data. But SD card is write protected. Using internal storage.</source>
-      <translation>应用数据保存到指定 SD 卡。SD卡开启写保护时，使用内部存储。</translation>
+      <translation type="unfinished">Save to SD card specified for application data. But SD card is write protected. Using internal storage.</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="204"/>
       <source> (Partial)</source>
-      <translation> (Partial)</translation>
+      <translation type="unfinished"> (Partial)</translation>
     </message>
     <message>
       <location filename="../src/Settings/AppSettings.cc" line="212"/>
       <source> (Test Only)</source>
-      <translation> （仅测试）</translation>
+      <translation type="unfinished"> (Test Only)</translation>
     </message>
   </context>
   <context>
@@ -4212,7 +4212,7 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
       <source>One or more vehicle components require setup prior to flight.</source>
-      <translation>一个或多个载具组件需要在飞行前设置。</translation>
+      <translation>一个或多个飞机组件需要在飞行前设置。</translation>
     </message>
   </context>
   <context>
@@ -4220,72 +4220,72 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="31"/>
       <source>Autotune: In progress</source>
-      <translation>Autotune: In progress</translation>
+      <translation type="unfinished">Autotune: In progress</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="85"/>
       <source>Autotune: initializing</source>
-      <translation>Autotune: initializing</translation>
+      <translation type="unfinished">Autotune: initializing</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="88"/>
       <source>Autotune: roll</source>
-      <translation>Autotune: roll</translation>
+      <translation type="unfinished">Autotune: roll</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="91"/>
       <source>Autotune: pitch</source>
-      <translation>Autotune: pitch</translation>
+      <translation type="unfinished">Autotune: pitch</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="94"/>
       <source>Autotune: yaw</source>
-      <translation>Autotune: yaw</translation>
+      <translation type="unfinished">Autotune: yaw</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="97"/>
       <source>Wait for disarm</source>
-      <translation>等待加锁</translation>
+      <translation type="unfinished">Wait for disarm</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="100"/>
       <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation>为了适用这些参数，将载具降落并上锁。</translation>
+      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
       <source>Autotune: in progress</source>
-      <translation>Autotune: in progress</translation>
+      <translation type="unfinished">Autotune: in progress</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="112"/>
       <source>Autotune: Success</source>
-      <translation>Autotune: Success</translation>
+      <translation type="unfinished">Autotune: Success</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="114"/>
       <source>Autotune successful.</source>
-      <translation>Autotune successful.</translation>
+      <translation type="unfinished">Autotune successful.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
       <source>Autotune: Unknown error</source>
-      <translation>Autotune: Unknown error</translation>
+      <translation type="unfinished">Autotune: Unknown error</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="129"/>
       <source>Autotune: Failed</source>
-      <translation>Autotune: Failed</translation>
+      <translation type="unfinished">Autotune: Failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.cpp" line="139"/>
       <source>Autotune: Ack error %1</source>
-      <translation>Autotune: Ack error %1</translation>
+      <translation type="unfinished">Autotune: Ack error %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Autotune.h" line="56"/>
       <source>Autotune: Not performed</source>
-      <translation>Autotune: Not performed</translation>
+      <translation type="unfinished">Autotune: Not performed</translation>
     </message>
   </context>
   <context>
@@ -4308,16 +4308,17 @@ Before starting the auto-tuning process, make sure that:
 
 Click Ok to start the auto-tuning process.
 </source>
-      <translation>Display Video警告！
+      <translation type="unfinished">WARNING!        
 
-自动调参过程应谨慎执行，并且要求飞行器在尝试该过程之前飞行足够稳定！
+The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!         
 
-在开始自动调参过程之前，请确保：
-1. 您已阅读自动调参指南并已遵循初步步骤
-2. 当前控制增益足以在存在中等干扰的情况下稳定无人机
-3. 如果发生任何意外情况，您可以通过移动遥控器（RC）摇杆来中止自动调参过程序列。
+Before starting the auto-tuning process, make sure that:         
+1. You have read the auto-tuning guide and have followed the preliminary steps         
+2. The current control gains are good enough to stabilize the drone in presence of medium disturbances         
+3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens.         
 
-单击 “确定” 以启动自动调参过程。</translation>
+Click Ok to start the auto-tuning process.
+</translation>
     </message>
   </context>
   <context>
@@ -4345,7 +4346,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="224"/>
       <source>Battery %1</source>
-      <translation>Battery %1</translation>
+      <translation type="unfinished">Battery %1</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="224"/>
@@ -4361,7 +4362,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="244"/>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="250"/>
       <source>Remaining</source>
-      <translation>Remaining</translation>
+      <translation type="unfinished">Remaining</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="256"/>
@@ -4371,7 +4372,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="261"/>
       <source>Consumed</source>
-      <translation>Consumed</translation>
+      <translation type="unfinished">Consumed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="267"/>
@@ -4381,7 +4382,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="273"/>
       <source>Function</source>
-      <translation>Function</translation>
+      <translation type="unfinished">Function</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="291"/>
@@ -4411,7 +4412,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="406"/>
       <source>Vehicle Power</source>
-      <translation>载具功率</translation>
+      <translation type="unfinished">Vehicle Power</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/BatteryIndicator.qml" line="407"/>
@@ -4458,17 +4459,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="31"/>
       <source>Device</source>
-      <translation>Device</translation>
+      <translation type="unfinished">Device</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="37"/>
       <source>Address</source>
-      <translation>Address</translation>
+      <translation type="unfinished">Address</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="44"/>
       <source>Bluetooth Devices</source>
-      <translation>Bluetooth Devices</translation>
+      <translation type="unfinished">Bluetooth Devices</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/BluetoothSettings.qml" line="67"/>
@@ -4625,22 +4626,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="94"/>
       <source>Unable to put radio into command mode +++</source>
-      <translation>Unable to put radio into command mode +++</translation>
+      <translation type="unfinished">Unable to put radio into command mode +++</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="99"/>
       <source>Radio did not respond to command mode</source>
-      <translation>Radio did not respond to command mode</translation>
+      <translation type="unfinished">Radio did not respond to command mode</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="107"/>
       <source>Radio did not respond to ATI2 command</source>
-      <translation>Radio did not respond to ATI2 command</translation>
+      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="114"/>
       <source>Radio did not return board id</source>
-      <translation>Radio did not return board id</translation>
+      <translation type="unfinished">Radio did not return board id</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="131"/>
@@ -4650,7 +4651,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="167"/>
       <source>Unable to reboot radio (ready read)</source>
-      <translation>Unable to reboot radio (ready read)</translation>
+      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="183"/>
@@ -4660,7 +4661,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="321"/>
       <source>Get Device: </source>
-      <translation>Get Device: </translation>
+      <translation type="unfinished">Get Device: </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/Bootloader.cc" line="749"/>
@@ -4683,7 +4684,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/CameraCalc.cc" line="302"/>
       <source>Manual (no camera specs)</source>
-      <translation>手动 （无相机参数）</translation>
+      <translation>手动（无相机参数）</translation>
     </message>
   </context>
   <context>
@@ -4815,12 +4816,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
       <source>Follow Vehicle</source>
-      <translation>跟随载具</translation>
+      <translation>跟随飞机</translation>
     </message>
   </context>
   <context>
@@ -4848,7 +4849,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
@@ -4866,12 +4867,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/ComponentInformation/CompInfoParam.cc" line="135"/>
       <source>Component %1</source>
-      <translation>Component %1</translation>
+      <translation type="unfinished">Component %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/ComponentInformation/CompInfoParam.cc" line="270"/>
       <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation>Internal Error: Parameter MetaData major must be 1</translation>
+      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
     </message>
   </context>
   <context>
@@ -4893,7 +4894,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/ComponentInformation/ComponentInformationTranslation.cc" line="209"/>
       <source>File open failed: file:error %1 %2</source>
-      <translation>打开文件失败：文件:错误 %1 %2</translation>
+      <translation type="unfinished">File open failed: file:error %1 %2</translation>
     </message>
   </context>
   <context>
@@ -5122,7 +5123,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>请在这儿解锁载具</translation>
+      <translation>请在这儿解锁飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
@@ -5255,7 +5256,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
       <source>Bridge/Vehicle Link</source>
-      <translation>桥接/载具连接</translation>
+      <translation>桥梁/飞机连接</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
@@ -5459,12 +5460,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="286"/>
       <source>Invalid Nak format</source>
-      <translation>Invalid Nak format</translation>
+      <translation type="unfinished">Invalid Nak format</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="288"/>
       <source>errno %1</source>
-      <translation>errno %1</translation>
+      <translation type="unfinished">errno %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/FTPManager.cc" line="547"/>
@@ -5499,12 +5500,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="40"/>
       <source>Set to vehicle heading</source>
-      <translation>设置为载具的航向</translation>
+      <translation>设置为飞机的航向</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="41"/>
       <source>Set to vehicle location</source>
-      <translation>设置为载具位置</translation>
+      <translation>设置为飞机位置</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="97"/>
@@ -5566,17 +5567,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="58"/>
       <source>Final approach</source>
-      <translation>Final approach</translation>
+      <translation type="unfinished">Final approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="70"/>
       <source>Use loiter to altitude</source>
-      <translation>用盘旋模式保持高度</translation>
+      <translation type="unfinished">Use loiter to altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="181"/>
       <source>Distance</source>
-      <translation>Distance</translation>
+      <translation type="unfinished">Distance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternEditor.qml" line="268"/>
@@ -5609,12 +5610,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="278"/>
       <source>Loiter</source>
-      <translation>盘旋模式</translation>
+      <translation>悬停模式</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="278"/>
       <source>Approach</source>
-      <translation>Approach</translation>
+      <translation type="unfinished">Approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/FWLandingPatternMapVisual.qml" line="332"/>
@@ -5752,17 +5753,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="127"/>
       <source>PX4 Pro</source>
-      <translation>PX4 Pro</translation>
+      <translation type="unfinished">PX4 Pro</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="129"/>
       <source>ArduPilot</source>
-      <translation>ArduPilot</translation>
+      <translation type="unfinished">ArduPilot</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="131"/>
       <source>Generic</source>
-      <translation>Generic</translation>
+      <translation type="unfinished">Generic</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="133"/>
@@ -5795,7 +5796,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="225"/>
       <source>Firmware file missing required key: %1</source>
-      <translation>Firmware file missing required key: %1</translation>
+      <translation type="unfinished">Firmware file missing required key: %1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="235"/>
@@ -5835,7 +5836,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="331"/>
       <source>Write failed for decompressed image file, error: %1</source>
-      <translation>解压后的镜像文件写入失败，错误：%1</translation>
+      <translation>解压后的图像文件写入失败，错误：%1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareImage.cc" line="355"/>
@@ -5902,7 +5903,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="51"/>
       <source>All %1 connections to vehicles must be </source>
-      <translation>所有与载具的 %1 连接都必须 </translation>
+      <translation>所有与飞机的 %1 连接都必须 </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="229"/>
@@ -5957,7 +5958,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="50"/>
       <source>Also make sure you are only powered via USB </source>
-      <translation>请确保您仅通过 USB 供电 </translation>
+      <translation type="unfinished">Also make sure you are only powered via USB </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="50"/>
@@ -6064,7 +6065,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="279"/>
       <source>Press Ok to upgrade your vehicle.</source>
-      <translation>按“确定”升级您的载具。</translation>
+      <translation>按“确定”升级您的飞机。</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="346"/>
@@ -6139,7 +6140,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="399"/>
       <source>Follow the forums actively when using it.</source>
-      <translation>Follow the forums actively when using it.</translation>
+      <translation type="unfinished">Follow the forums actively when using it.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml" line="425"/>
@@ -6255,7 +6256,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>请在这儿解锁载具</translation>
+      <translation>请在这儿解锁飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
@@ -6328,7 +6329,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
       <source>Fixed Wing Landing</source>
-      <translation>Fixed Wing Landing</translation>
+      <translation type="unfinished">Fixed Wing Landing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="100"/>
@@ -6555,12 +6556,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="85"/>
       <source>Remove plan from vehicle</source>
-      <translation>从载具上移除飞行计划</translation>
+      <translation>从飞机上移除飞行计划</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="96"/>
       <source>Leave plan on vehicle</source>
-      <translation>在载具上保留飞行计划</translation>
+      <translation>在飞机上保留飞行计划</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="115"/>
@@ -6570,7 +6571,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="126"/>
       <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>恢复飞行任务将从上次飞行航点重建目前的飞行任务，并上传到载具供下次飞行。</translation>
+      <translation>恢复飞行任务将从上次飞行航点重建目前的飞行任务，并上载到飞机供下次飞行。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="134"/>
@@ -6583,7 +6584,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
       <source>Pre-Flight Checklist</source>
-      <translation>Pre-Flight Checklist</translation>
+      <translation type="unfinished">Pre-Flight Checklist</translation>
     </message>
   </context>
   <context>
@@ -6822,12 +6823,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="171"/>
       <source>Arm</source>
-      <translation>解锁</translation>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="180"/>
       <source>Disarm</source>
-      <translation>上锁</translation>
+      <translation type="unfinished">Disarm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/FlyViewTopRightPanel.qml" line="189"/>
@@ -6845,7 +6846,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="72"/>
       <source>Double-click to exit full screen</source>
-      <translation>Double-click to exit full screen</translation>
+      <translation type="unfinished">Double-click to exit full screen</translation>
     </message>
   </context>
   <context>
@@ -7068,7 +7069,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="125"/>
       <source>Accuracy (u-blox only)</source>
-      <translation>精准度(仅适用于u-blox)</translation>
+      <translation type="unfinished">Accuracy (u-blox only)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GPSIndicatorPage.qml" line="134"/>
@@ -7153,7 +7154,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="68"/>
       <source>Save application data to SD Card</source>
-      <translation>将应用程序数据保存到 SD 卡</translation>
+      <translation type="unfinished">Save application data to SD Card</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/GeneralSettings.qml" line="143"/>
@@ -7225,7 +7226,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="66"/>
       <source>This vehicle does not support GeoFence.</source>
-      <translation>这个载具不支持地理围栏。</translation>
+      <translation>这个飞机不支持地理围栏。</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/GeoFenceEditor.qml" line="116"/>
@@ -7391,7 +7392,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="22"/>
       <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
+      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="64"/>
@@ -7412,7 +7413,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="74"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/GeoTagPage.qml" line="91"/>
@@ -7679,7 +7680,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
       <source>Arm (MV)</source>
-      <translation>解锁（载具）</translation>
+      <translation type="unfinished">Arm (MV)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
@@ -7689,7 +7690,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
       <source>Disarm (MV)</source>
-      <translation>加锁（载具）</translation>
+      <translation type="unfinished">Disarm (MV)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
@@ -7764,7 +7765,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="79"/>
       <source>Return to the launch position of the vehicle.</source>
-      <translation>让载具回到出发点。</translation>
+      <translation>让飞机回到起飞点。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
@@ -7774,7 +7775,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
       <source>Force Arm</source>
-      <translation>强制解锁</translation>
+      <translation type="unfinished">Force Arm</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
@@ -7824,27 +7825,27 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
       <source>Arm the vehicle.</source>
-      <translation>解锁载具。</translation>
+      <translation>解锁飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
       <source>Arm selected vehicles.</source>
-      <translation>解锁选择的载具。</translation>
+      <translation type="unfinished">Arm selected vehicles.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
       <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation>WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
+      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
       <source>Disarm the vehicle</source>
-      <translation>载具加锁</translation>
+      <translation>飞机加锁</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
       <source>Disarm selected vehicles.</source>
-      <translation>解除选定的载具。</translation>
+      <translation type="unfinished">Disarm selected vehicles.</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
@@ -7884,12 +7885,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="78"/>
       <source>Land the vehicle at the current position.</source>
-      <translation>将载具降落在当前位置。</translation>
+      <translation>将飞机降落在当前位置。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="80"/>
       <source>Change the altitude of the vehicle up or down.</source>
-      <translation>将载具的高度升高或降低。</translation>
+      <translation>将飞机的高度升高或降低。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="81"/>
@@ -7909,7 +7910,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="84"/>
       <source>Move the vehicle to the specified location.</source>
-      <translation>将载具移动到指定位置。</translation>
+      <translation>将飞机移动到指定位置。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="85"/>
@@ -7919,7 +7920,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="86"/>
       <source>Orbit the vehicle around the specified location.</source>
-      <translation>使载具绕着指定位置盘旋。</translation>
+      <translation>使飞机绕着指定位置盘旋。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="87"/>
@@ -7929,7 +7930,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="88"/>
       <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation>将载具停在它的当前位置，根据需要上下调整高度。</translation>
+      <translation>将飞机停在它的当前位置，根据需要上下调整高度。</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="89"/>
@@ -7974,7 +7975,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="221"/>
       <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
+      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="232"/>
@@ -8081,7 +8082,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
       <source>Valuec requires a connected vehicle for setup.</source>
-      <translation>Valuec requires a connected vehicle for setup.</translation>
+      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="102"/>
@@ -8178,7 +8179,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/InstrumentValueValue.qml" line="46"/>
       <source>--.--</source>
-      <translation>--.--</translation>
+      <translation type="unfinished">--.--</translation>
     </message>
   </context>
   <context>
@@ -8359,8 +8360,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation>按钮分配</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -8451,7 +8452,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="49"/>
       <source> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</source>
-      <translation>将相同动作分配给多个按钮需要按下所有这些按钮才能进行操作。 这有助于防止对诸如解锁或紧急站等关键行动的意外按键按下。</translation>
+      <translation type="unfinished"> Multiple buttons that have the same action must be pressed simultaneously to invoke the action.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="99"/>
@@ -8482,7 +8483,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml" line="264"/>
       <source>No firmware support</source>
-      <translation>No firmware support</translation>
+      <translation type="unfinished">No firmware support</translation>
     </message>
   </context>
   <context>
@@ -8664,12 +8665,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MissionManager/LandingComplexItem.cc" line="709"/>
       <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation>%1 does not support loading this complex mission item type: %2:%3</translation>
+      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/LandingComplexItem.cc" line="729"/>
       <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation>固定翼着陆模式：不再支持使用不同的高度相对设置来设置盘旋高度和着陆高度。两者都已设置为相对高度。务必在飞行前 调整/检查 您的计划。</translation>
+      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
     </message>
   </context>
   <context>
@@ -8857,12 +8858,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="233"/>
       <source>Name</source>
-      <translation>Name</translation>
+      <translation type="unfinished">Name</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="238"/>
       <source>Enter name</source>
-      <translation>Enter name</translation>
+      <translation type="unfinished">Enter name</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="244"/>
@@ -8877,7 +8878,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LinkSettings.qml" line="257"/>
       <source>Type</source>
-      <translation>Type</translation>
+      <translation type="unfinished">Type</translation>
     </message>
   </context>
   <context>
@@ -8914,7 +8915,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="23"/>
       <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation>日志下载功能，可以让你从载具上下载二进制日志文件。点击刷新查看可用日志列表。</translation>
+      <translation>日志下载功能，可以让你从飞机上下载二进制日志文件。点击刷新查看可用日志列表。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="63"/>
@@ -8954,7 +8955,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="121"/>
       <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation>您必须先连接载具才能下载日志。</translation>
+      <translation>您必须先连接飞机才能下载日志。</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="132"/>
@@ -9023,7 +9024,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="25"/>
       <source>Log File</source>
-      <translation>Log File</translation>
+      <translation type="unfinished">Log File</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="34"/>
@@ -9033,17 +9034,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="40"/>
       <source>Select Telemetery Log</source>
-      <translation>Select Telemetery Log</translation>
+      <translation type="unfinished">Select Telemetery Log</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="41"/>
       <source>Telemetry Logs (*.%1)</source>
-      <translation>Telemetry Logs (*.%1)</translation>
+      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/LogReplaySettings.qml" line="41"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
   </context>
   <context>
@@ -9091,7 +9092,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="112"/>
       <source>Close</source>
-      <translation>Close</translation>
+      <translation type="unfinished">Close</translation>
     </message>
   </context>
   <context>
@@ -9133,152 +9134,152 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="271"/>
       <source>Gyro</source>
-      <translation>Gyro</translation>
+      <translation type="unfinished">Gyro</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="272"/>
       <source>Accelerometer</source>
-      <translation>Accelerometer</translation>
+      <translation type="unfinished">Accelerometer</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="273"/>
       <source>Magnetometer</source>
-      <translation>Magnetometer</translation>
+      <translation type="unfinished">Magnetometer</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="274"/>
       <source>Absolute pressure</source>
-      <translation>Absolute pressure</translation>
+      <translation type="unfinished">Absolute pressure</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="275"/>
       <source>Differential pressure</source>
-      <translation>Differential pressure</translation>
+      <translation type="unfinished">Differential pressure</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="276"/>
       <source>GPS</source>
-      <translation>GPS</translation>
+      <translation type="unfinished">GPS</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="277"/>
       <source>Optical flow</source>
-      <translation>Optical flow</translation>
+      <translation type="unfinished">Optical flow</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="278"/>
       <source>Computer vision position</source>
-      <translation>Computer vision position</translation>
+      <translation type="unfinished">Computer vision position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="279"/>
       <source>Laser based position</source>
-      <translation>Laser based position</translation>
+      <translation type="unfinished">Laser based position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="280"/>
       <source>External ground truth</source>
-      <translation>External ground truth</translation>
+      <translation type="unfinished">External ground truth</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="281"/>
       <source>Angular rate control</source>
-      <translation>Angular rate control</translation>
+      <translation type="unfinished">Angular rate control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="282"/>
       <source>Attitude stabilization</source>
-      <translation>Attitude stabilization</translation>
+      <translation type="unfinished">Attitude stabilization</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="283"/>
       <source>Yaw position</source>
-      <translation>Yaw position</translation>
+      <translation type="unfinished">Yaw position</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="284"/>
       <source>Z/altitude control</source>
-      <translation>Z/altitude control</translation>
+      <translation type="unfinished">Z/altitude control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="285"/>
       <source>X/Y position control</source>
-      <translation>X/Y position control</translation>
+      <translation type="unfinished">X/Y position control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="286"/>
       <source>Motor outputs / control</source>
-      <translation>Motor outputs / control</translation>
+      <translation type="unfinished">Motor outputs / control</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="287"/>
       <source>RC receiver</source>
-      <translation>RC receiver</translation>
+      <translation type="unfinished">RC receiver</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="288"/>
       <source>Gyro 2</source>
-      <translation>Gyro 2</translation>
+      <translation type="unfinished">Gyro 2</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="289"/>
       <source>Accelerometer 2</source>
-      <translation>Accelerometer 2</translation>
+      <translation type="unfinished">Accelerometer 2</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="290"/>
       <source>Magnetometer 2</source>
-      <translation>Magnetometer 2</translation>
+      <translation type="unfinished">Magnetometer 2</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="291"/>
       <source>GeoFence</source>
-      <translation>GeoFence</translation>
+      <translation type="unfinished">GeoFence</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="292"/>
       <source>AHRS</source>
-      <translation>AHRS</translation>
+      <translation type="unfinished">AHRS</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="293"/>
       <source>Terrain</source>
-      <translation>Terrain</translation>
+      <translation type="unfinished">Terrain</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="294"/>
       <source>Motors reversed</source>
-      <translation>Motors reversed</translation>
+      <translation type="unfinished">Motors reversed</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="295"/>
       <source>Logging</source>
-      <translation>Logging</translation>
+      <translation type="unfinished">Logging</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="296"/>
       <source>Battery</source>
-      <translation>Battery</translation>
+      <translation type="unfinished">Battery</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="297"/>
       <source>Proximity</source>
-      <translation>Proximity</translation>
+      <translation type="unfinished">Proximity</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="298"/>
       <source>Satellite Communication</source>
-      <translation>Satellite Communication</translation>
+      <translation type="unfinished">Satellite Communication</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="299"/>
       <source>Pre-Arm Check</source>
-      <translation>解锁前检查</translation>
+      <translation type="unfinished">Pre-Arm Check</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="300"/>
       <source>Avoidance/collision prevention</source>
-      <translation>Avoidance/collision prevention</translation>
+      <translation type="unfinished">Avoidance/collision prevention</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="301"/>
@@ -9291,7 +9292,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="313"/>
       <source>Unknown sensor</source>
-      <translation>Unknown sensor</translation>
+      <translation type="unfinished">Unknown sensor</translation>
     </message>
   </context>
   <context>
@@ -9402,7 +9403,7 @@ Click Ok to start the auto-tuning process.
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="195"/>
       <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="211"/>
       <source>System %1</source>
-      <translation>System %1</translation>
+      <translation type="unfinished">System %1</translation>
     </message>
   </context>
   <context>
@@ -9567,47 +9568,47 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="46"/>
       <source>Ready To Fly</source>
-      <translation>Ready To Fly</translation>
+      <translation type="unfinished">Ready To Fly</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="47"/>
       <source>Not Ready</source>
-      <translation>Not Ready</translation>
+      <translation type="unfinished">Not Ready</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="49"/>
       <source>Armed</source>
-      <translation>已解锁</translation>
+      <translation type="unfinished">Armed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="50"/>
       <source>Flying</source>
-      <translation>Flying</translation>
+      <translation type="unfinished">Flying</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="51"/>
       <source>Landing</source>
-      <translation>Landing</translation>
+      <translation type="unfinished">Landing</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="153"/>
       <source>FW(vtol)</source>
-      <translation>FW(vtol)</translation>
+      <translation type="unfinished">FW(vtol)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="153"/>
       <source>MR(vtol)</source>
-      <translation>MR(vtol)</translation>
+      <translation type="unfinished">MR(vtol)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="228"/>
       <source>Sensor Status</source>
-      <translation>Sensor Status</translation>
+      <translation type="unfinished">Sensor Status</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="194"/>
       <source>Disarm</source>
-      <translation>上锁</translation>
+      <translation type="unfinished">Disarm</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="45"/>
@@ -9617,17 +9618,17 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="48"/>
       <source>Disconnected - Click to manually connect</source>
-      <translation>断开连接 - 点击手动连接</translation>
+      <translation type="unfinished">Disconnected - Click to manually connect</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="194"/>
       <source>Force Arm</source>
-      <translation>强制解锁</translation>
+      <translation type="unfinished">Force Arm</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="194"/>
       <source>Arm</source>
-      <translation>解锁</translation>
+      <translation type="unfinished">Arm</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="218"/>
@@ -9663,12 +9664,12 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="388"/>
       <source>Transition to Multi-Rotor</source>
-      <translation>Transition to Multi-Rotor</translation>
+      <translation type="unfinished">Transition to Multi-Rotor</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MainStatusIndicator.qml" line="388"/>
       <source>Transition to Fixed Wing</source>
-      <translation>Transition to Fixed Wing</translation>
+      <translation type="unfinished">Transition to Fixed Wing</translation>
     </message>
   </context>
   <context>
@@ -10155,7 +10156,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="196"/>
       <source>Move to vehicle position</source>
-      <translation>移动到载具位置</translation>
+      <translation>移动到飞机位置</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionItemEditor.qml" line="209"/>
@@ -10214,7 +10215,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="43"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="131"/>
@@ -10239,22 +10240,22 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="169"/>
       <source>Vehicle Info</source>
-      <translation>载具信息</translation>
+      <translation>飞机信息</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="68"/>
       <source>All Altitudes</source>
-      <translation>All Altitudes</translation>
+      <translation type="unfinished">All Altitudes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="115"/>
       <source>Initial Waypoint Alt</source>
-      <translation>Initial Waypoint Alt</translation>
+      <translation type="unfinished">Initial Waypoint Alt</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="220"/>
       <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
+      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="225"/>
@@ -10264,7 +10265,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="236"/>
       <source>Hover speed</source>
-      <translation>盘旋速度</translation>
+      <translation>悬停速度</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="270"/>
@@ -10274,7 +10275,7 @@ Click Ok to start the auto-tuning process.
     <message>
       <location filename="../src/QmlControls/MissionSettingsEditor.qml" line="282"/>
       <source>Actual position set by vehicle at flight time.</source>
-      <translation>载具在出发时设定的实际位置。</translation>
+      <translation>飞机在起飞时设定的实际位置。</translation>
     </message>
   </context>
   <context>
@@ -10477,17 +10478,17 @@ The procedure is as following:&lt;br /&gt;
 - The motor output functions will automatically be reassigned by the selected order.&lt;br /&gt;
 &lt;br /&gt;
 Do you wish to proceed?</source>
-      <translation>这将自动以 15% 的推力旋转各个马达。&lt;br /&gt;&lt;br /&gt;
-&lt;b&gt;警告：只有移除所有螺旋桨后才能继续操作&lt;/b&gt;。&lt;br /&gt;
+      <translation type="unfinished">This will automatically spin individual motors at 15% thrust.&lt;br /&gt;&lt;br /&gt;
+&lt;b&gt;Warning: Only proceed if you removed all propellers&lt;/b&gt;.&lt;br /&gt;
 %1
 &lt;br /&gt;
-步骤如下：&lt;br /&gt;
-- 确认后，第一个马达开始旋转 0.5 秒。&lt;br /&gt;
-- 然后单击正在旋转的马达。&lt;br /&gt;
-- 对所有马达重复上述步骤。&lt;br /&gt;
-- 马达输出功能将根据所选顺序自动重新分配。&lt;br /&gt;
+The procedure is as following:&lt;br /&gt;
+- After confirming, the first motor starts to spin for 0.5 seconds.&lt;br /&gt;
+- Then click on the motor that was spinning.&lt;br /&gt;
+- The above steps are repeated for all motors.&lt;br /&gt;
+- The motor output functions will automatically be reassigned by the selected order.&lt;br /&gt;
 &lt;br /&gt;
-是否要继续？</translation>
+Do you wish to proceed?</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Actuators/MotorAssignment.cc" line="211"/>
@@ -10644,7 +10645,7 @@ Do you wish to proceed?</source>
     <message>
       <location filename="../src/Vehicle/MultiVehicleManager.cc" line="141"/>
       <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation>警告：已经有一架载具用了同样的系统ID %1：%2</translation>
+      <translation>警告：已经有一架飞机用了同样的系统ID %1：%2</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/MultiVehicleManager.cc" line="159"/>
@@ -10658,7 +10659,7 @@ Do you wish to proceed?</source>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="52"/>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="113"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
     <message>
       <location filename="../src/UI/toolbar/MultiVehicleSelector.qml" line="52"/>
@@ -10842,7 +10843,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
       <source>Vehicle Information</source>
-      <translation>载具信息</translation>
+      <translation>车辆信息</translation>
     </message>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
@@ -10857,7 +10858,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
   </context>
   <context>
@@ -10873,7 +10874,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="334"/>
       <source>Select Tuning:</source>
-      <translation>Select Tuning:</translation>
+      <translation type="unfinished">Select Tuning:</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="360"/>
@@ -10933,7 +10934,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/PIDTuning.qml" line="316"/>
       <source>Use manual tuning</source>
-      <translation>使用手动调整</translation>
+      <translation type="unfinished">Use manual tuning</translation>
     </message>
   </context>
   <context>
@@ -10941,7 +10942,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="147"/>
       <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation>警告：此载具已启用循环中的硬件模拟(HITL)。</translation>
+      <translation>警告：此飞机已启用循环中的硬件模拟(HITL)。</translation>
     </message>
   </context>
   <context>
@@ -10977,7 +10978,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="35"/>
       <source>Manual</source>
-      <translation>手动</translation>
+      <translation>手动Manual</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="36"/>
@@ -11077,12 +11078,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="410"/>
       <source>Unable to go to location, vehicle position not known.</source>
-      <translation>无法到达指定位置，载具位置未知。</translation>
+      <translation>无法到达指定位置，飞机位置未知。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="481"/>
       <source>Unable to pause vehicle.</source>
-      <translation>Unable to pause vehicle.</translation>
+      <translation type="unfinished">Unable to pause vehicle.</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="490"/>
@@ -11112,7 +11113,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="589"/>
       <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation>无法开始任务：载具拒绝解锁。</translation>
+      <translation>无法开始任务：飞机拒绝解锁。</translation>
     </message>
     <message>
       <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="593"/>
@@ -11145,7 +11146,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="173"/>
       <source>Rebooting board</source>
-      <translation>Rebooting board</translation>
+      <translation type="unfinished">Rebooting board</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="197"/>
@@ -11163,12 +11164,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
       <source>Flight Behavior</source>
-      <translation>Flight Behavior</translation>
+      <translation type="unfinished">Flight Behavior</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
       <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation>Flight Behavior is used to configure flight characteristics.</translation>
+      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
     </message>
   </context>
   <context>
@@ -11176,17 +11177,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
       <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
+      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
       <source>Responsiveness</source>
-      <translation>Responsiveness</translation>
+      <translation type="unfinished">Responsiveness</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
       <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
+      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="80"/>
@@ -11196,22 +11197,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
       <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
+      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
       <source>Horizontal velocity (m/s)</source>
-      <translation>Horizontal velocity (m/s)</translation>
+      <translation type="unfinished">Horizontal velocity (m/s)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
       <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation>Limit the horizonal velocity (applies to all modes).</translation>
+      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
       <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
+      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
@@ -11221,17 +11222,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
       <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation>Limit the vertical velocity (applies to all modes).</translation>
+      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
       <source>Mission Turning Radius</source>
-      <translation>Mission Turning Radius</translation>
+      <translation type="unfinished">Mission Turning Radius</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
       <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
+      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
     </message>
   </context>
   <context>
@@ -11277,12 +11278,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/UI/AppSettings/PX4LogTransferSettings.qml" line="111"/>
       <source>MAVLink 2.0 Logging (PX4 Pro Only)</source>
-      <translation>MAVLink 2.0 日志记录（ 仅支持 PX4 Pro ）</translation>
+      <translation type="unfinished">MAVLink 2.0 Logging (PX4 Pro Only)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/PX4LogTransferSettings.qml" line="133"/>
       <source>Manual Start/Stop:</source>
-      <translation>手动开启/停止：</translation>
+      <translation type="unfinished">Manual Start/Stop:</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/PX4LogTransferSettings.qml" line="137"/>
@@ -11302,7 +11303,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/UI/AppSettings/PX4LogTransferSettings.qml" line="173"/>
       <source>MAVLink 2.0 Log Uploads (PX4 Pro Only)</source>
-      <translation>MAVLink 2.0 日志上传（ 仅支持PX4 Pro ）</translation>
+      <translation type="unfinished">MAVLink 2.0 Log Uploads (PX4 Pro Only)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/PX4LogTransferSettings.qml" line="195"/>
@@ -11596,12 +11597,12 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
       <source>PID Tuning</source>
-      <translation>PID Tuning</translation>
+      <translation type="unfinished">PID Tuning</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
       <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation>Tuning Setup is used to tune the flight controllers.</translation>
+      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
     </message>
   </context>
   <context>
@@ -11609,22 +11610,22 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="22"/>
       <source>Rate Controller</source>
-      <translation>Rate Controller</translation>
+      <translation type="unfinished">Rate Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="26"/>
       <source>Attitude Controller</source>
-      <translation>Attitude Controller</translation>
+      <translation type="unfinished">Attitude Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="30"/>
       <source>Velocity Controller</source>
-      <translation>Velocity Controller</translation>
+      <translation type="unfinished">Velocity Controller</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
       <source>Position Controller</source>
-      <translation>Position Controller</translation>
+      <translation type="unfinished">Position Controller</translation>
     </message>
   </context>
   <context>
@@ -11632,43 +11633,43 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="31"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="38"/>
       <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation>Proportional Gain (MC_ROLL_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="39"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="56"/>
       <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation>Increase for more responsiveness, reduce if the attitude overshoots.</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="48"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="55"/>
       <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation>Proportional Gain (MC_PITCH_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="65"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="72"/>
       <source>Proportional Gain (MC_YAW_P)</source>
-      <translation>Proportional Gain (MC_YAW_P)</translation>
+      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="73"/>
       <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
     </message>
   </context>
   <context>
@@ -11676,38 +11677,38 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
       <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation>Position control mode (set this to &apos;simple&apos; during tuning):</translation>
+      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="46"/>
       <source>Horizontal</source>
-      <translation>Horizontal</translation>
+      <translation type="unfinished">Horizontal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="47"/>
       <source>Horizontal (Y direction, sidewards)</source>
-      <translation>Horizontal (Y direction, sidewards)</translation>
+      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="54"/>
       <source>Proportional gain (MPC_XY_P)</source>
-      <translation>Proportional gain (MPC_XY_P)</translation>
+      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="55"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="72"/>
       <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="64"/>
       <source>Vertical</source>
-      <translation>Vertical</translation>
+      <translation type="unfinished">Vertical</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="71"/>
       <source>Proportional gain (MPC_Z_P)</source>
-      <translation>Proportional gain (MPC_Z_P)</translation>
+      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
     </message>
   </context>
   <context>
@@ -11735,77 +11736,77 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
       <source>Roll</source>
-      <translation>Roll</translation>
+      <translation type="unfinished">Roll</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="79"/>
       <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation>Overall Multiplier (MC_ROLLRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="146"/>
       <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
+      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="87"/>
       <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation>Differential Gain (MC_ROLLRATE_D)</translation>
+      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="88"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="121"/>
       <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
+      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="95"/>
       <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation>Integral Gain (MC_ROLLRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="96"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="129"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="154"/>
       <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation>Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
+      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
       <source>Pitch</source>
-      <translation>Pitch</translation>
+      <translation type="unfinished">Pitch</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="112"/>
       <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation>Overall Multiplier (MC_PITCHRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="120"/>
       <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation>Differential Gain (MC_PITCHRATE_D)</translation>
+      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="128"/>
       <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation>Integral Gain (MC_PITCHRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
       <source>Yaw</source>
-      <translation>Yaw</translation>
+      <translation type="unfinished">Yaw</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="145"/>
       <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation>Overall Multiplier (MC_YAWRATE_K)</translation>
+      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="153"/>
       <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation>Integral Gain (MC_YAWRATE_I)</translation>
+      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
     </message>
   </context>
   <context>
@@ -11813,74 +11814,74 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
       <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation>Position control mode (set this to &apos;simple&apos; during tuning):</translation>
+      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="46"/>
       <source>Horizontal</source>
-      <translation>Horizontal</translation>
+      <translation type="unfinished">Horizontal</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="47"/>
       <source>Horizontal (Y direction, sidewards)</source>
-      <translation>Horizontal (Y direction, sidewards)</translation>
+      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="54"/>
       <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation>Proportional gain (MPC_XY_VEL_P_ACC)</translation>
+      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="55"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="88"/>
       <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
+      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="62"/>
       <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation>Integral gain (MPC_XY_VEL_I_ACC)</translation>
+      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="63"/>
       <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation>Increase to reduce steady-state error (e.g. wind)</translation>
+      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="70"/>
       <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation>Differential gain (MPC_XY_VEL_D_ACC)</translation>
+      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="71"/>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="104"/>
       <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
+      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="80"/>
       <source>Vertical</source>
-      <translation>Vertical</translation>
+      <translation type="unfinished">Vertical</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="87"/>
       <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation>Proportional gain (MPC_Z_VEL_P_ACC)</translation>
+      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="95"/>
       <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation>Integral gain (MPC_Z_VEL_I_ACC)</translation>
+      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="96"/>
       <source>Increase to reduce steady-state error</source>
-      <translation>Increase to reduce steady-state error</translation>
+      <translation type="unfinished">Increase to reduce steady-state error</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="103"/>
       <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation>Differential gain (MPC_Z_VEL_D_ACC)</translation>
+      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
     </message>
   </context>
   <context>
@@ -12050,17 +12051,17 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="31"/>
       <source>Altitude &amp; Airspeed</source>
-      <translation>Altitude &amp; Airspeed</translation>
+      <translation type="unfinished">Altitude &amp; Airspeed</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="40"/>
       <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation>Height rate feed forward (FW_T_HRATE_FF)</translation>
+      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="41"/>
       <source>TODO</source>
-      <translation>TODO</translation>
+      <translation type="unfinished">TODO</translation>
     </message>
   </context>
   <context>
@@ -12068,7 +12069,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="21"/>
       <source>Multirotor</source>
-      <translation>Multirotor</translation>
+      <translation type="unfinished">Multirotor</translation>
     </message>
   </context>
   <context>
@@ -12076,42 +12077,42 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
       <source>Load Parameters</source>
-      <translation>Load Parameters</translation>
+      <translation type="unfinished">Load Parameters</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="39"/>
       <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
+      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="40"/>
       <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation>There are no differences between the file loaded and the current settings on the Vehicle.</translation>
+      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="68"/>
       <source>Comp ID</source>
-      <translation>Comp ID</translation>
+      <translation type="unfinished">Comp ID</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="75"/>
       <source>Name</source>
-      <translation>Name</translation>
+      <translation type="unfinished">Name</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="81"/>
       <source>File</source>
-      <translation>File</translation>
+      <translation type="unfinished">File</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="87"/>
       <source>Vehicle</source>
-      <translation>Vehicle</translation>
+      <translation type="unfinished">Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
       <source>N/A</source>
-      <translation>N/A</translation>
+      <translation type="unfinished">N/A</translation>
     </message>
   </context>
   <context>
@@ -12175,7 +12176,7 @@ Is this really what you want?</translation>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="107"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="150"/>
@@ -12187,7 +12188,7 @@ Is this really what you want?</translation>
       <source>Select Reset to reset all parameters to their defaults.
 
 Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation>Select Reset to reset all parameters to their defaults.
+      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
 
 Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
     </message>
@@ -12215,7 +12216,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
       <source>Select Ok to reboot vehicle.</source>
-      <translation>点击“确定”重新启动载具。</translation>
+      <translation>点击“确定”重新启动飞机。</translation>
     </message>
   </context>
   <context>
@@ -12304,12 +12305,12 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="690"/>
       <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation>参数写入失败：载具：%1 组件：%2 参数：%3</translation>
+      <translation>参数写入失败：飞机：%1 组件：%2 参数：%3</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="712"/>
       <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation>参数读取失败：载具：%1 组件：%2 参数：%3</translation>
+      <translation>参数读取失败：飞机：%1 组件：%2 参数：%3</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="933"/>
@@ -12331,12 +12332,12 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="1133"/>
       <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>%1 无法从载具%2检索完整的参数集。这将导致%1无法显示其完整的用户界面。如果使用的是修改后的固件，则可能需要解决所有载具启动错误以解决此问题。如果使用的是标准固件，则可能需要升级到较新的版本来解决此问题。</translation>
+      <translation>%1 无法从飞机%2检索完整的参数集。这将导致%1无法显示其完整的用户界面。如果使用的是修改后的固件，则可能需要解决所有飞机启动错误以解决此问题。如果使用的是标准固件，则可能需要升级到较新的版本来解决此问题。</translation>
     </message>
     <message>
       <location filename="../src/FactSystem/ParameterManager.cc" line="1158"/>
       <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>载具%1未响应对参数的请求。这将导致 %2 无法显示其完整的用户界面。</translation>
+      <translation>飞机%1未响应对参数的请求。这将导致 %2 无法显示其完整的用户界面。</translation>
     </message>
   </context>
   <context>
@@ -12349,7 +12350,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
       <source>Free Space: </source>
-      <translation>Free Space: </translation>
+      <translation type="unfinished">Free Space: </translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="62"/>
@@ -12359,122 +12360,122 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="246"/>
       <source>Battery: </source>
-      <translation>Battery: </translation>
+      <translation type="unfinished">Battery: </translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="317"/>
       <source>Settings</source>
-      <translation>Settings</translation>
+      <translation type="unfinished">Settings</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
       <source>Camera</source>
-      <translation>Camera</translation>
+      <translation type="unfinished">Camera</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
       <source>Video Stream</source>
-      <translation>Video Stream</translation>
+      <translation type="unfinished">Video Stream</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
       <source>Thermal View Mode</source>
-      <translation>Thermal View Mode</translation>
+      <translation type="unfinished">Thermal View Mode</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="355"/>
       <source>Blend Opacity</source>
-      <translation>Blend Opacity</translation>
+      <translation type="unfinished">Blend Opacity</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
       <source>Photo Mode</source>
-      <translation>Photo Mode</translation>
+      <translation type="unfinished">Photo Mode</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
       <source>Photo Interval (seconds)</source>
-      <translation>Photo Interval (seconds)</translation>
+      <translation type="unfinished">Photo Interval (seconds)</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
       <source>Video Grid Lines</source>
-      <translation>Video Grid Lines</translation>
+      <translation type="unfinished">Video Grid Lines</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
       <source>Video Screen Fit</source>
-      <translation>Video Screen Fit</translation>
+      <translation type="unfinished">Video Screen Fit</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
       <source>Reset Camera Defaults</source>
-      <translation>Reset Camera Defaults</translation>
+      <translation type="unfinished">Reset Camera Defaults</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="399"/>
       <source>Storage</source>
-      <translation>Storage</translation>
+      <translation type="unfinished">Storage</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Off</source>
-      <translation>Off</translation>
+      <translation type="unfinished">Off</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Blend</source>
-      <translation>Blend</translation>
+      <translation type="unfinished">Blend</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Full</source>
-      <translation>Full</translation>
+      <translation type="unfinished">Full</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="426"/>
       <source>Picture In Picture</source>
-      <translation>Picture In Picture</translation>
+      <translation type="unfinished">Picture In Picture</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="500"/>
       <source>Single</source>
-      <translation>Single</translation>
+      <translation type="unfinished">Single</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="500"/>
       <source>Time Lapse</source>
-      <translation>Time Lapse</translation>
+      <translation type="unfinished">Time Lapse</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="534"/>
       <source>Reset</source>
-      <translation>Reset</translation>
+      <translation type="unfinished">Reset</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
       <source>Reset Camera to Factory Settings</source>
-      <translation>Reset Camera to Factory Settings</translation>
+      <translation type="unfinished">Reset Camera to Factory Settings</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
       <source>Confirm resetting all settings?</source>
-      <translation>Confirm resetting all settings?</translation>
+      <translation type="unfinished">Confirm resetting all settings?</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="558"/>
       <source>Format</source>
-      <translation>Format</translation>
+      <translation type="unfinished">Format</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="563"/>
       <source>Format Camera Storage</source>
-      <translation>Format Camera Storage</translation>
+      <translation type="unfinished">Format Camera Storage</translation>
     </message>
     <message>
       <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="564"/>
       <source>Confirm erasing all files?</source>
-      <translation>Confirm erasing all files?</translation>
+      <translation type="unfinished">Confirm erasing all files?</translation>
     </message>
   </context>
   <context>
@@ -12507,7 +12508,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
       <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation>任务写入失败，载具发送最终确认信息失败。</translation>
+      <translation>任务写入失败，飞机发送最终确认信息失败。</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="216"/>
@@ -12517,7 +12518,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="225"/>
       <source>Vehicle did not request all items from ground station: %1</source>
-      <translation>载具未从地面站请求所有项目：%1</translation>
+      <translation>飞机未从地面站请求所有项目：%1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="233"/>
@@ -12532,22 +12533,22 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="244"/>
       <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation>载具未响应任务项目通信：%1</translation>
+      <translation>飞机未响应任务项目通信：%1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="357"/>
       <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation>内部错误：在无更多索引可读的情况下调用载具的 _requestNextMission 功能</translation>
+      <translation>内部错误：呼叫车辆_requestNextMission项目没有更多要阅读的索引</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="515"/>
       <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation>载具请求的项目超出范围，计数：请求 %1:%2。发送到载具失败。</translation>
+      <translation>飞机请求的项目超出范围，计数：请求 %1:%2。发送到飞机失败。</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="629"/>
       <source>Vehicle remove all failed. Error: %1</source>
-      <translation>载具移除所有失败。错误： %1</translation>
+      <translation>车辆移除所有失败。错误： %1</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="704"/>
@@ -12653,7 +12654,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/MissionManager/PlanManager.cc" line="640"/>
       <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation>载具返回错误：%1。%2载具未接受引导项目。</translation>
+      <translation>飞机返回错误：%1。%2飞机未接受引导项目。</translation>
     </message>
   </context>
   <context>
@@ -12692,7 +12693,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
       <location filename="../src/MissionManager/PlanMasterController.cc" line="562"/>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="571"/>
       <source>All Files (*)</source>
-      <translation>All Files (*)</translation>
+      <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/PlanMasterController.cc" line="571"/>
@@ -12789,7 +12790,7 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="70"/>
       <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation>载具当前已解锁。您确认想上传任务到载具吗？</translation>
+      <translation>飞机当前已解锁。您确认想上传任务到飞机吗？</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="108"/>
@@ -12854,71 +12855,71 @@ Note that this will also completely reset everything, including UAVCAN nodes, al
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="107"/>
       <source>Apply new altitude</source>
-      <translation>Apply new altitude</translation>
+      <translation type="unfinished">Apply new altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="118"/>
       <source>Plan View - Vehicle Disconnected</source>
-      <translation>Plan View - Vehicle Disconnected</translation>
+      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="118"/>
       <source>Plan View - Vehicle Changed</source>
-      <translation>Plan View - Vehicle Changed</translation>
+      <translation type="unfinished">Plan View - Vehicle Changed</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="126"/>
       <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
+      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="127"/>
       <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
+      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="134"/>
       <source>Discard Unsaved Changes</source>
-      <translation>Discard Unsaved Changes</translation>
+      <translation type="unfinished">Discard Unsaved Changes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="135"/>
       <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation>Discard Unsaved Changes, Load New Plan From Vehicle</translation>
+      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="136"/>
       <source>Load New Plan From Vehicle</source>
-      <translation>Load New Plan From Vehicle</translation>
+      <translation type="unfinished">Load New Plan From Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="147"/>
       <source>Keep Current Plan</source>
-      <translation>Keep Current Plan</translation>
+      <translation type="unfinished">Keep Current Plan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="148"/>
       <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation>Keep Current Plan, Don&apos;t Update From Vehicle</translation>
+      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="211"/>
       <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
 
 Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
+      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
 
 Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="207"/>
       <source>Send To Vehicle</source>
-      <translation>Send To Vehicle</translation>
+      <translation type="unfinished">Send To Vehicle</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="207"/>
       <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation>Current mission must be paused prior to uploading a new Plan</translation>
+      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="586"/>
@@ -12980,7 +12981,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="954"/>
       <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>您有未保存/未发送的更改。从载具进行加载操作将会失去这些变更。确定要从载具上加载吗？</translation>
+      <translation>您有未保存/未发送的更改。从飞机进行加载操作将会失去这些变更。确定要从飞机上加载吗？</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="877"/>
@@ -12996,7 +12997,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="899"/>
       <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation>是否确认要删除所有任务项目并清除该载具上的任务？</translation>
+      <translation>是否确认要删除所有任务项目并清除该飞机上的任务？</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="933"/>
@@ -13044,7 +13045,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="976"/>
       <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation>您有未保存的更改。您应该上传到您的载具，或保存到文件。</translation>
+      <translation>您有未保存的更改，应该将其上传到飞机或保存到一个文件中：</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="886"/>
@@ -13082,7 +13083,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1120"/>
       <source>Vehicle</source>
-      <translation>载具</translation>
+      <translation>飞机</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/PlanView.qml" line="1140"/>
@@ -13173,7 +13174,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="542"/>
       <source>ESC Calibration failed. </source>
-      <translation>ESC Calibration failed. </translation>
+      <translation type="unfinished">ESC Calibration failed. </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="543"/>
@@ -13183,7 +13184,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="550"/>
       <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation>警告：在执行电调校准之前，载具上的螺旋桨必须先拆卸下来。</translation>
+      <translation>警告：在执行电调校准之前，飞机上的螺旋桨必须先拆卸下来。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="550"/>
@@ -13198,13 +13199,13 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
       <source>Battery </source>
-      <translation>Battery </translation>
+      <translation type="unfinished">Battery </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="256"/>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="271"/>
       <source>Source</source>
-      <translation>Source</translation>
+      <translation type="unfinished">Source</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="436"/>
@@ -13292,7 +13293,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
       <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. </source>
-      <translation>如果载具所报告的电池电压与使用电压表测量的电压读数有很大差异，那么你可以调整你的电压乘数值来修正。 </translation>
+      <translation>如果飞机所报告的电池电压与使用电压表测量的电压读数有很大差异，那么你可以调整你的电压乘数值来修正。 </translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="341"/>
@@ -13323,7 +13324,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
       <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation>警告：在执行电调校准之前，载具上的螺旋桨必须先拆卸下来。</translation>
+      <translation>警告：在执行电调校准之前，飞机上的螺旋桨必须先拆卸下来。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
@@ -13488,12 +13489,12 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
       <source>(Passed)</source>
-      <translation>(Passed)</translation>
+      <translation type="unfinished">(Passed)</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
       <source>In Progress</source>
-      <translation>In Progress</translation>
+      <translation type="unfinished">In Progress</translation>
     </message>
   </context>
   <context>
@@ -13611,7 +13612,7 @@ Click &apos;Ok&apos; to upload the Plan anyway.</translation>
     <message>
       <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
       <source>--.--</source>
-      <translation>--.--</translation>
+      <translation type="unfinished">--.--</translation>
     </message>
   </context>
   <context>
@@ -13637,12 +13638,12 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/QGCApplication.cc" line="588"/>
       <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation>There is a newer version of %1 available. You can download it from %2.</translation>
+      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
     </message>
     <message>
       <location filename="../src/QGCApplication.cc" line="588"/>
       <source>New Version Available</source>
-      <translation>New Version Available</translation>
+      <translation type="unfinished">New Version Available</translation>
     </message>
   </context>
   <context>
@@ -13691,7 +13692,7 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/API/QGCCorePlugin.cc" line="152"/>
       <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>警告：您即将进入高级模式。如果使用不当，这可能导致您的载具故障，从而使您的保修作废。只有在客户支持的指导下才能这样做。是否确实要启用高级模式？</translation>
+      <translation>警告：您即将进入高级模式。如果使用不当，这可能导致您的飞机故障，从而使您的保修作废。只有在客户支持的指导下才能这样做。是否确实要启用高级模式？</translation>
     </message>
   </context>
   <context>
@@ -13749,7 +13750,7 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="146"/>
       <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation>Unabled to find writable download location. Tried downloads and temp directory.</translation>
+      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
     </message>
     <message>
       <location filename="../src/Utilities/FileSystem/QGCFileDownload.cc" line="156"/>
@@ -13925,7 +13926,7 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="345"/>
       <source>Onboard ADSB peripheral</source>
-      <translation>机载ADSB外部设备</translation>
+      <translation type="unfinished">Onboard ADSB peripheral</translation>
     </message>
   </context>
   <context>
@@ -13933,12 +13934,12 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkSystem.cc" line="136"/>
       <source>Comp All</source>
-      <translation>Comp All</translation>
+      <translation type="unfinished">Comp All</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/MAVLinkSystem.cc" line="142"/>
       <source>Comp %1</source>
-      <translation>Comp %1</translation>
+      <translation type="unfinished">Comp %1</translation>
     </message>
   </context>
   <context>
@@ -14229,42 +14230,42 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="339"/>
       <source>(AMSL)</source>
-      <translation>(AMSL)</translation>
+      <translation type="unfinished">(AMSL)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="341"/>
       <source>(CalcT)</source>
-      <translation>(CalcT)</translation>
+      <translation type="unfinished">(CalcT)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="361"/>
       <source>AMSL</source>
-      <translation>AMSL</translation>
+      <translation type="unfinished">AMSL</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="363"/>
       <source>Calc Above Terrain</source>
-      <translation>Calc Above Terrain</translation>
+      <translation type="unfinished">Calc Above Terrain</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="367"/>
       <source>Mixed Modes</source>
-      <translation>Mixed Modes</translation>
+      <translation type="unfinished">Mixed Modes</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="343"/>
       <source>(TerrF)</source>
-      <translation>(TerrF)</translation>
+      <translation type="unfinished">(TerrF)</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="359"/>
       <source>Relative To Launch</source>
-      <translation>Relative To Launch</translation>
+      <translation type="unfinished">Relative To Launch</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="365"/>
       <source>Terrain Frame</source>
-      <translation>Terrain Frame</translation>
+      <translation type="unfinished">Terrain Frame</translation>
     </message>
   </context>
   <context>
@@ -14273,7 +14274,7 @@ sudo apt-get 移除调制解调器管理器</translation>
       <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
       <location filename="../src/Vehicle/Vehicle.cc" line="84"/>
       <source>Guided mode not supported by Vehicle.</source>
-      <translation>载具不支持引导模式。</translation>
+      <translation>飞机不支持引导模式。</translation>
     </message>
     <message>
       <location filename="../src/Utilities/JsonHelper.cc" line="64"/>
@@ -14551,7 +14552,7 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="47"/>
       <source>Waiting on parameter update from Vehicle.</source>
-      <translation>正在等待载具的参数更新。</translation>
+      <translation>正在等待车辆的参数更新。</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RCToParamDialog.qml" line="58"/>
@@ -14599,7 +14600,7 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="52"/>
       <source>Your stick mappings have changed, you must reboot the vehicle for correct operation.</source>
-      <translation>你的摇杆映射已经被修改，你必须重启载具以便正确操作。</translation>
+      <translation>你的摇杆映射已经被修改，你必须重启飞机以便正确操作。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="53"/>
@@ -14649,12 +14650,12 @@ sudo apt-get 移除调制解调器管理器</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="325"/>
       <source>Please ensure all motor power is disconnected AND all props are removed from the vehicle.</source>
-      <translation>请确保断开所有电机电源，并且从载具上卸下所有螺旋桨。</translation>
+      <translation>请确保断开所有电机电源，并且从飞机上卸下所有螺旋桨。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="318"/>
       <source>Please turn on transmitter.</source>
-      <translation>请打开发射机。</translation>
+      <translation>请打开遥控器。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="320"/>
@@ -14791,7 +14792,7 @@ Click Next to continue</source>
       <translation>按照图中所示将油门摇杆移动到最低位置。
 将发射机上的所有微调重置回中。
 
-确保断开所有的电机电源并卸下载具上的所有螺旋桨。
+确保断开所有的电机电源并卸下飞机上的所有螺旋桨。
 
 单击“下一步”继续</translation>
     </message>
@@ -14943,7 +14944,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="107"/>
       <source>ARM STATUS</source>
-      <translation>解锁状态</translation>
+      <translation type="unfinished">ARM STATUS</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="131"/>
@@ -14993,7 +14994,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="335"/>
       <source>Arm Status Error</source>
-      <translation>解锁状态错误</translation>
+      <translation type="unfinished">Arm Status Error</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/RemoteIDIndicatorPage.qml" line="342"/>
@@ -15031,7 +15032,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="164"/>
       <source>ARM STATUS</source>
-      <translation>解锁状态</translation>
+      <translation type="unfinished">ARM STATUS</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="181"/>
@@ -15061,7 +15062,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="281"/>
       <source>Arm Status Error</source>
-      <translation>解锁状态错误 </translation>
+      <translation type="unfinished">Arm Status Error</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/RemoteIDSettings.qml" line="289"/>
@@ -15165,7 +15166,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>请在这儿解锁载具</translation>
+      <translation>请在这儿解锁飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
@@ -15360,7 +15361,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="236"/>
       <source>Show obstacle distance overlay</source>
-      <translation>Show obstacle distance overlay</translation>
+      <translation type="unfinished">Show obstacle distance overlay</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="247"/>
@@ -15415,7 +15416,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="603"/>
       <source>Telemetry logging to vehicle storage:</source>
-      <translation>储存数传日志到载具里</translation>
+      <translation>储存数传日志到飞机里</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="449"/>
@@ -15430,22 +15431,22 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="479"/>
       <source>Loiter and do not land</source>
-      <translation>盘旋但不着陆</translation>
+      <translation>留待但不着陆</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="489"/>
       <source>Loiter and land after specified time</source>
-      <translation>盘旋并在指定时间后着陆</translation>
+      <translation>留待并在指定时间后着陆</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="495"/>
       <source>Loiter Time</source>
-      <translation>盘旋时间</translation>
+      <translation>留待时间</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="505"/>
       <source>Loiter Altitude</source>
-      <translation>盘旋高度</translation>
+      <translation>留待高度</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="518"/>
@@ -15523,17 +15524,17 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
       <source>Loiter and do not land</source>
-      <translation>盘旋但不着陆</translation>
+      <translation>留待但不着陆</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
       <source>Loiter and land after specified time</source>
-      <translation>盘旋并在指定时间后着陆</translation>
+      <translation>留待并在指定时间后着陆</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
       <source>Loiter Alt</source>
-      <translation>盘旋高度</translation>
+      <translation>留待高度</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
@@ -15551,7 +15552,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="37"/>
       <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation>传感器设置，用于校准你的载具内的传感器。</translation>
+      <translation>传感器设置，用于校准你的飞机内的传感器。</translation>
     </message>
   </context>
   <context>
@@ -15574,12 +15575,12 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="306"/>
       <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation>把你的载具置于下面显示的一个未完成的方向，然后保持静止</translation>
+      <translation>把你的飞机置于下面显示的一个未完成的方向，然后保持静止</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="391"/>
       <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation>如下图示连续旋转载具，直到标记为已完成。</translation>
+      <translation>如下图示连续旋转飞机，直到标记为已完成。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
@@ -15589,22 +15590,22 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="431"/>
       <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation>把你的载具摆放至如下面所示的一个方向，并保持静止</translation>
+      <translation>把你的飞机摆放至如下面所示的一个方向，并保持静止</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="440"/>
       <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation>方向设置已经完成，把你的载具放置到下面显示的一个未完成的方向并保持静止</translation>
+      <translation>方向设置已经完成，把你的飞机放置到下面显示的一个未完成的方向并保持静止</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="500"/>
       <source>Reset successful</source>
-      <translation>Reset successful</translation>
+      <translation type="unfinished">Reset successful</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="507"/>
       <source>Reset failed</source>
-      <translation>Reset failed</translation>
+      <translation type="unfinished">Reset failed</translation>
     </message>
   </context>
   <context>
@@ -15731,7 +15732,7 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="232"/>
       <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation>等待载具响应以取消。这可能需要几秒钟。</translation>
+      <translation>等待飞机响应以取消。这可能需要几秒钟。</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="285"/>
@@ -15746,57 +15747,57 @@ Click the Next button to upload calibration to board. Click Cancel if you don&ap
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
       <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation>For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
+      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
       <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
+      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
       <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
+      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
       <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation>To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
+      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="290"/>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="346"/>
       <source>Autopilot Orientation</source>
-      <translation>Autopilot Orientation</translation>
+      <translation type="unfinished">Autopilot Orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="300"/>
       <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation>ROTATION_NONE indicates component points in direction of flight.</translation>
+      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="306"/>
       <source>Click Ok to start calibration.</source>
-      <translation>Click Ok to start calibration.</translation>
+      <translation type="unfinished">Click Ok to start calibration.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
       <source>Reboot the vehicle prior to flight.</source>
-      <translation>Reboot the vehicle prior to flight.</translation>
+      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="338"/>
       <source>Adjust orientations as needed.
 
 ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation>Adjust orientations as needed.
+      <translation type="unfinished">Adjust orientations as needed.
 
 ROTATION_NONE indicates component points in direction of flight.</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="367"/>
       <source>Mag %1 Orientation</source>
-      <translation>Mag %1 Orientation</translation>
+      <translation type="unfinished">Mag %1 Orientation</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="395"/>
@@ -15857,7 +15858,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="485"/>
       <source>Orientations</source>
-      <translation>Orientations</translation>
+      <translation type="unfinished">Orientations</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="490"/>
@@ -15887,7 +15888,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="613"/>
       <source>Factory reset</source>
-      <translation>Factory reset</translation>
+      <translation type="unfinished">Factory reset</translation>
     </message>
   </context>
   <context>
@@ -15926,27 +15927,27 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="31"/>
       <source>Serial Port</source>
-      <translation>Serial Port</translation>
+      <translation type="unfinished">Serial Port</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="65"/>
       <source>None Available</source>
-      <translation>None Available</translation>
+      <translation type="unfinished">None Available</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="73"/>
       <source>Baud Rate</source>
-      <translation>Baud Rate</translation>
+      <translation type="unfinished">Baud Rate</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="102"/>
       <source>Advanced Settings</source>
-      <translation>Advanced Settings</translation>
+      <translation type="unfinished">Advanced Settings</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="119"/>
       <source>Parity</source>
-      <translation>Parity</translation>
+      <translation type="unfinished">Parity</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="122"/>
@@ -15966,12 +15967,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="157"/>
       <source>Data Bits</source>
-      <translation>Data Bits</translation>
+      <translation type="unfinished">Data Bits</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SerialSettings.qml" line="165"/>
       <source>Stop Bits</source>
-      <translation>Stop Bits</translation>
+      <translation type="unfinished">Stop Bits</translation>
     </message>
   </context>
   <context>
@@ -16042,7 +16043,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/SettingsPagesModel.qml" line="52"/>
       <source>ADSB Server</source>
-      <translation>ADSB 服务器</translation>
+      <translation type="unfinished">ADSB Server</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/SettingsPagesModel.qml" line="59"/>
@@ -16123,7 +16124,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="33"/>
       <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation>载具解锁期间，不能执行此操作。</translation>
+      <translation>飞机解锁期间，不能执行此操作。</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="36"/>
@@ -16138,17 +16139,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="132"/>
       <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation>%1 当前不支持您的载具类型的设定。 </translation>
+      <translation>%1 当前不支持您的飞机类型的设定。 </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="150"/>
       <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation>载具设置和信息将在连接飞机后显示。</translation>
+      <translation>飞机设置和信息将在连接飞机后显示。</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="171"/>
       <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation>您当前已连接到载具，但未返回完整参数列表。 </translation>
+      <translation>您当前已连接到飞机，但未返回完整参数列表。 </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/SetupView.qml" line="172"/>
@@ -16214,7 +16215,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="75"/>
       <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation>Move &apos;%1&apos; %2 to the %3 location. %4</translation>
+      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="156"/>
@@ -16239,12 +16240,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="77"/>
       <source>Transition Direction</source>
-      <translation>Transition Direction</translation>
+      <translation type="unfinished">Transition Direction</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="77"/>
       <source>Takeoff</source>
-      <translation>Takeoff</translation>
+      <translation type="unfinished">Takeoff</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="78"/>
@@ -16259,7 +16260,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="79"/>
       <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation>Ensure distance from launch to transition direction is far enough to complete transition.</translation>
+      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="86"/>
@@ -16289,7 +16290,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="182"/>
       <source>Actual AMSL alt sent: %1 %2</source>
-      <translation>Actual AMSL alt sent: %1 %2</translation>
+      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SimpleItemEditor.qml" line="242"/>
@@ -16322,7 +16323,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="390"/>
       <source>Transition Direction</source>
-      <translation>Transition Direction</translation>
+      <translation type="unfinished">Transition Direction</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="392"/>
@@ -16337,7 +16338,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/SimpleMissionItem.cc" line="400"/>
       <source>Loiter</source>
-      <translation>盘旋</translation>
+      <translation type="unfinished">Loiter</translation>
     </message>
   </context>
   <context>
@@ -16557,7 +16558,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>请在这儿解锁载具</translation>
+      <translation>请在这儿解锁飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
@@ -16661,7 +16662,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="76"/>
       <source>Hover and capture image</source>
-      <translation>悬停并拍照</translation>
+      <translation>悬停拍照</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/SurveyItemEditor.qml" line="82"/>
@@ -16689,17 +16690,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MAVLink/SysStatusSensorInfo.cc" line="98"/>
       <source>Error</source>
-      <translation>Error</translation>
+      <translation type="unfinished">Error</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/SysStatusSensorInfo.cc" line="104"/>
       <source>Normal</source>
-      <translation>Normal</translation>
+      <translation type="unfinished">Normal</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/SysStatusSensorInfo.cc" line="110"/>
       <source>Disabled</source>
-      <translation>Disabled</translation>
+      <translation type="unfinished">Disabled</translation>
     </message>
   </context>
   <context>
@@ -16815,12 +16816,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/TcpSettings.qml" line="29"/>
       <source>Server Address</source>
-      <translation>Server Address</translation>
+      <translation type="unfinished">Server Address</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TcpSettings.qml" line="36"/>
       <source>Port</source>
-      <translation>Port</translation>
+      <translation type="unfinished">Port</translation>
     </message>
   </context>
   <context>
@@ -16902,7 +16903,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="56"/>
       <source>Signing keys should only be sent to the vehicle over secure links.</source>
-      <translation>签名密钥只能通过安全链路发送到载具。</translation>
+      <translation type="unfinished">Signing keys should only be sent to the vehicle over secure links.</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="72"/>
@@ -16917,7 +16918,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="90"/>
       <source>Signing key has changed. Don&apos;t forget to send to Vehicle(s) if needed.</source>
-      <translation>签名密钥已更改。不要忘记在需要时发送到载具。</translation>
+      <translation type="unfinished">Signing key has changed. Don&apos;t forget to send to Vehicle(s) if needed.</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="97"/>
@@ -16947,7 +16948,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="131"/>
       <source>Save logs even if vehicle was not armed</source>
-      <translation>即使载具未解锁时也保存日志</translation>
+      <translation type="unfinished">Save logs even if vehicle was not armed</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="140"/>
@@ -16957,7 +16958,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="149"/>
       <source>Stream Rates (ArduPilot Only)</source>
-      <translation>流速率(仅限ArduPilot)</translation>
+      <translation type="unfinished">Stream Rates (ArduPilot Only)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/TelemetrySettings.qml" line="155"/>
@@ -17083,94 +17084,94 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="35"/>
       <source>Done</source>
-      <translation>Done</translation>
+      <translation type="unfinished">Done</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="91"/>
       <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
+      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="101"/>
       <source>Altitude</source>
-      <translation>Altitude</translation>
+      <translation type="unfinished">Altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="102"/>
       <source>Trigger Dist</source>
-      <translation>Trigger Dist</translation>
+      <translation type="unfinished">Trigger Dist</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="103"/>
       <source>Spacing</source>
-      <translation>Spacing</translation>
+      <translation type="unfinished">Spacing</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="122"/>
       <source>Rotate Entry Point</source>
-      <translation>Rotate Entry Point</translation>
+      <translation type="unfinished">Rotate Entry Point</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="130"/>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="231"/>
       <source>Statistics</source>
-      <translation>Statistics</translation>
+      <translation type="unfinished">Statistics</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="162"/>
       <source>Presets</source>
-      <translation>Presets</translation>
+      <translation type="unfinished">Presets</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="177"/>
       <source>Apply Preset</source>
-      <translation>Apply Preset</translation>
+      <translation type="unfinished">Apply Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="184"/>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="192"/>
       <source>Delete Preset</source>
-      <translation>Delete Preset</translation>
+      <translation type="unfinished">Delete Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="193"/>
       <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation>Are you sure you want to delete &apos;%1&apos; preset?</translation>
+      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="209"/>
       <source>Save Settings As New Preset</source>
-      <translation>Save Settings As New Preset</translation>
+      <translation type="unfinished">Save Settings As New Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="246"/>
       <source>Save Preset</source>
-      <translation>Save Preset</translation>
+      <translation type="unfinished">Save Preset</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="263"/>
       <source>Save the current settings as a named preset.</source>
-      <translation>Save the current settings as a named preset.</translation>
+      <translation type="unfinished">Save the current settings as a named preset.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="268"/>
       <source>Preset Name</source>
-      <translation>Preset Name</translation>
+      <translation type="unfinished">Preset Name</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="274"/>
       <source>Enter preset name</source>
-      <translation>Enter preset name</translation>
+      <translation type="unfinished">Enter preset name</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="281"/>
       <source>Preset name cannot be blank.</source>
-      <translation>Preset name cannot be blank.</translation>
+      <translation type="unfinished">Preset name cannot be blank.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemEditor.qml" line="284"/>
       <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation>Preset name cannot include the &quot;/&quot; character.</translation>
+      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
     </message>
   </context>
   <context>
@@ -17206,17 +17207,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
       <source>Tolerance</source>
-      <translation>Tolerance</translation>
+      <translation type="unfinished">Tolerance</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
       <source>Max Climb Rate</source>
-      <translation>Max Climb Rate</translation>
+      <translation type="unfinished">Max Climb Rate</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
       <source>Max Descent Rate</source>
-      <translation>Max Descent Rate</translation>
+      <translation type="unfinished">Max Descent Rate</translation>
     </message>
   </context>
   <context>
@@ -17442,17 +17443,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="31"/>
       <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
+      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="37"/>
       <source>Port</source>
-      <translation>Port</translation>
+      <translation type="unfinished">Port</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="48"/>
       <source>Server Addresses (optional)</source>
-      <translation>Server Addresses (optional)</translation>
+      <translation type="unfinished">Server Addresses (optional)</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="62"/>
@@ -17462,12 +17463,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="74"/>
       <source>Example: 127.0.0.1:14550</source>
-      <translation>Example: 127.0.0.1:14550</translation>
+      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/UdpSettings.qml" line="77"/>
       <source>Add Server</source>
-      <translation>Add Server</translation>
+      <translation type="unfinished">Add Server</translation>
     </message>
   </context>
   <context>
@@ -17653,7 +17654,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
       <source>Please arm the vehicle here</source>
-      <translation>请在这儿解锁载具</translation>
+      <translation>请在这儿解锁飞机</translation>
     </message>
     <message>
       <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
@@ -17721,7 +17722,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="25"/>
       <source>VTOL Landing</source>
-      <translation>VTOL Landing</translation>
+      <translation type="unfinished">VTOL Landing</translation>
     </message>
     <message>
       <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="92"/>
@@ -17734,22 +17735,22 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="40"/>
       <source>Set to vehicle heading</source>
-      <translation>设置为载具的航向</translation>
+      <translation>设置为飞机的航向</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="41"/>
       <source>Set to vehicle location</source>
-      <translation>设置为载具位置</translation>
+      <translation>设置为飞机位置</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="58"/>
       <source>Final approach</source>
-      <translation>Final approach</translation>
+      <translation type="unfinished">Final approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="70"/>
       <source>Use loiter to altitude</source>
-      <translation>通过盘旋达到高度</translation>
+      <translation type="unfinished">Use loiter to altitude</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="79"/>
@@ -17800,12 +17801,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="226"/>
       <source>* Avoid tailwind on approach to land.</source>
-      <translation>* Avoid tailwind on approach to land.</translation>
+      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="235"/>
       <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation>* Ensure landing distance is enough to complete transition.</translation>
+      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="261"/>
@@ -17820,7 +17821,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="300"/>
       <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation>根据风向和障碍物到着陆点的距离，拖动盘旋点以调整调整着陆方向。</translation>
+      <translation>拖动悬停点来根据风向和障碍物以及到着陆点的距离调整着陆方向。</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternEditor.qml" line="304"/>
@@ -17833,12 +17834,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternMapVisual.qml" line="237"/>
       <source>Loiter</source>
-      <translation>盘旋模式</translation>
+      <translation>悬停模式</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternMapVisual.qml" line="237"/>
       <source>Approach</source>
-      <translation>Approach</translation>
+      <translation type="unfinished">Approach</translation>
     </message>
     <message>
       <location filename="../src/QmlControls/VTOLLandingPatternMapVisual.qml" line="258"/>
@@ -17866,32 +17867,32 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1056"/>
       <source>battery %1 level low</source>
-      <translation>battery %1 level low</translation>
+      <translation type="unfinished">battery %1 level low</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1062"/>
       <source>battery %1 level is critical</source>
-      <translation>battery %1 level is critical</translation>
+      <translation type="unfinished">battery %1 level is critical</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1068"/>
       <source>battery %1 level emergency</source>
-      <translation>battery %1 level emergency</translation>
+      <translation type="unfinished">battery %1 level emergency</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1074"/>
       <source>battery %1 failed</source>
-      <translation>battery %1 failed</translation>
+      <translation type="unfinished">battery %1 failed</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1080"/>
       <source>battery %1 unhealthy</source>
-      <translation>battery %1 unhealthy</translation>
+      <translation type="unfinished">battery %1 unhealthy</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="1092"/>
       <source>warning</source>
-      <translation>warning</translation>
+      <translation type="unfinished">warning</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="3711"/>
@@ -17931,12 +17932,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2008"/>
       <source>Vehicle %1 </source>
-      <translation>Vehicle %1 </translation>
+      <translation type="unfinished">Vehicle %1 </translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="3083"/>
       <source>Vehicle reboot failed.</source>
-      <translation>Vehicle reboot failed.</translation>
+      <translation type="unfinished">Vehicle reboot failed.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2016"/>
@@ -17961,22 +17962,22 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Unable to send command: %1.</source>
-      <translation>Unable to send command: %1.</translation>
+      <translation type="unfinished">Unable to send command: %1.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation>Internal error - MAV_COMP_ID_ALL not supported</translation>
+      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2662"/>
       <source>Waiting on previous response to same command.</source>
-      <translation>Waiting on previous response to same command.</translation>
+      <translation type="unfinished">Waiting on previous response to same command.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2719"/>
       <source>Vehicle did not respond to command: %1</source>
-      <translation>载具未响应命令：%1</translation>
+      <translation>飞机未响应命令：%1</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/Vehicle.cc" line="2853"/>
@@ -18009,42 +18010,42 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="203"/>
       <source>Airship</source>
-      <translation>Airship</translation>
+      <translation type="unfinished">Airship</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="205"/>
       <source>Fixed Wing</source>
-      <translation>Fixed Wing</translation>
+      <translation type="unfinished">Fixed Wing</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="207"/>
       <source>Rover-Boat</source>
-      <translation>Rover-Boat</translation>
+      <translation type="unfinished">Rover-Boat</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="209"/>
       <source>Sub</source>
-      <translation>Sub</translation>
+      <translation type="unfinished">Sub</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="211"/>
       <source>Multi-Rotor</source>
-      <translation>Multi-Rotor</translation>
+      <translation type="unfinished">Multi-Rotor</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="213"/>
       <source>VTOL</source>
-      <translation>VTOL</translation>
+      <translation type="unfinished">VTOL</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="215"/>
       <source>Generic</source>
-      <translation>Generic</translation>
+      <translation type="unfinished">Generic</translation>
     </message>
     <message>
       <location filename="../src/MAVLink/QGCMAVLink.cc" line="217"/>
       <source>Unknown</source>
-      <translation>Unknown</translation>
+      <translation type="unfinished">Unknown</translation>
     </message>
   </context>
   <context>
@@ -18052,49 +18053,49 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <source>%1Communication regained on %2 link</source>
-      <translation>%1Communication regained on %2 link</translation>
+      <translation type="unfinished">%1Communication regained on %2 link</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>primary</source>
-      <translation>primary</translation>
+      <translation type="unfinished">primary</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="75"/>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>secondary</source>
-      <translation>secondary</translation>
+      <translation type="unfinished">secondary</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="77"/>
       <source>%1Communication regained</source>
-      <translation>%1Communication regained</translation>
+      <translation type="unfinished">%1Communication regained</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="83"/>
       <source>%1Switching communication to new primary link</source>
-      <translation>%1Switching communication to new primary link</translation>
+      <translation type="unfinished">%1Switching communication to new primary link</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="131"/>
       <source>%1Communication lost on %2 link.</source>
-      <translation>%1Communication lost on %2 link.</translation>
+      <translation type="unfinished">%1Communication lost on %2 link.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="142"/>
       <source>%1Switching communication to secondary link.</source>
-      <translation>%1Switching communication to secondary link.</translation>
+      <translation type="unfinished">%1Switching communication to secondary link.</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="166"/>
       <source>%1Communication lost</source>
-      <translation>%1Communication lost</translation>
+      <translation type="unfinished">%1Communication lost</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleLinkManager.cc" line="418"/>
       <source>Comm Lost</source>
-      <translation>Comm Lost</translation>
+      <translation type="unfinished">Comm Lost</translation>
     </message>
   </context>
   <context>
@@ -18141,7 +18142,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/VehicleSummary.qml" line="88"/>
       <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation>您将会从以下信息框中看到载具设置的概况。左边是每个组件的设置菜单。</translation>
+      <translation>您将会从以下信息框中看到飞机设置的概况。左边是每个组件的设置菜单。</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/VehicleSummary.qml" line="89"/>
@@ -18154,12 +18155,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
       <source>No GPS Lock for Vehicle</source>
-      <translation>载具未获得GPS定位</translation>
+      <translation>飞机未获得GPS定位</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>载具未通过解锁前检查。要解锁载具，需排除故障。</translation>
+      <translation>车辆未能进行武装前检查。为了装备车辆，解决故障。</translation>
     </message>
   </context>
   <context>
@@ -18167,7 +18168,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
       <source>Analyze vibration associated with your vehicle.</source>
-      <translation>Analyze vibration associated with your vehicle.</translation>
+      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="98"/>
@@ -18202,12 +18203,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="198"/>
       <source>Clip count</source>
-      <translation>Clip count</translation>
+      <translation type="unfinished">Clip count</translation>
     </message>
     <message>
       <location filename="../src/AnalyzeView/VibrationPage.qml" line="224"/>
       <source>Not Available</source>
-      <translation>Not Available</translation>
+      <translation type="unfinished">Not Available</translation>
     </message>
   </context>
   <context>
@@ -18228,32 +18229,32 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="55"/>
       <source>No Video Available</source>
-      <translation>No Video Available</translation>
+      <translation type="unfinished">No Video Available</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="56"/>
       <source>Video Stream Disabled</source>
-      <translation>Video Stream Disabled</translation>
+      <translation type="unfinished">Video Stream Disabled</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="57"/>
       <source>RTSP Video Stream</source>
-      <translation>RTSP Video Stream</translation>
+      <translation type="unfinished">RTSP Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="58"/>
       <source>UDP h.264 Video Stream</source>
-      <translation>UDP h.264 Video Stream</translation>
+      <translation type="unfinished">UDP h.264 Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="59"/>
       <source>UDP h.265 Video Stream</source>
-      <translation>UDP h.265 Video Stream</translation>
+      <translation type="unfinished">UDP h.265 Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="60"/>
       <source>TCP-MPEG2 Video Stream</source>
-      <translation>TCP-MPEG2 Video Stream</translation>
+      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="61"/>
@@ -18263,17 +18264,17 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="62"/>
       <source>3DR Solo (requires restart)</source>
-      <translation>3DR Solo (requires restart)</translation>
+      <translation type="unfinished">3DR Solo (requires restart)</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="63"/>
       <source>Parrot Discovery</source>
-      <translation>Parrot Discovery</translation>
+      <translation type="unfinished">Parrot Discovery</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="64"/>
       <source>Yuneec Mantis G</source>
-      <translation>Yuneec Mantis G</translation>
+      <translation type="unfinished">Yuneec Mantis G</translation>
     </message>
     <message>
       <location filename="../src/Settings/VideoSettings.h" line="65"/>
@@ -18333,7 +18334,7 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
     <message>
       <location filename="../src/UI/AppSettings/VideoSettings.qml" line="97"/>
       <source>Stop recording when disarmed</source>
-      <translation>加锁时停止记录</translation>
+      <translation type="unfinished">Stop recording when disarmed</translation>
     </message>
     <message>
       <location filename="../src/UI/AppSettings/VideoSettings.qml" line="104"/>
diff --git a/translations/qgc_source_zh_TW.ts b/translations/qgc_source_zh_TW.ts
index 2e78d08a0ae5..18997c0a6104 100644
--- a/translations/qgc_source_zh_TW.ts
+++ b/translations/qgc_source_zh_TW.ts
@@ -3739,57 +3739,57 @@ Please place your vehicle in water, click the button, and wait. Note that the th
       <translation type="unfinished">Geometry</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="177"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="181"/>
       <source>Actuator Testing</source>
       <translation type="unfinished">Actuator Testing</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="196"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="200"/>
       <source>Configure some outputs in order to test them.</source>
       <translation type="unfinished">Configure some outputs in order to test them.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Careful: Actuator sliders are enabled</source>
       <translation type="unfinished">Careful: Actuator sliders are enabled</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="233"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="237"/>
       <source>Propellers are removed - Enable sliders</source>
       <translation type="unfinished">Propellers are removed - Enable sliders</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="322"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="326"/>
       <source>Actuator Outputs</source>
       <translation type="unfinished">Actuator Outputs</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="327"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="331"/>
       <source>One or more actuator still needs to be assigned to an output.</source>
       <translation type="unfinished">One or more actuator still needs to be assigned to an output.</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="369"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="373"/>
       <source>Identify &amp; Assign Motors</source>
       <translation type="unfinished">Identify &amp; Assign Motors</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="385"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="389"/>
       <source>Motor Order Identification and Assignment</source>
       <translation type="unfinished">Motor Order Identification and Assignment</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="401"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="404"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="406"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="409"/>
       <source>Spin Motor Again</source>
       <translation type="unfinished">Spin Motor Again</translation>
     </message>
     <message>
-      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="413"/>
+      <location filename="../src/AutoPilotPlugins/PX4/ActuatorComponent.qml" line="416"/>
       <source>Abort</source>
       <translation type="unfinished">Abort</translation>
     </message>
@@ -4058,59 +4058,59 @@ Please place your vehicle in water, click the button, and wait. Note that the th
     </message>
   </context>
   <context>
-    <name>AppMessages</name>
+    <name>AppLogging</name>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="115"/>
       <source>GStreamer Debug Level</source>
       <translation type="unfinished">GStreamer Debug Level</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="159"/>
       <source>Logging categories</source>
       <translation type="unfinished">Logging categories</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="197"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="197"/>
       <source>Search:</source>
       <translation type="unfinished">Search:</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="208"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="208"/>
       <source>Clear</source>
       <translation type="unfinished">Clear</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="231"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="231"/>
       <source>Clear All</source>
       <translation type="unfinished">Clear All</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>Log files (*.txt)</source>
       <translation type="unfinished">Log files (*.txt)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="88"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="88"/>
       <source>All Files (*)</source>
       <translation type="unfinished">All Files (*)</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="89"/>
       <source>Select log save file</source>
       <translation type="unfinished">Select log save file</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="107"/>
       <source>Save App Log</source>
       <translation type="unfinished">Save App Log</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="134"/>
       <source>Show Latest</source>
       <translation type="unfinished">Show Latest</translation>
     </message>
     <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
+      <location filename="../src/QmlControls/AppLogging.qml" line="149"/>
       <source>Set Logging</source>
       <translation type="unfinished">Set Logging</translation>
     </message>
@@ -8361,8 +8361,8 @@ Click Ok to start the auto-tuning process.
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="83"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
+      <source>Button Assignment</source>
+      <translation type="unfinished">Button Assignment</translation>
     </message>
     <message>
       <location filename="../src/Vehicle/VehicleSetup/JoystickConfig.qml" line="86"/>
@@ -9743,87 +9743,87 @@ Click Ok to start the auto-tuning process.
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="143"/>
-      <location filename="../src/UI/MainWindow.qml" line="367"/>
+      <location filename="../src/UI/MainWindow.qml" line="137"/>
+      <location filename="../src/UI/MainWindow.qml" line="356"/>
       <source>Analyze Tools</source>
       <translation type="unfinished">Analyze Tools</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="147"/>
-      <location filename="../src/UI/MainWindow.qml" line="382"/>
+      <location filename="../src/UI/MainWindow.qml" line="141"/>
+      <location filename="../src/UI/MainWindow.qml" line="371"/>
       <source>Vehicle Configuration</source>
       <translation type="unfinished">Vehicle Configuration</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="164"/>
-      <location filename="../src/UI/MainWindow.qml" line="396"/>
+      <location filename="../src/UI/MainWindow.qml" line="158"/>
+      <location filename="../src/UI/MainWindow.qml" line="385"/>
       <source>Application Settings</source>
       <translation type="unfinished">Application Settings</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="226"/>
-      <location filename="../src/UI/MainWindow.qml" line="412"/>
+      <location filename="../src/UI/MainWindow.qml" line="215"/>
+      <location filename="../src/UI/MainWindow.qml" line="401"/>
       <source>Close %1</source>
       <translation type="unfinished">Close %1</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="231"/>
+      <location filename="../src/UI/MainWindow.qml" line="220"/>
       <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="244"/>
+      <location filename="../src/UI/MainWindow.qml" line="233"/>
       <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
       <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="256"/>
+      <location filename="../src/UI/MainWindow.qml" line="245"/>
       <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
       <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="295"/>
+      <location filename="../src/UI/MainWindow.qml" line="284"/>
       <source>Debug Touch Areas</source>
       <translation type="unfinished">Debug Touch Areas</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="296"/>
+      <location filename="../src/UI/MainWindow.qml" line="285"/>
       <source>Touch Area display toggled</source>
       <translation type="unfinished">Touch Area display toggled</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="302"/>
-      <location filename="../src/UI/MainWindow.qml" line="314"/>
+      <location filename="../src/UI/MainWindow.qml" line="291"/>
+      <location filename="../src/UI/MainWindow.qml" line="303"/>
       <source>Advanced Mode</source>
       <translation type="unfinished">Advanced Mode</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="315"/>
+      <location filename="../src/UI/MainWindow.qml" line="304"/>
       <source>Turn off Advanced Mode?</source>
       <translation type="unfinished">Turn off Advanced Mode?</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="353"/>
+      <location filename="../src/UI/MainWindow.qml" line="342"/>
       <source>Plan Flight</source>
       <translation type="unfinished">Plan Flight</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="429"/>
+      <location filename="../src/UI/MainWindow.qml" line="418"/>
       <source>%1 Version</source>
       <translation type="unfinished">%1 Version</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="519"/>
+      <location filename="../src/UI/MainWindow.qml" line="505"/>
       <source>Exit</source>
       <translation type="unfinished">Exit</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="600"/>
+      <location filename="../src/UI/MainWindow.qml" line="586"/>
       <source>Vehicle Error</source>
       <translation type="unfinished">Vehicle Error</translation>
     </message>
     <message>
-      <location filename="../src/UI/MainWindow.qml" line="624"/>
+      <location filename="../src/UI/MainWindow.qml" line="610"/>
       <source>Additional errors received</source>
       <translation type="unfinished">Additional errors received</translation>
     </message>
@@ -11493,12 +11493,12 @@ Is this really what you want?</translation>
   <context>
     <name>PX4ParameterMetaData</name>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="337"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="338"/>
       <source>Enabled</source>
       <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="339"/>
+      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
       <source>Disabled</source>
       <translation type="unfinished">Disabled</translation>
     </message>
@@ -11715,13 +11715,13 @@ Is this really what you want?</translation>
     <name>PX4TuningComponentCopterRate</name>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="49"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
+      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</source>
+      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/main/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;</translation>
     </message>
     <message>
       <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="63"/>
@@ -15899,12 +15899,12 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialLink</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Serial Link Error</source>
       <translation type="unfinished">Serial Link Error</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="408"/>
+      <location filename="../src/Comms/SerialLink.cc" line="460"/>
       <source>Link %1: (Port: %2) %3</source>
       <translation type="unfinished">Link %1: (Port: %2) %3</translation>
     </message>
@@ -15975,37 +15975,37 @@ ROTATION_NONE indicates component points in direction of flight.</translation>
   <context>
     <name>SerialWorker</name>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="189"/>
+      <location filename="../src/Comms/SerialLink.cc" line="241"/>
       <source>Not connecting to a bootloader</source>
       <translation type="unfinished">Not connecting to a bootloader</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="202"/>
+      <location filename="../src/Comms/SerialLink.cc" line="254"/>
       <source>Could not open port: %1</source>
       <translation type="unfinished">Could not open port: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="228"/>
+      <location filename="../src/Comms/SerialLink.cc" line="280"/>
       <source>Data to Send is Empty</source>
       <translation type="unfinished">Data to Send is Empty</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="233"/>
+      <location filename="../src/Comms/SerialLink.cc" line="285"/>
       <source>Port is not Connected</source>
       <translation type="unfinished">Port is not Connected</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="238"/>
+      <location filename="../src/Comms/SerialLink.cc" line="290"/>
       <source>Port is not Writable</source>
       <translation type="unfinished">Port is not Writable</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="246"/>
+      <location filename="../src/Comms/SerialLink.cc" line="298"/>
       <source>Could Not Send Data - Write Failed: %1</source>
       <translation type="unfinished">Could Not Send Data - Write Failed: %1</translation>
     </message>
     <message>
-      <location filename="../src/Comms/SerialLink.cc" line="249"/>
+      <location filename="../src/Comms/SerialLink.cc" line="301"/>
       <source>Could Not Send Data - Write Returned 0 Bytes</source>
       <translation type="unfinished">Could Not Send Data - Write Returned 0 Bytes</translation>
     </message>
diff --git a/translations/qgc_tr_TR.ts b/translations/qgc_tr_TR.ts
deleted file mode 100644
index 4c33eaa54b2b..000000000000
--- a/translations/qgc_tr_TR.ts
+++ /dev/null
@@ -1,18078 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="tr" sourcelanguage="en">
-  <context>
-    <name>ADSBVehicleManager</name>
-    <message>
-      <location filename="../src/ADSB/ADSBVehicleManager.cc" line="70"/>
-      <source>ADSB Server Error: %1</source>
-      <translation type="unfinished">ADSB Server Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <source>Airframe is currently not set.</source>
-      <translation type="unfinished">Airframe is currently not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <source> and frame type &apos;%2&apos;</source>
-      <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="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="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
-      <source> To change this configuration, select the desired frame class below.</source>
-      <translation type="unfinished"> To change this configuration, select the desired frame class below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
-      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="19"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="40"/>
-      <source>Frame Setup is used to select the airframe which matches your vehicle.</source>
-      <translation type="unfinished">Frame Setup is used to select the airframe which matches your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="251"/>
-      <source>Param file github json download failed: %1</source>
-      <translation type="unfinished">Param file github json download failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="261"/>
-      <source>Param file download failed: %1</source>
-      <translation type="unfinished">Param file download failed: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <source>Frame Class</source>
-      <translation type="unfinished">Frame Class</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="226"/>
-      <source>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</source>
-      <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <source>Input channel:</source>
-      <translation type="unfinished">Input channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="20"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="31"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <source>Gimbal type</source>
-      <translation type="unfinished">Gimbal type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <source>Tilt input channel</source>
-      <translation type="unfinished">Tilt input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <source>Pan input channel</source>
-      <translation type="unfinished">Pan input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <source>Roll input channel</source>
-      <translation type="unfinished">Roll input channel</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraSubComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="648"/>
-      <source>Error during Solo video link setup: %1</source>
-      <translation type="unfinished">Error during Solo video link setup: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="770"/>
-      <source>Unable to change altitude, vehicle altitude not known.</source>
-      <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="775"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="838"/>
-      <source>Vehicle does not support guided takeoff</source>
-      <translation type="unfinished">Vehicle does not support guided takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="844"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="854"/>
-      <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="859"/>
-      <source>Unable to takeoff: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="877"/>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="897"/>
-      <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="885"/>
-      <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="890"/>
-      <source>Unable to start mission: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="975"/>
-      <source>Follow failed: Home position not set.</source>
-      <translation type="unfinished">Follow failed: Home position not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="985"/>
-      <source>Follow failed: Ground station cannot provide required position information.</source>
-      <translation type="unfinished">Follow failed: Ground station cannot provide required position information.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source> (Channel 5)</source>
-      <translation type="unfinished"> (Channel 5)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <source>Flight mode channel:</source>
-      <translation type="unfinished">Flight mode channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Not assigned</source>
-      <translation type="unfinished">Not assigned</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 1</source>
-      <translation type="unfinished">Channel 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 2</source>
-      <translation type="unfinished">Channel 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 3</source>
-      <translation type="unfinished">Channel 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 4</source>
-      <translation type="unfinished">Channel 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <source>Flight Mode </source>
-      <translation type="unfinished">Flight Mode </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <source>Simple Mode</source>
-      <translation type="unfinished">Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <source>Switch Options</source>
-      <translation type="unfinished">Switch Options</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <source>Channel option %1 :</source>
-      <translation type="unfinished">Channel option %1 :</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="18"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="29"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <source>Flight Mode 1</source>
-      <translation type="unfinished">Flight Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <source>Flight Mode 2</source>
-      <translation type="unfinished">Flight Mode 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <source>Flight Mode 3</source>
-      <translation type="unfinished">Flight Mode 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <source>Flight Mode 4</source>
-      <translation type="unfinished">Flight Mode 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <source>Flight Mode 5</source>
-      <translation type="unfinished">Flight Mode 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <source>Flight Mode 6</source>
-      <translation type="unfinished">Flight Mode 6</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <source>Enable Follow Me</source>
-      <translation type="unfinished">Enable Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <source>Waiting for Vehicle to update</source>
-      <translation type="unfinished">Waiting for Vehicle to update</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <source>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</source>
-      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <source>Reset To Supported Settings</source>
-      <translation type="unfinished">Reset To Supported Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <source>Vehicle Position</source>
-      <translation type="unfinished">Vehicle Position</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Maintain Current Offsets</source>
-      <translation type="unfinished">Maintain Current Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Specify Offsets</source>
-      <translation type="unfinished">Specify Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <source>Point Vehicle</source>
-      <translation type="unfinished">Point Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Maintain current vehicle orientation</source>
-      <translation type="unfinished">Maintain current vehicle orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Point at ground station location</source>
-      <translation type="unfinished">Point at ground station location</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Same direction as ground station movement</source>
-      <translation type="unfinished">Same direction as ground station movement</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <source>Vehicle Offsets</source>
-      <translation type="unfinished">Vehicle Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <source>Click in the graphic to change angle</source>
-      <translation type="unfinished">Click in the graphic to change angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="28"/>
-      <source>Follow Me Setup is used to configure support for the vehicle following the ground station location.</source>
-      <translation type="unfinished">Follow Me Setup is used to configure support for the vehicle following the ground station location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMHeliComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <source>Servo Setup</source>
-      <translation type="unfinished">Servo Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <source>Servo</source>
-      <translation type="unfinished">Servo</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <source>Min</source>
-      <translation type="unfinished">Min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <source>Max</source>
-      <translation type="unfinished">Max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <source>Trim</source>
-      <translation type="unfinished">Trim</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <source>Reversed</source>
-      <translation type="unfinished">Reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <source>2</source>
-      <translation type="unfinished">2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <source>3</source>
-      <translation type="unfinished">3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <source>4</source>
-      <translation type="unfinished">4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <source>5</source>
-      <translation type="unfinished">5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <source>6</source>
-      <translation type="unfinished">6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <source>7</source>
-      <translation type="unfinished">7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <source>8</source>
-      <translation type="unfinished">8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <source>Swashplate Setup</source>
-      <translation type="unfinished">Swashplate Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <source>Throttle Settings</source>
-      <translation type="unfinished">Throttle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <source>Governor Settings</source>
-      <translation type="unfinished">Governor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <source>Miscellaneous Settings</source>
-      <translation type="unfinished">Miscellaneous Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <source>* Stabilize Collective Curve *</source>
-      <translation type="unfinished">* Stabilize Collective Curve *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <source>* Tail &amp; Gyros *</source>
-      <translation type="unfinished">* Tail &amp; Gyros *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="15"/>
-      <source>Heli</source>
-      <translation type="unfinished">Heli</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="26"/>
-      <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
-      <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <source>Light Output Channels</source>
-      <translation type="unfinished">Light Output Channels</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <source>Lights 1:</source>
-      <translation type="unfinished">Lights 1:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <source>Lights 2:</source>
-      <translation type="unfinished">Lights 2:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <source>Brightness Steps:</source>
-      <translation type="unfinished">Brightness Steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="21"/>
-      <source>Lights</source>
-      <translation type="unfinished">Lights</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="32"/>
-      <source>Lights setup is used to adjust light output channels.</source>
-      <translation type="unfinished">Lights setup is used to adjust light output channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <source>Lights Output 1</source>
-      <translation type="unfinished">Lights Output 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <source>Lights Output 2</source>
-      <translation type="unfinished">Lights Output 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="15"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMNotSupported</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <source>Not supported</source>
-      <translation type="unfinished">Not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <source>Battery 1</source>
-      <translation type="unfinished">Battery 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <source>Battery1 monitor:</source>
-      <translation type="unfinished">Battery1 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <source>Battery 2</source>
-      <translation type="unfinished">Battery 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <source>Battery2 monitor:</source>
-      <translation type="unfinished">Battery2 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <source>WARNING: Remove props prior to calibration!</source>
-      <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Now perform these steps:</source>
-      <translation type="unfinished">Now perform these steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Click Calibrate to start, then:</source>
-      <translation type="unfinished">Click Calibrate to start, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <source>- Disconnect USB and battery so flight controller powers down</source>
-      <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <source>- Connect the battery</source>
-      <translation type="unfinished">- Connect the battery</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <source>- If using a flight controller with a safety button press it until it displays solid red</source>
-      <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <source>- You will hear a musical tone then two beeps</source>
-      <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
-      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
-      <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <source>- Disconnect the battery and power up again normally</source>
-      <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <source>Power Module 90A</source>
-      <translation type="unfinished">Power Module 90A</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <source>Power Module HV</source>
-      <translation type="unfinished">Power Module HV</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <source>3DR Iris</source>
-      <translation type="unfinished">3DR Iris</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <source>Blue Robotics Power Sense Module R2</source>
-      <translation type="unfinished">Blue Robotics Power Sense Module R2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <source>Battery monitor:</source>
-      <translation type="unfinished">Battery monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <source>Battery capacity:</source>
-      <translation type="unfinished">Battery capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <source>Minimum arming voltage:</source>
-      <translation type="unfinished">Minimum arming voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <source>Power sensor:</source>
-      <translation type="unfinished">Power sensor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <source>Current pin:</source>
-      <translation type="unfinished">Current pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <source>Voltage pin:</source>
-      <translation type="unfinished">Voltage pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <source>Voltage multiplier:</source>
-      <translation type="unfinished">Voltage multiplier:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <source>Calculate Voltage Multiplier</source>
-      <translation type="unfinished">Calculate Voltage Multiplier</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <source>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <source>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <source>Amps Offset:</source>
-      <translation type="unfinished">Amps Offset:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <source>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</source>
-      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <source>Calculate And Set</source>
-      <translation type="unfinished">Calculate And Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="18"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="29"/>
-      <source>The Power Component is used to setup battery parameters.</source>
-      <translation type="unfinished">The Power Component is used to setup battery parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="18"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="37"/>
-      <source>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</source>
-      <translation type="unfinished">The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Channel %1</source>
-      <translation type="unfinished">Channel %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <source>Low action:</source>
-      <translation type="unfinished">Low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <source>Critical action:</source>
-      <translation type="unfinished">Critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <source>Low voltage threshold:</source>
-      <translation type="unfinished">Low voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <source>Critical voltage threshold:</source>
-      <translation type="unfinished">Critical voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <source>Low mAh threshold:</source>
-      <translation type="unfinished">Low mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <source>Critical mAh threshold:</source>
-      <translation type="unfinished">Critical mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <source>Final land stage altitude:</source>
-      <translation type="unfinished">Final land stage altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <source>Final land stage descent speed:</source>
-      <translation type="unfinished">Final land stage descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="20"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="33"/>
-      <source>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</source>
-      <translation type="unfinished">Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="44"/>
-      <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="85"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="178"/>
-      <source>Battery low action:</source>
-      <translation type="unfinished">Battery low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="186"/>
-      <source>Battery critical action:</source>
-      <translation type="unfinished">Battery critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="195"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="206"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="155"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="224"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="245"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="252"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="262"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="278"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="293"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="318"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="343"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="355"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="366"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="382"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="402"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="438"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="450"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="472"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="491"/>
-      <source>Land with descent speed:</source>
-      <translation type="unfinished">Land with descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="512"/>
-      <source>Final loiter altitude:</source>
-      <translation type="unfinished">Final loiter altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="534"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="565"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="67"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="88"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="109"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="130"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="142"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="156"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="168"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="68"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="87"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="105"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="122"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="143"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="174"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <source>Failsafe Actions</source>
-      <translation type="unfinished">Failsafe Actions</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <source>GCS Heartbeat:</source>
-      <translation type="unfinished">GCS Heartbeat:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <source>Leak:</source>
-      <translation type="unfinished">Leak:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <source>Detector Pin:</source>
-      <translation type="unfinished">Detector Pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <source>Logic when Dry:</source>
-      <translation type="unfinished">Logic when Dry:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <source>Battery:</source>
-      <translation type="unfinished">Battery:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <source>Voltage:</source>
-      <translation type="unfinished">Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <source>Remaining Capacity:</source>
-      <translation type="unfinished">Remaining Capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <source>EKF:</source>
-      <translation type="unfinished">EKF:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <source>Pilot Input:</source>
-      <translation type="unfinished">Pilot Input:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <source>Timeout:</source>
-      <translation type="unfinished">Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <source>Internal Temperature:</source>
-      <translation type="unfinished">Internal Temperature:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <source>Internal Pressure:</source>
-      <translation type="unfinished">Internal Pressure:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="41"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="46"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="51"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="84"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="77"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="79"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="86"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="92"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="93"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="27"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="38"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="32"/>
-      <source>Voltage failsafe:</source>
-      <translation type="unfinished">Voltage failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="37"/>
-      <source>mAh failsafe:</source>
-      <translation type="unfinished">mAh failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="42"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="43"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="93"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="57"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="60"/>
-      <source>Always Hold</source>
-      <translation type="unfinished">Always Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="73"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="76"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="87"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="92"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="97"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="102"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummarySub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <source>GCS failsafe:</source>
-      <translation type="unfinished">GCS failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <source>Leak failsafe:</source>
-      <translation type="unfinished">Leak failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <source>Battery failsafe:</source>
-      <translation type="unfinished">Battery failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <source>EKF failsafe:</source>
-      <translation type="unfinished">EKF failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <source>Pilot Input failsafe:</source>
-      <translation type="unfinished">Pilot Input failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <source>Int. Temperature failsafe:</source>
-      <translation type="unfinished">Int. Temperature failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <source>Int. Pressure failsafe:</source>
-      <translation type="unfinished">Int. Pressure failsafe:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <source>If mounted in the direction of flight, select None.</source>
-      <translation type="unfinished">If mounted in the direction of flight, select None.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <source>Before calibrating make sure rotation settings are correct. </source>
-      <translation type="unfinished">Before calibrating make sure rotation settings are correct. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <source>If the compass or GPS module is mounted in flight direction, leave the default value (None)</source>
-      <translation type="unfinished">If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <source>The calibration for Compass %1 appears to be poor. </source>
-      <translation type="unfinished">The calibration for Compass %1 appears to be poor. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation type="unfinished">Check the compass position within your vehicle and re-do the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <source>Sensor Settings</source>
-      <translation type="unfinished">Sensor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <source>Accelerometer calibration complete</source>
-      <translation type="unfinished">Accelerometer calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <source>Compass calibration complete</source>
-      <translation type="unfinished">Compass calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(primary</source>
-      <translation type="unfinished">(primary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(secondary</source>
-      <translation type="unfinished">(secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <source>Use Compass</source>
-      <translation type="unfinished">Use Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <source>Shown in the indicator bars is the quality of the calibration for each compass.
-
-</source>
-      <translation type="unfinished">Shown in the indicator bars is the quality of the calibration for each compass.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <source>Compass %1 </source>
-      <translation type="unfinished">Compass %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <source>, </source>
-      <translation type="unfinished">, </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>external</source>
-      <translation type="unfinished">external</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>internal</source>
-      <translation type="unfinished">internal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <source>- Green indicates a well functioning compass.
-</source>
-      <translation type="unfinished">- Green indicates a well functioning compass.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <source>- Yellow indicates a questionable compass or calibration.
-</source>
-      <translation type="unfinished">- Yellow indicates a questionable compass or calibration.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <source>- Red indicates a compass which should not be used.
-
-</source>
-      <translation type="unfinished">- Red indicates a compass which should not be used.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 1</source>
-      <translation type="unfinished">Priority 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 2</source>
-      <translation type="unfinished">Priority 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 3</source>
-      <translation type="unfinished">Priority 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Not Set</source>
-      <translation type="unfinished">Not Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <source>Orientation:</source>
-      <translation type="unfinished">Orientation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <source>Autopilot Rotation:</source>
-      <translation type="unfinished">Autopilot Rotation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <source>Magnetic Declination</source>
-      <translation type="unfinished">Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <source>Manual Magnetic Declination</source>
-      <translation type="unfinished">Manual Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation type="unfinished">This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <source>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </source>
-      <translation type="unfinished">CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <source>It is technically possible to set-up CompassMot using throttle but this is not recommended.</source>
-      <translation type="unfinished">It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <source>Disconnect your props, flip them over and rotate them one position around the frame. </source>
-      <translation type="unfinished">Disconnect your props, flip them over and rotate them one position around the frame. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <source>In this configuration they should push the copter down into the ground when the throttle is raised.</source>
-      <translation type="unfinished">In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <source>Secure the copter (perhaps with tape) so that it does not move.</source>
-      <translation type="unfinished">Secure the copter (perhaps with tape) so that it does not move.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <source>Turn on your transmitter and keep throttle at zero.</source>
-      <translation type="unfinished">Turn on your transmitter and keep throttle at zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <source>Click Ok to start CompassMot calibration.</source>
-      <translation type="unfinished">Click Ok to start CompassMot calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>depth</source>
-      <translation type="unfinished">depth</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>altitude</source>
-      <translation type="unfinished">altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <source>Pressure calibration will set the %1 to zero at the current pressure reading. %2</source>
-      <translation type="unfinished">Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <source>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Accelerometer must be calibrated prior to Compass.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Compass.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Level Horizon.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Baro/Airspeed</source>
-      <translation type="unfinished">Baro/Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Pressure</source>
-      <translation type="unfinished">Pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <source>CompassMot</source>
-      <translation type="unfinished">CompassMot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <source>CompassMot - Compass Motor Interference Calibration</source>
-      <translation type="unfinished">CompassMot - Compass Motor Interference Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="21"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="33"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="186"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="203"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="267"/>
-      <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation type="unfinished">Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="347"/>
-      <source>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</source>
-      <translation type="unfinished">Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="348"/>
-      <source>Quickly bring the throttle back down to zero</source>
-      <translation type="unfinished">Quickly bring the throttle back down to zero</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
-      <source>Press the Next button to complete the calibration</source>
-      <translation type="unfinished">Press the Next button to complete the calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="358"/>
-      <source>Hold the vehicle in its level flight position.</source>
-      <translation type="unfinished">Hold the vehicle in its level flight position.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="367"/>
-      <source>Requesting pressure calibration...</source>
-      <translation type="unfinished">Requesting pressure calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="376"/>
-      <source>Requesting gyro calibration...</source>
-      <translation type="unfinished">Requesting gyro calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="506"/>
-      <source>Successfully completed</source>
-      <translation type="unfinished">Successfully completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="510"/>
-      <source>Failed</source>
-      <translation type="unfinished">Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="302"/>
-      <source>Hold still in the current orientation and press Next when ready</source>
-      <translation type="unfinished">Hold still in the current orientation and press Next when ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="558"/>
-      <source>Compass %1 calibration complete</source>
-      <translation type="unfinished">Compass %1 calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="560"/>
-      <source>Compass %1 calibration below quality threshold</source>
-      <translation type="unfinished">Compass %1 calibration below quality threshold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="579"/>
-      <source>All compasses calibrated successfully</source>
-      <translation type="unfinished">All compasses calibrated successfully</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="580"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="583"/>
-      <source>Compass calibration failed</source>
-      <translation type="unfinished">Compass calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="584"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="588"/>
-      <source>Continue rotating...</source>
-      <translation type="unfinished">Continue rotating...</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <source>Compass </source>
-      <translation type="unfinished">Compass </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <source>Not installed</source>
-      <translation type="unfinished">Not installed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <source>Accelerometer(s)</source>
-      <translation type="unfinished">Accelerometer(s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="21"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="32"/>
-      <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <source>Frame selection</source>
-      <translation type="unfinished">Frame selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <source>Would you like to load the default parameters for the frame ?</source>
-      <translation type="unfinished">Would you like to load the default parameters for the frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <source>Would you like to set the desired frame ?</source>
-      <translation type="unfinished">Would you like to set the desired frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <source>Yes, Load default parameter set for %1</source>
-      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <source>No, set frame only</source>
-      <translation type="unfinished">No, set frame only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <source>Confirm frame %1</source>
-      <translation type="unfinished">Confirm frame %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <source>Git Revision</source>
-      <translation type="unfinished">Git Revision</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <source>Reverse Motor Direction</source>
-      <translation type="unfinished">Reverse Motor Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="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">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.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <source>A 10 second coooldown is required before testing again, please stand by...</source>
-      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
-      <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <source>Automatic Motor Direction Detection</source>
-      <translation type="unfinished">Automatic Motor Direction Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <source>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</source>
-      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="18"/>
-      <source>Tuning</source>
-      <translation type="unfinished">Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="29"/>
-      <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <source>Basic Tuning</source>
-      <translation type="unfinished">Basic Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <source>Roll/Pitch Sensitivity</source>
-      <translation type="unfinished">Roll/Pitch Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
-      <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <source>Climb Sensitivity</source>
-      <translation type="unfinished">Climb Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
-      <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <source>RC Roll/Pitch Feel</source>
-      <translation type="unfinished">RC Roll/Pitch Feel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <source>Slide to the left for soft control, slide to the right for crisp control</source>
-      <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <source>Spin While Armed</source>
-      <translation type="unfinished">Spin While Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <source>Adjust the amount the motors spin to indicate armed</source>
-      <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <source>Minimum Thrust</source>
-      <translation type="unfinished">Minimum Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
-      <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
-      <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <source>AutoTune</source>
-      <translation type="unfinished">AutoTune</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <source>Axes to AutoTune:</source>
-      <translation type="unfinished">Axes to AutoTune:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <source>Channel for AutoTune switch:</source>
-      <translation type="unfinished">Channel for AutoTune switch:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <source>In Flight Tuning</source>
-      <translation type="unfinished">In Flight Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <source>RC Channel 6 Option (Tuning):</source>
-      <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <source>Min:</source>
-      <translation type="unfinished">Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <source>Max:</source>
-      <translation type="unfinished">Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <source>Attitude Controller Parameters</source>
-      <translation type="unfinished">Attitude Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <source>Position Controller Parameters</source>
-      <translation type="unfinished">Position Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <source>Waypoint navigation parameters</source>
-      <translation type="unfinished">Waypoint navigation parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirMapManager</name>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="178"/>
-      <source>AirMap Enabled</source>
-      <translation type="unfinished">AirMap Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="186"/>
-      <source>Failed to create airmap::services::Client instance</source>
-      <translation type="unfinished">Failed to create airmap::services::Client instance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="198"/>
-      <source>No API key for AirMap</source>
-      <translation type="unfinished">No API key for AirMap</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="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">This configuration can only be modified through the Parameter Editor.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
-      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <source>Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
-      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
-      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <source>You&apos;ve connected a %1.</source>
-      <translation type="unfinished">You&apos;ve connected a %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <source>Airframe is not set.</source>
-      <translation type="unfinished">Airframe is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="19"/>
-      <source>Airframe</source>
-      <translation type="unfinished">Airframe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="31"/>
-      <source>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
-      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="85"/>
-      <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation type="unfinished">You cannot change airframe configuration while connected to multiple vehicles.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <source>System ID</source>
-      <translation type="unfinished">System ID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <source>Airframe type</source>
-      <translation type="unfinished">Airframe type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <source>Custom Fw. Ver.</source>
-      <translation type="unfinished">Custom Fw. Ver.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirmapSettings</name>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="67"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="84"/>
-      <source>Enable AirMap Services</source>
-      <translation type="unfinished">Enable AirMap Services</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="89"/>
-      <source>Enable Telemetry</source>
-      <translation type="unfinished">Enable Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="96"/>
-      <source>Show Airspace on Map (Experimental)</source>
-      <translation type="unfinished">Show Airspace on Map (Experimental)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="104"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="113"/>
-      <source>Clear Saved Answers</source>
-      <translation type="unfinished">Clear Saved Answers</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="114"/>
-      <source>All saved ruleset answers will be cleared. Is this really what you want?</source>
-      <translation type="unfinished">All saved ruleset answers will be cleared. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="136"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="205"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="176"/>
-      <source>Login / Registration</source>
-      <translation type="unfinished">Login / Registration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="192"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="292"/>
-      <source>User Name:</source>
-      <translation type="unfinished">User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="208"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="210"/>
-      <source>Anonymous</source>
-      <translation type="unfinished">Anonymous</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="212"/>
-      <source>Authenticated</source>
-      <translation type="unfinished">Authenticated</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="214"/>
-      <source>Authentication Error</source>
-      <translation type="unfinished">Authentication Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="220"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="241"/>
-      <source>Forgot Your AirMap Password?</source>
-      <translation type="unfinished">Forgot Your AirMap Password?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="251"/>
-      <source>Register for an AirMap Account</source>
-      <translation type="unfinished">Register for an AirMap Account</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="272"/>
-      <source>Pilot Profile (WIP)</source>
-      <translation type="unfinished">Pilot Profile (WIP)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="290"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="291"/>
-      <source>John Doe</source>
-      <translation type="unfinished">John Doe</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="293"/>
-      <source>joe36</source>
-      <translation type="unfinished">joe36</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="294"/>
-      <source>Email:</source>
-      <translation type="unfinished">Email:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="295"/>
-      <source>jonh@doe.com</source>
-      <translation type="unfinished">jonh@doe.com</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="296"/>
-      <source>Phone:</source>
-      <translation type="unfinished">Phone:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="297"/>
-      <source>+1 212 555 1212</source>
-      <translation type="unfinished">+1 212 555 1212</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="310"/>
-      <source>License</source>
-      <translation type="unfinished">License</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="329"/>
-      <source>Personal API Key</source>
-      <translation type="unfinished">Personal API Key</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="339"/>
-      <source>API Key:</source>
-      <translation type="unfinished">API Key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="341"/>
-      <source>Client ID:</source>
-      <translation type="unfinished">Client ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="355"/>
-      <source>Flight List Management</source>
-      <translation type="unfinished">Flight List Management</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="367"/>
-      <source>Show Flight List</source>
-      <translation type="unfinished">Show Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="421"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="433"/>
-      <source>Created</source>
-      <translation type="unfinished">Created</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="448"/>
-      <source>Flight Start</source>
-      <translation type="unfinished">Flight Start</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="463"/>
-      <source>Flight End</source>
-      <translation type="unfinished">Flight End</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="478"/>
-      <source>State</source>
-      <translation type="unfinished">State</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Active</source>
-      <translation type="unfinished">Active</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="499"/>
-      <source>Loading Flight List</source>
-      <translation type="unfinished">Loading Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="531"/>
-      <source>Flight List</source>
-      <translation type="unfinished">Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="546"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="555"/>
-      <source>From</source>
-      <translation type="unfinished">From</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="576"/>
-      <source>To</source>
-      <translation type="unfinished">To</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="593"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="609"/>
-      <source>End Selected</source>
-      <translation type="unfinished">End Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="627"/>
-      <source>End Flight</source>
-      <translation type="unfinished">End Flight</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="628"/>
-      <source>Confirm ending active flight?</source>
-      <translation type="unfinished">Confirm ending active flight?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="642"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source> Flights Loaded</source>
-      <translation type="unfinished"> Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source>No Flights Loaded</source>
-      <translation type="unfinished">No Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="657"/>
-      <source>A maximum of 250 flights were loaded</source>
-      <translation type="unfinished">A maximum of 250 flights were loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="665"/>
-      <source>Flight Area </source>
-      <translation type="unfinished">Flight Area </translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceAdvisory</name>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="30"/>
-      <source>Airport</source>
-      <translation type="unfinished">Airport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="31"/>
-      <source>Controlled Airspace</source>
-      <translation type="unfinished">Controlled Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="32"/>
-      <source>Special Use Airspace</source>
-      <translation type="unfinished">Special Use Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="33"/>
-      <source>TFR</source>
-      <translation type="unfinished">TFR</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="34"/>
-      <source>Wild Fire</source>
-      <translation type="unfinished">Wild Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="35"/>
-      <source>Park</source>
-      <translation type="unfinished">Park</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="36"/>
-      <source>Power Plant</source>
-      <translation type="unfinished">Power Plant</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="37"/>
-      <source>Heliport</source>
-      <translation type="unfinished">Heliport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="38"/>
-      <source>Prison</source>
-      <translation type="unfinished">Prison</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="39"/>
-      <source>School</source>
-      <translation type="unfinished">School</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="40"/>
-      <source>Hospital</source>
-      <translation type="unfinished">Hospital</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="41"/>
-      <source>Fire</source>
-      <translation type="unfinished">Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="42"/>
-      <source>Emergency</source>
-      <translation type="unfinished">Emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="43"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="44"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceControl</name>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="109"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="200"/>
-      <source>Airspace</source>
-      <translation type="unfinished">Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="113"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="204"/>
-      <source> Advisories</source>
-      <translation type="unfinished"> Advisories</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="130"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="280"/>
-      <source>Airspace Regulations</source>
-      <translation type="unfinished">Airspace Regulations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="285"/>
-      <source>Advisories based on the selected rules.</source>
-      <translation type="unfinished">Advisories based on the selected rules.</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="326"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>File Flight Plan</source>
-      <translation type="unfinished">File Flight Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="384"/>
-      <source>Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</source>
-      <translation type="unfinished">Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="434"/>
-      <source>Airspace Regulation Options</source>
-      <translation type="unfinished">Airspace Regulation Options</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="456"/>
-      <source>PICK ONE REGULATION</source>
-      <translation type="unfinished">PICK ONE REGULATION</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="477"/>
-      <source>OPTIONAL</source>
-      <translation type="unfinished">OPTIONAL</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="497"/>
-      <source>REQUIRED</source>
-      <translation type="unfinished">REQUIRED</translation>
-    </message>
-  </context>
-  <context>
-    <name>AltModeDialog</name>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
-      <source>Select Altitude Mode</source>
-      <translation type="unfinished">Select Altitude Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="47"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="48"/>
-      <source>Specified altitudes are relative to launch position height.</source>
-      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="53"/>
-      <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
-      <source>Calculated Above Terrain</source>
-      <translation type="unfinished">Calculated Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="58"/>
-      <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="63"/>
-      <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="68"/>
-      <source>The altitude mode can differ for each individual item.</source>
-      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppLogModel</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.cc" line="108"/>
-      <source>Open console log output file failed %1 : %2</source>
-      <translation type="unfinished">Open console log output file failed %1 : %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppMessages</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
-      <source>GStreamer Debug Level</source>
-      <translation type="unfinished">GStreamer Debug Level</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
-      <source>Logging categories</source>
-      <translation type="unfinished">Logging categories</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="170"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="181"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="189"/>
-      <source>Clear All</source>
-      <translation type="unfinished">Clear All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>Log files (*.txt)</source>
-      <translation type="unfinished">Log files (*.txt)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
-      <source>Select log save file</source>
-      <translation type="unfinished">Select log save file</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
-      <source>Save App Log</source>
-      <translation type="unfinished">Save App Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
-      <source>Show Latest</source>
-      <translation type="unfinished">Show Latest</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
-      <source>Set Logging</source>
-      <translation type="unfinished">Set Logging</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppSettings</name>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="30"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="31"/>
-      <source>Telemetry</source>
-      <translation type="unfinished">Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="32"/>
-      <source>Missions</source>
-      <translation type="unfinished">Missions</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="33"/>
-      <source>Logs</source>
-      <translation type="unfinished">Logs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="34"/>
-      <source>Video</source>
-      <translation type="unfinished">Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="35"/>
-      <source>Photo</source>
-      <translation type="unfinished">Photo</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="36"/>
-      <source>CrashLogs</source>
-      <translation type="unfinished">CrashLogs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="182"/>
-      <source> (Partial)</source>
-      <translation type="unfinished"> (Partial)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="191"/>
-      <source> (Test only)</source>
-      <translation type="unfinished"> (Test only)</translation>
-    </message>
-  </context>
-  <context>
-    <name>ArmedIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-  </context>
-  <context>
-    <name>AudioOutput</name>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="155"/>
-      <source> negative </source>
-      <translation type="unfinished"> negative </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="166"/>
-      <source> point </source>
-      <translation type="unfinished"> point </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="177"/>
-      <source> meters</source>
-      <translation type="unfinished"> meters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
-      <source>One or more vehicle components require setup prior to flight.</source>
-      <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Autotune</name>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="37"/>
-      <source>Autotune: In progress</source>
-      <translation type="unfinished">Autotune: In progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="90"/>
-      <source>Autotune: initializing</source>
-      <translation type="unfinished">Autotune: initializing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="93"/>
-      <source>Autotune: roll</source>
-      <translation type="unfinished">Autotune: roll</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="96"/>
-      <source>Autotune: pitch</source>
-      <translation type="unfinished">Autotune: pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="99"/>
-      <source>Autotune: yaw</source>
-      <translation type="unfinished">Autotune: yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="102"/>
-      <source>Wait for disarm</source>
-      <translation type="unfinished">Wait for disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
-      <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="110"/>
-      <source>Autotune: in progress</source>
-      <translation type="unfinished">Autotune: in progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
-      <source>Autotune: Success</source>
-      <translation type="unfinished">Autotune: Success</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="119"/>
-      <source>Autotune successful.</source>
-      <translation type="unfinished">Autotune successful.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="122"/>
-      <source>Autotune: Unknown error</source>
-      <translation type="unfinished">Autotune: Unknown error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="134"/>
-      <source>Autotune: Failed</source>
-      <translation type="unfinished">Autotune: Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="144"/>
-      <source>Autotune: Ack error %1</source>
-      <translation type="unfinished">Autotune: Ack error %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.h" line="59"/>
-      <source>Autotune: Not performed</source>
-      <translation type="unfinished">Autotune: Not performed</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutotuneUI</name>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="27"/>
-      <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="37"/>
-      <source>WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</source>
-      <translation type="unfinished">WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>AxisMonitor</name>
-    <message>
-      <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-  </context>
-  <context>
-    <name>BatteryIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="82"/>
-      <source>100%</source>
-      <translation type="unfinished">100%</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="145"/>
-      <source>Battery Status</source>
-      <translation type="unfinished">Battery Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="168"/>
-      <source>Battery %1</source>
-      <translation type="unfinished">Battery %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="169"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="170"/>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="171"/>
-      <source>Remaining</source>
-      <translation type="unfinished">Remaining</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="172"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="173"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="174"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="175"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-  </context>
-  <context>
-    <name>BlankPlanCreator</name>
-    <message>
-      <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
-      <source>Blank</source>
-      <translation type="unfinished">Blank</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothConfiguration</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="222"/>
-      <source>Bluetooth Link Settings</source>
-      <translation type="unfinished">Bluetooth Link Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="224"/>
-      <source>Bluetooth Not Available</source>
-      <translation type="unfinished">Bluetooth Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothLink</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="185"/>
-      <source>Bluetooth Link Error</source>
-      <translation type="unfinished">Bluetooth Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="31"/>
-      <source>Device</source>
-      <translation type="unfinished">Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="37"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="44"/>
-      <source>Bluetooth Devices</source>
-      <translation type="unfinished">Bluetooth Devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="67"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="73"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-  </context>
-  <context>
-    <name>Bootloader</name>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="224"/>
-      <source>Write failed: %1</source>
-      <translation type="unfinished">Write failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="229"/>
-      <source>Incorrect number of bytes returned for write: actual(%1) expected(%2)</source>
-      <translation type="unfinished">Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="250"/>
-      <source>Timeout waiting for bytes to be available</source>
-      <translation type="unfinished">Timeout waiting for bytes to be available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="260"/>
-      <source>Read failed: error: %1</source>
-      <translation type="unfinished">Read failed: error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="274"/>
-      <source>Get Command Response: </source>
-      <translation type="unfinished">Get Command Response: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="280"/>
-      <source>Invalid sync response: 0x%1 0x%2</source>
-      <translation type="unfinished">Invalid sync response: 0x%1 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="283"/>
-      <source>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</source>
-      <translation type="unfinished">This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="286"/>
-      <source>Unknown response code</source>
-      <translation type="unfinished">Unknown response code</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="292"/>
-      <source>Command failed: 0x%1 (%2)</source>
-      <translation type="unfinished">Command failed: 0x%1 (%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="156"/>
-      <source>Get Board Info: </source>
-      <translation type="unfinished">Get Board Info: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="342"/>
-      <source>Send Command: </source>
-      <translation type="unfinished">Send Command: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="350"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="516"/>
-      <source>Unable to open firmware file %1: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="371"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="541"/>
-      <source>Firmware file read failed: %1</source>
-      <translation type="unfinished">Firmware file read failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="387"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="470"/>
-      <source>Flash failed: %1 at address 0x%2</source>
-      <translation type="unfinished">Flash failed: %1 at address 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="421"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="593"/>
-      <source>Unable to retrieve block from ihx: index %1</source>
-      <translation type="unfinished">Unable to retrieve block from ihx: index %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="441"/>
-      <source>Unable to set flash start address: 0x%2</source>
-      <translation type="unfinished">Unable to set flash start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="559"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="644"/>
-      <source>Read failed: %1 at address: 0x%2</source>
-      <translation type="unfinished">Read failed: %1 at address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="565"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="652"/>
-      <source>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</source>
-      <translation type="unfinished">Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="613"/>
-      <source>Unable to set read start address: 0x%2</source>
-      <translation type="unfinished">Unable to set read start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="689"/>
-      <source>CRC mismatch: board(0x%1) file(0x%2)</source>
-      <translation type="unfinished">CRC mismatch: board(0x%1) file(0x%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="40"/>
-      <source>Open failed on port %1: %2</source>
-      <translation type="unfinished">Open failed on port %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="92"/>
-      <source>Unable to put radio into command mode +++</source>
-      <translation type="unfinished">Unable to put radio into command mode +++</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="97"/>
-      <source>Radio did not respond to command mode</source>
-      <translation type="unfinished">Radio did not respond to command mode</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="105"/>
-      <source>Radio did not respond to ATI2 command</source>
-      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="112"/>
-      <source>Radio did not return board id</source>
-      <translation type="unfinished">Radio did not return board id</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="129"/>
-      <source>Found unsupported bootloader version: %1</source>
-      <translation type="unfinished">Found unsupported bootloader version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="165"/>
-      <source>Unable to reboot radio (ready read)</source>
-      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="181"/>
-      <source>Erase failed: %1</source>
-      <translation type="unfinished">Erase failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="319"/>
-      <source>Get Device: </source>
-      <translation type="unfinished">Get Device: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="747"/>
-      <source>Get Board Id: </source>
-      <translation type="unfinished">Get Board Id: </translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalc</name>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="238"/>
-      <source>CameraCalc section version %1 not supported</source>
-      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="310"/>
-      <source>Custom Camera</source>
-      <translation type="unfinished">Custom Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="315"/>
-      <source>Manual (no camera specs)</source>
-      <translation type="unfinished">Manual (no camera specs)</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcCamera</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="108"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="112"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="120"/>
-      <source>Sensor</source>
-      <translation type="unfinished">Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="135"/>
-      <source>Image</source>
-      <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="150"/>
-      <source>Focal length</source>
-      <translation type="unfinished">Focal length</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcGrid</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="47"/>
-      <source>Front Lap</source>
-      <translation type="unfinished">Front Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="51"/>
-      <source>Side Lap</source>
-      <translation type="unfinished">Side Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="59"/>
-      <source>Overlap</source>
-      <translation type="unfinished">Overlap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="72"/>
-      <source>Select one:</source>
-      <translation type="unfinished">Select one:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="102"/>
-      <source>Grnd Res</source>
-      <translation type="unfinished">Grnd Res</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <source>Vehicle must be restarted for changes to take effect.</source>
-      <translation type="unfinished">Vehicle must be restarted for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <source>Camera Trigger Settings</source>
-      <translation type="unfinished">Camera Trigger Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <source>Time Interval</source>
-      <translation type="unfinished">Time Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <source>Distance Interval</source>
-      <translation type="unfinished">Distance Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <source>Hardware Settings</source>
-      <translation type="unfinished">Hardware Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <source>AUX Pin Assignment</source>
-      <translation type="unfinished">AUX Pin Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <source>Trigger Pin Polarity</source>
-      <translation type="unfinished">Trigger Pin Polarity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <source>Trigger Period</source>
-      <translation type="unfinished">Trigger Period</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="21"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="32"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <source>Time interval</source>
-      <translation type="unfinished">Time interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <source>Distance interval</source>
-      <translation type="unfinished">Distance interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <source>AUX pins</source>
-      <translation type="unfinished">AUX pins</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <source>AUX pin polarity</source>
-      <translation type="unfinished">AUX pin polarity</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraSection</name>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="29"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="54"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="70"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="87"/>
-      <source>Mode</source>
-      <translation type="unfinished">Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="107"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="108"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropButton</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="162"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="165"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="177"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="212"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
-      <source>Follow Vehicle</source>
-      <translation type="unfinished">Follow Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropPanel</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="29"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="32"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="43"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="86"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-  </context>
-  <context>
-    <name>CompInfoParam</name>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="135"/>
-      <source>Component %1</source>
-      <translation type="unfinished">Component %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="262"/>
-      <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplexMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="57"/>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="63"/>
-      <source>This Pattern does not support Presets.</source>
-      <translation type="unfinished">This Pattern does not support Presets.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="69"/>
-      <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplianceRules</name>
-    <message>
-      <location filename="../src/Airmap/ComplianceRules.qml" line="102"/>
-      <source>Rule</source>
-      <translation type="unfinished">Rule</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="124"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="131"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
-      <source>Corridor Scan</source>
-      <translation type="unfinished">Corridor Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="54"/>
-      <source>C</source>
-      <translation type="unfinished">C</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanEditor</name>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="19"/>
-      <source>Corridor</source>
-      <translation type="unfinished">Corridor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="38"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="45"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="18"/>
-      <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="56"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-  </context>
-  <context>
-    <name>DebugWindow</name>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="38"/>
-      <source>Qt Platform:</source>
-      <translation type="unfinished">Qt Platform:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="48"/>
-      <source>Font Point Size 10</source>
-      <translation type="unfinished">Font Point Size 10</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="54"/>
-      <source>Default font width:</source>
-      <translation type="unfinished">Default font width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="64"/>
-      <source>Font Point Size 10.5</source>
-      <translation type="unfinished">Font Point Size 10.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="70"/>
-      <source>Default font height:</source>
-      <translation type="unfinished">Default font height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="80"/>
-      <source>Font Point Size 11</source>
-      <translation type="unfinished">Font Point Size 11</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="86"/>
-      <source>Default font pixel size:</source>
-      <translation type="unfinished">Default font pixel size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="96"/>
-      <source>Font Point Size 11.5</source>
-      <translation type="unfinished">Font Point Size 11.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="102"/>
-      <source>Default font point size:</source>
-      <translation type="unfinished">Default font point size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="112"/>
-      <source>Font Point Size 12</source>
-      <translation type="unfinished">Font Point Size 12</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="118"/>
-      <source>QML Screen Desktop:</source>
-      <translation type="unfinished">QML Screen Desktop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="128"/>
-      <source>Font Point Size 12.5</source>
-      <translation type="unfinished">Font Point Size 12.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="134"/>
-      <source>QML Screen Size:</source>
-      <translation type="unfinished">QML Screen Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="144"/>
-      <source>Font Point Size 13</source>
-      <translation type="unfinished">Font Point Size 13</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="150"/>
-      <source>QML Pixel Density:</source>
-      <translation type="unfinished">QML Pixel Density:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="160"/>
-      <source>Font Point Size 13.5</source>
-      <translation type="unfinished">Font Point Size 13.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="166"/>
-      <source>QML Pixel Ratio:</source>
-      <translation type="unfinished">QML Pixel Ratio:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="176"/>
-      <source>Font Point Size 14</source>
-      <translation type="unfinished">Font Point Size 14</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="182"/>
-      <source>Default Point:</source>
-      <translation type="unfinished">Default Point:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="192"/>
-      <source>Font Point Size 14.5</source>
-      <translation type="unfinished">Font Point Size 14.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="198"/>
-      <source>Computed Font Height:</source>
-      <translation type="unfinished">Computed Font Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="208"/>
-      <source>Font Point Size 15</source>
-      <translation type="unfinished">Font Point Size 15</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="214"/>
-      <source>Computed Screen Height:</source>
-      <translation type="unfinished">Computed Screen Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="224"/>
-      <source>Font Point Size 15.5</source>
-      <translation type="unfinished">Font Point Size 15.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="230"/>
-      <source>Computed Screen Width:</source>
-      <translation type="unfinished">Computed Screen Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="240"/>
-      <source>Font Point Size 16</source>
-      <translation type="unfinished">Font Point Size 16</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="246"/>
-      <source>Desktop Available Width:</source>
-      <translation type="unfinished">Desktop Available Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="256"/>
-      <source>Font Point Size 16.5</source>
-      <translation type="unfinished">Font Point Size 16.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="262"/>
-      <source>Desktop Available Height:</source>
-      <translation type="unfinished">Desktop Available Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="272"/>
-      <source>Font Point Size 17</source>
-      <translation type="unfinished">Font Point Size 17</translation>
-    </message>
-  </context>
-  <context>
-    <name>DefaultChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
-      <source>Generic Initial checks</source>
-      <translation type="unfinished">Generic Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266Component</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="33"/>
-      <source>controller WiFi Bridge</source>
-      <translation type="unfinished">controller WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="66"/>
-      <source>Error fetching WiFi Bridge Status: %1</source>
-      <translation type="unfinished">Error fetching WiFi Bridge Status: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="116"/>
-      <source>ESP WiFi Bridge Settings</source>
-      <translation type="unfinished">ESP WiFi Bridge Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="143"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="159"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="176"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="192"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="208"/>
-      <source>WiFi STA SSID</source>
-      <translation type="unfinished">WiFi STA SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="225"/>
-      <source>WiFi STA Password</source>
-      <translation type="unfinished">WiFi STA Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="242"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="258"/>
-      <source>QGC UDP Port</source>
-      <translation type="unfinished">QGC UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="277"/>
-      <source>ESP WiFi Bridge Status</source>
-      <translation type="unfinished">ESP WiFi Bridge Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
-      <source>Bridge/Vehicle Link</source>
-      <translation type="unfinished">Bridge/Vehicle Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
-      <source>Bridge/QGC Link</source>
-      <translation type="unfinished">Bridge/QGC Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="298"/>
-      <source>QGC/Bridge Link</source>
-      <translation type="unfinished">QGC/Bridge Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="304"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="319"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="333"/>
-      <source>Messages Received</source>
-      <translation type="unfinished">Messages Received</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="360"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="374"/>
-      <source>Messages Lost</source>
-      <translation type="unfinished">Messages Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="388"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="416"/>
-      <source>Messages Sent</source>
-      <translation type="unfinished">Messages Sent</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="433"/>
-      <source>Restore Defaults</source>
-      <translation type="unfinished">Restore Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="440"/>
-      <source>Restart WiFi Bridge</source>
-      <translation type="unfinished">Restart WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="451"/>
-      <source>Reboot WiFi Bridge</source>
-      <translation type="unfinished">Reboot WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="452"/>
-      <source>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</source>
-      <translation type="unfinished">This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="463"/>
-      <source>Reset Counters</source>
-      <translation type="unfinished">Reset Counters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="16"/>
-      <source>WiFi Bridge</source>
-      <translation type="unfinished">WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="28"/>
-      <source>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</source>
-      <translation type="unfinished">The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266ComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="29"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="33"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="37"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="42"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="46"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="60"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>EditPositionDialog</name>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="51"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="59"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="67"/>
-      <source>Set Geographic</source>
-      <translation type="unfinished">Set Geographic</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="79"/>
-      <source>Zone</source>
-      <translation type="unfinished">Zone</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="87"/>
-      <source>Hemisphere</source>
-      <translation type="unfinished">Hemisphere</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="96"/>
-      <source>Easting</source>
-      <translation type="unfinished">Easting</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="104"/>
-      <source>Northing</source>
-      <translation type="unfinished">Northing</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="112"/>
-      <source>Set UTM</source>
-      <translation type="unfinished">Set UTM</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
-      <source>MGRS</source>
-      <translation type="unfinished">MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
-      <source>Set MGRS</source>
-      <translation type="unfinished">Set MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
-      <source>Set From Vehicle Position</source>
-      <translation type="unfinished">Set From Vehicle Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>ExitWithErrorWindow</name>
-    <message>
-      <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FTPManager</name>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="234"/>
-      <source>Invalid Nak format</source>
-      <translation type="unfinished">Invalid Nak format</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="236"/>
-      <source>errno %1</source>
-      <translation type="unfinished">errno %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="131"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="258"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="280"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="293"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="297"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="402"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="411"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="449"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="484"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="530"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="539"/>
-      <source>Download failed</source>
-      <translation type="unfinished">Download failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="368"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="497"/>
-      <source>Download failed: Error saving file</source>
-      <translation type="unfinished">Download failed: Error saving file</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="166"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="322"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="326"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="201"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="152"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="239"/>
-      <source>* Approximate glide slope altitudes.</source>
-      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="248"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="257"/>
-      <source>* Avoid tailwind on landing.</source>
-      <translation type="unfinished">* Avoid tailwind on landing.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="283"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="290"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="332"/>
-      <source>Landing Area</source>
-      <translation type="unfinished">Landing Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="370"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-  </context>
-  <context>
-    <name>Fact</name>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="247"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>true</source>
-      <translation type="unfinished">true</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>false</source>
-      <translation type="unfinished">false</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="745"/>
-      <source>Change of parameter %1 requires a Vehicle reboot to take effect.</source>
-      <translation type="unfinished">Change of parameter %1 requires a Vehicle reboot to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="747"/>
-      <source>Change of &apos;%1&apos; value requires restart of %2 to take effect.</source>
-      <translation type="unfinished">Change of &apos;%1&apos; value requires restart of %2 to take effect.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactMetaData</name>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="39"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="40"/>
-      <source>Misc</source>
-      <translation type="unfinished">Misc</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="461"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="469"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="479"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="487"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="495"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="504"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="549"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="557"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="567"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="575"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="583"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="592"/>
-      <source>Value must be within %1 and %2</source>
-      <translation type="unfinished">Value must be within %1 and %2</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="523"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="611"/>
-      <source>Invalid number</source>
-      <translation type="unfinished">Invalid number</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactTextField</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="36"/>
-      <source>Invalid Value</source>
-      <translation type="unfinished">Invalid Value</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="40"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
-      <source>Default</source>
-      <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
-      <source>Small</source>
-      <translation type="unfinished">Small</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
-      <source>Large</source>
-      <translation type="unfinished">Large</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
-      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Load Settings</source>
-      <translation type="unfinished">Load Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueSlider</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactValueSlider.qml" line="100"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>Firmware Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="73"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="75"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="77"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareImage</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="143"/>
-      <source>Incorrectly formatted line in .ihx file, line too short</source>
-      <translation type="unfinished">Incorrectly formatted line in .ihx file, line too short</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="148"/>
-      <source>Unsupported record type in file: %1</source>
-      <translation type="unfinished">Unsupported record type in file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="218"/>
-      <source>Unable to open firmware file %1, error: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="227"/>
-      <source>Supplied file is not a valid JSON document</source>
-      <translation type="unfinished">Supplied file is not a valid JSON document</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="238"/>
-      <source>Firmware file missing required key: %1</source>
-      <translation type="unfinished">Firmware file missing required key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="248"/>
-      <source>Firmware file has invalid key: %1</source>
-      <translation type="unfinished">Firmware file has invalid key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="254"/>
-      <source>Downloaded firmware board id does not match hardware board id: %1 != %2</source>
-      <translation type="unfinished">Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="276"/>
-      <source>Write failed for parameter meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for parameter meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="283"/>
-      <source>Unable to open parameter meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open parameter meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="305"/>
-      <source>Write failed for airframe meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for airframe meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="312"/>
-      <source>Unable to open airframe meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open airframe meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="338"/>
-      <source>Unable to open decompressed file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open decompressed file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="344"/>
-      <source>Write failed for decompressed image file, error: %1</source>
-      <translation type="unfinished">Write failed for decompressed image file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="368"/>
-      <source>Firmware file has invalid decompressed size for %1</source>
-      <translation type="unfinished">Firmware file has invalid decompressed size for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="380"/>
-      <source>Could not find compressed bytes for %1 in Firmware file</source>
-      <translation type="unfinished">Could not find compressed bytes for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="385"/>
-      <source>Incorrectly formed compressed bytes section for %1 in Firmware file</source>
-      <translation type="unfinished">Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="401"/>
-      <source>Firmware file has 0 length %1</source>
-      <translation type="unfinished">Firmware file has 0 length %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="405"/>
-      <source>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</source>
-      <translation type="unfinished">Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="409"/>
-      <source>Successfully decompressed %1</source>
-      <translation type="unfinished">Successfully decompressed %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="437"/>
-      <source>Unabled to open firmware file %1, %2</source>
-      <translation type="unfinished">Unabled to open firmware file %1, %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="347"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="364"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="381"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="398"/>
-      <source>Canon</source>
-      <translation type="unfinished">Canon</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="348"/>
-      <source>S100 PowerShot</source>
-      <translation type="unfinished">S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="357"/>
-      <source>Canon S100 PowerShot</source>
-      <translation type="unfinished">Canon S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="365"/>
-      <source>EOS-M 22mm</source>
-      <translation type="unfinished">EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="374"/>
-      <source>Canon EOS-M 22mm</source>
-      <translation type="unfinished">Canon EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="382"/>
-      <source>G9 X PowerShot</source>
-      <translation type="unfinished">G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="391"/>
-      <source>Canon G9 X PowerShot</source>
-      <translation type="unfinished">Canon G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="399"/>
-      <source>SX260 HS PowerShot</source>
-      <translation type="unfinished">SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="408"/>
-      <source>Canon SX260 HS PowerShot</source>
-      <translation type="unfinished">Canon SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="414"/>
-      <source>GoPro</source>
-      <translation type="unfinished">GoPro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="415"/>
-      <source>Hero 4</source>
-      <translation type="unfinished">Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="424"/>
-      <source>GoPro Hero 4</source>
-      <translation type="unfinished">GoPro Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="430"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="446"/>
-      <source>Parrot</source>
-      <translation type="unfinished">Parrot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="431"/>
-      <source>Sequioa RGB</source>
-      <translation type="unfinished">Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="440"/>
-      <source>Parrot Sequioa RGB</source>
-      <translation type="unfinished">Parrot Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="447"/>
-      <source>Sequioa Monochrome</source>
-      <translation type="unfinished">Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="456"/>
-      <source>Parrot Sequioa Monochrome</source>
-      <translation type="unfinished">Parrot Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="462"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="463"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="472"/>
-      <source>RedEdge</source>
-      <translation type="unfinished">RedEdge</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="479"/>
-      <source>Ricoh</source>
-      <translation type="unfinished">Ricoh</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="480"/>
-      <source>GR II</source>
-      <translation type="unfinished">GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="489"/>
-      <source>Ricoh GR II</source>
-      <translation type="unfinished">Ricoh GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="495"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="511"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="527"/>
-      <source>Sentera</source>
-      <translation type="unfinished">Sentera</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="496"/>
-      <source>Double 4K Sensor</source>
-      <translation type="unfinished">Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="505"/>
-      <source>Sentera Double 4K Sensor</source>
-      <translation type="unfinished">Sentera Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="512"/>
-      <source>NDVI Single Sensor</source>
-      <translation type="unfinished">NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="521"/>
-      <source>Sentera NDVI Single Sensor</source>
-      <translation type="unfinished">Sentera NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="528"/>
-      <source>6X Sensor</source>
-      <translation type="unfinished">6X Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="545"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="561"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="577"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="593"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="609"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="625"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="641"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="657"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="673"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="689"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="705"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="724"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="742"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="759"/>
-      <source>Sony</source>
-      <translation type="unfinished">Sony</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="546"/>
-      <source>a6000 16mm</source>
-      <translation type="unfinished">a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="555"/>
-      <source>Sony a6000 16mm</source>
-      <translation type="unfinished">Sony a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="562"/>
-      <source>a6000 35mm</source>
-      <translation type="unfinished">a6000 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="578"/>
-      <source>a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="587"/>
-      <source>Sony a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="594"/>
-      <source>a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="603"/>
-      <source>Sony a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="610"/>
-      <source>a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="619"/>
-      <source>Sony a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="626"/>
-      <source>a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="635"/>
-      <source>Sony a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="642"/>
-      <source>a7r III 35mm</source>
-      <translation type="unfinished">a7r III 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="658"/>
-      <source>a7r IV 35mm</source>
-      <translation type="unfinished">a7r IV 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="674"/>
-      <source>DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="683"/>
-      <source>Sony DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">Sony DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="690"/>
-      <source>DSC-RX0</source>
-      <translation type="unfinished">DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="699"/>
-      <source>Sony DSC-RX0</source>
-      <translation type="unfinished">Sony DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="706"/>
-      <source>DSC-RX1R II 35mm</source>
-      <translation type="unfinished">DSC-RX1R II 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="725"/>
-      <source>ILCE-QX1</source>
-      <translation type="unfinished">ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="734"/>
-      <source>Sony ILCE-QX1</source>
-      <translation type="unfinished">Sony ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="743"/>
-      <source>NEX-5R 20mm</source>
-      <translation type="unfinished">NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="752"/>
-      <source>Sony NEX-5R 20mm</source>
-      <translation type="unfinished">Sony NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="760"/>
-      <source>RX100 II 28mm</source>
-      <translation type="unfinished">RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="769"/>
-      <source>Sony RX100 II 28mm</source>
-      <translation type="unfinished">Sony RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="775"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="791"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="807"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="823"/>
-      <source>Yuneec</source>
-      <translation type="unfinished">Yuneec</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="776"/>
-      <source>CGOET</source>
-      <translation type="unfinished">CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="785"/>
-      <source>Yuneec CGOET</source>
-      <translation type="unfinished">Yuneec CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="792"/>
-      <source>E10T</source>
-      <translation type="unfinished">E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="801"/>
-      <source>Yuneec E10T</source>
-      <translation type="unfinished">Yuneec E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="808"/>
-      <source>E50</source>
-      <translation type="unfinished">E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="817"/>
-      <source>Yuneec E50</source>
-      <translation type="unfinished">Yuneec E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="824"/>
-      <source>E90</source>
-      <translation type="unfinished">E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="833"/>
-      <source>Yuneec E90</source>
-      <translation type="unfinished">Yuneec E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="839"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="855"/>
-      <source>Flir</source>
-      <translation type="unfinished">Flir</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="840"/>
-      <source>Duo R</source>
-      <translation type="unfinished">Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="849"/>
-      <source>Flir Duo R</source>
-      <translation type="unfinished">Flir Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="856"/>
-      <source>Duo Pro R</source>
-      <translation type="unfinished">Duo Pro R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="871"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="887"/>
-      <source>Workswell</source>
-      <translation type="unfinished">Workswell</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="872"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="888"/>
-      <source>Wiris Security</source>
-      <translation type="unfinished">Wiris Security</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="1061"/>
-      <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
-      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="28"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="44"/>
-      <source>Firmware Setup</source>
-      <translation type="unfinished">Firmware Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="47"/>
-      <source>%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</source>
-      <translation type="unfinished">%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="48"/>
-      <source>Update the autopilot firmware to the latest version</source>
-      <translation type="unfinished">Update the autopilot firmware to the latest version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="52"/>
-      <source>All %1 connections to vehicles must be </source>
-      <translation type="unfinished">All %1 connections to vehicles must be </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="70"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="82"/>
-      <source>Select Firmware File</source>
-      <translation type="unfinished">Select Firmware File</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
-      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="127"/>
-      <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
-      <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="128"/>
-      <source>Detected [%1]: </source>
-      <translation type="unfinished">Detected [%1]: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="135"/>
-      <source>Found device</source>
-      <translation type="unfinished">Found device</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="177"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="331"/>
-      <source>PX4 Pro </source>
-      <translation type="unfinished">PX4 Pro </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="242"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="276"/>
-      <source>Standard Version (stable)</source>
-      <translation type="unfinished">Standard Version (stable)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="246"/>
-      <source>Beta Testing (beta)</source>
-      <translation type="unfinished">Beta Testing (beta)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="250"/>
-      <source>Developer Build (master)</source>
-      <translation type="unfinished">Developer Build (master)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="254"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="280"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="293"/>
-      <source>Custom firmware file...</source>
-      <translation type="unfinished">Custom firmware file...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="263"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="267"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="344"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="289"/>
-      <source>Standard Version</source>
-      <translation type="unfinished">Standard Version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="313"/>
-      <source>Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</source>
-      <translation type="unfinished">Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="314"/>
-      <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
-      <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="315"/>
-      <source>Press Ok to upgrade your vehicle.</source>
-      <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="318"/>
-      <source>Flight Stack</source>
-      <translation type="unfinished">Flight Stack</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="386"/>
-      <source>Downloading list of available firmwares...</source>
-      <translation type="unfinished">Downloading list of available firmwares...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="394"/>
-      <source>No Firmware Available</source>
-      <translation type="unfinished">No Firmware Available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="444"/>
-      <source>Select the standard version or one from the file system (previously downloaded):</source>
-      <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="445"/>
-      <source>Select which version of the firmware you would like to install:</source>
-      <translation type="unfinished">Select which version of the firmware you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="446"/>
-      <source>Select which version of the above flight stack you would like to install:</source>
-      <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="461"/>
-      <source>WARNING: BETA FIRMWARE. </source>
-      <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="462"/>
-      <source>This firmware version is ONLY intended for beta testers. </source>
-      <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="463"/>
-      <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
-      <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="464"/>
-      <source>Do NOT use for normal operation.</source>
-      <translation type="unfinished">Do NOT use for normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="467"/>
-      <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
-      <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="468"/>
-      <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
-      <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="469"/>
-      <source>It is only intended for DEVELOPERS. </source>
-      <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="470"/>
-      <source>Run bench tests without props first. </source>
-      <translation type="unfinished">Run bench tests without props first. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="471"/>
-      <source>Do NOT fly this without additional safety precautions. </source>
-      <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="472"/>
-      <source>Follow the forums actively when using it.</source>
-      <translation type="unfinished">Follow the forums actively when using it.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="512"/>
-      <source>Flash ChibiOS Bootloader</source>
-      <translation type="unfinished">Flash ChibiOS Bootloader</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgradeController</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="162"/>
-      <source>Connect not allowed during Firmware Upgrade.</source>
-      <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="280"/>
-      <source>Connected to bootloader:</source>
-      <translation type="unfinished">Connected to bootloader:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="281"/>
-      <source>  Version: %1</source>
-      <translation type="unfinished">  Version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="282"/>
-      <source>  Board ID: %1</source>
-      <translation type="unfinished">  Board ID: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="283"/>
-      <source>  Flash size: %1</source>
-      <translation type="unfinished">  Flash size: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="366"/>
-      <source>Custom firmware selected but no filename given.</source>
-      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="371"/>
-      <source>Unable to find specified firmware for board type</source>
-      <translation type="unfinished">Unable to find specified firmware for board type</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="377"/>
-      <source>No firmware file selected</source>
-      <translation type="unfinished">No firmware file selected</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="388"/>
-      <source>Downloading firmware...</source>
-      <translation type="unfinished">Downloading firmware...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="389"/>
-      <source> From: %1</source>
-      <translation type="unfinished"> From: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="410"/>
-      <source>Download complete</source>
-      <translation type="unfinished">Download complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="418"/>
-      <source>Image load failed</source>
-      <translation type="unfinished">Image load failed</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="424"/>
-      <source>Bootloader not found</source>
-      <translation type="unfinished">Bootloader not found</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="429"/>
-      <source>Image size of %1 is too large for board flash size %2</source>
-      <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="461"/>
-      <source>Upgrade complete</source>
-      <translation type="unfinished">Upgrade complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="519"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="595"/>
-      <source>Choose board type</source>
-      <translation type="unfinished">Choose board type</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
-      <source>Fixed Wing Initial Checks</source>
-      <translation type="unfinished">Fixed Wing Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
-      <source>Fixed Wing Landing</source>
-      <translation type="unfinished">Fixed Wing Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="98"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightBrief</name>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="32"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="51"/>
-      <source>Authorizations</source>
-      <translation type="unfinished">Authorizations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="96"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="128"/>
-      <source>Authorization Pending</source>
-      <translation type="unfinished">Authorization Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="98"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="130"/>
-      <source>Authorization Accepted</source>
-      <translation type="unfinished">Authorization Accepted</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="100"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="132"/>
-      <source>Authorization Rejected</source>
-      <translation type="unfinished">Authorization Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="101"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="135"/>
-      <source>Authorization Unknown</source>
-      <translation type="unfinished">Authorization Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="134"/>
-      <source>Authorization Not Required</source>
-      <translation type="unfinished">Authorization Not Required</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="144"/>
-      <source>Rules &amp; Compliance</source>
-      <translation type="unfinished">Rules &amp; Compliance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="149"/>
-      <source>Rules you may be violating</source>
-      <translation type="unfinished">Rules you may be violating</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="159"/>
-      <source>Rules needing more information</source>
-      <translation type="unfinished">Rules needing more information</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="169"/>
-      <source>Rules you should review</source>
-      <translation type="unfinished">Rules you should review</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="179"/>
-      <source>Rules you are following</source>
-      <translation type="unfinished">Rules you are following</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="198"/>
-      <source>Update Plan</source>
-      <translation type="unfinished">Update Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="210"/>
-      <source>Submit Plan</source>
-      <translation type="unfinished">Submit Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="223"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDetails</name>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="32"/>
-      <source>Flight Details</source>
-      <translation type="unfinished">Flight Details</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="51"/>
-      <source>Flight Date &amp; Time</source>
-      <translation type="unfinished">Flight Date &amp; Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="71"/>
-      <location filename="../src/Airmap/FlightDetails.qml" line="141"/>
-      <source>Now</source>
-      <translation type="unfinished">Now</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="82"/>
-      <source>Today</source>
-      <translation type="unfinished">Today</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="96"/>
-      <source>Flight Start Time</source>
-      <translation type="unfinished">Flight Start Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="146"/>
-      <source>Duration</source>
-      <translation type="unfinished">Duration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="186"/>
-      <source>Flight Context</source>
-      <translation type="unfinished">Flight Context</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDisplayViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>WAITING FOR VIDEO</source>
-      <translation type="unfinished">WAITING FOR VIDEO</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>VIDEO DISABLED</source>
-      <translation type="unfinished">VIDEO DISABLED</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightMap</name>
-    <message>
-      <location filename="../src/FlightMap/FlightMap.qml" line="69"/>
-      <source>Specify Position</source>
-      <translation type="unfinished">Specify Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeDropdown</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeDropdown.qml" line="22"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeMenu</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeMenu.qml" line="20"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="24"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="35"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <source>Mode switch</source>
-      <translation type="unfinished">Mode switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <source>Flight Mode %1 </source>
-      <translation type="unfinished">Flight Mode %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <source>Position Ctl switch</source>
-      <translation type="unfinished">Position Ctl switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <source>Loiter switch</source>
-      <translation type="unfinished">Loiter switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <source>Return switch</source>
-      <translation type="unfinished">Return switch</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewAirspaceIndicator</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
-      <source>Approval Pending</source>
-      <translation type="unfinished">Approval Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
-      <source>Flight Approved</source>
-      <translation type="unfinished">Flight Approved</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
-      <source>Flight Rejected</source>
-      <translation type="unfinished">Flight Rejected</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMap</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="346"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="371"/>
-      <source>Go here</source>
-      <comment>Go to location waypoint</comment>
-      <translation type="unfinished">Go here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="474"/>
-      <source>ROI here</source>
-      <comment>Make this a Region Of Interest</comment>
-      <translation type="unfinished">ROI here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="510"/>
-      <source>Orbit</source>
-      <comment>Orbit waypoint</comment>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="522"/>
-      <source>Go to location</source>
-      <translation type="unfinished">Go to location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="531"/>
-      <source>Orbit at location</source>
-      <translation type="unfinished">Orbit at location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="540"/>
-      <source>ROI at location</source>
-      <translation type="unfinished">ROI at location</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMissionCompleteDialog</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="44"/>
-      <source>Flight Plan complete</source>
-      <translation type="unfinished">Flight Plan complete</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="80"/>
-      <source>%1 Images Taken</source>
-      <translation type="unfinished">%1 Images Taken</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="87"/>
-      <source>Remove plan from vehicle</source>
-      <translation type="unfinished">Remove plan from vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="98"/>
-      <source>Leave plan on vehicle</source>
-      <translation type="unfinished">Leave plan on vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="116"/>
-      <source>Resume Mission From Waypoint %1</source>
-      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="127"/>
-      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
-      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="135"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewPreFlightChecklistPopup</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
-      <source>Pre-Flight Checklist</source>
-      <translation type="unfinished">Pre-Flight Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStrip</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStripActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStripActionList.qml" line="22"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="68"/>
-      <source>Double-click to exit full screen</source>
-      <translation type="unfinished">Double-click to exit full screen</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewWidgetLayer</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="89"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="95"/>
-      <source>Multi-Vehicle</source>
-      <translation type="unfinished">Multi-Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Status</source>
-      <translation type="unfinished">GPS Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Data Unavailable</source>
-      <translation type="unfinished">GPS Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
-      <source>GPS Count:</source>
-      <translation type="unfinished">GPS Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
-      <source>GPS Lock:</source>
-      <translation type="unfinished">GPS Lock:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
-      <source>HDOP:</source>
-      <translation type="unfinished">HDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="70"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="72"/>
-      <source>--.--</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">--.--</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
-      <source>VDOP:</source>
-      <translation type="unfinished">VDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="71"/>
-      <source>Course Over Ground:</source>
-      <translation type="unfinished">Course Over Ground:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSRTKIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>Survey-in Active</source>
-      <translation type="unfinished">Survey-in Active</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>RTK Streaming</source>
-      <translation type="unfinished">RTK Streaming</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="61"/>
-      <source>Duration:</source>
-      <translation type="unfinished">Duration:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Accuracy:</source>
-      <translation type="unfinished">Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Current Accuracy:</source>
-      <translation type="unfinished">Current Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="77"/>
-      <source>Satellites:</source>
-      <translation type="unfinished">Satellites:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeneralSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="407"/>
-      <source>Units</source>
-      <translation type="unfinished">Units</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="444"/>
-      <source>Miscellaneous</source>
-      <translation type="unfinished">Miscellaneous</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="468"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="479"/>
-      <source>Color Scheme</source>
-      <translation type="unfinished">Color Scheme</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="490"/>
-      <source>Map Provider</source>
-      <translation type="unfinished">Map Provider</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="510"/>
-      <source>Map Type</source>
-      <translation type="unfinished">Map Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="529"/>
-      <source>Stream GCS Position</source>
-      <translation type="unfinished">Stream GCS Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="611"/>
-      <source>Mute all audio output</source>
-      <translation type="unfinished">Mute all audio output</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="626"/>
-      <source>Clear all settings on next start</source>
-      <translation type="unfinished">Clear all settings on next start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="636"/>
-      <source>Clear Settings</source>
-      <translation type="unfinished">Clear Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="637"/>
-      <source>All saved settings will be reset the next time you start %1. Is this really what you want?</source>
-      <translation type="unfinished">All saved settings will be reset the next time you start %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="661"/>
-      <source>Application Load/Save Path</source>
-      <translation type="unfinished">Application Load/Save Path</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="665"/>
-      <source>&lt;not set&gt;</source>
-      <translation type="unfinished">&lt;not set&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="668"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1072"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1094"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="672"/>
-      <source>Choose the location to save/load files</source>
-      <translation type="unfinished">Choose the location to save/load files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="685"/>
-      <source>Telemetry Logs from Vehicle</source>
-      <translation type="unfinished">Telemetry Logs from Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="703"/>
-      <source>Save log after each flight</source>
-      <translation type="unfinished">Save log after each flight</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="711"/>
-      <source>Save logs even if vehicle was not armed</source>
-      <translation type="unfinished">Save logs even if vehicle was not armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="84"/>
-      <source>Fly View</source>
-      <translation type="unfinished">Fly View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="145"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="177"/>
-      <source>Show simple camera controls (DIGICAM_CONTROL)</source>
-      <translation type="unfinished">Show simple camera controls (DIGICAM_CONTROL)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="188"/>
-      <source>Guided Command Settings</source>
-      <translation type="unfinished">Guided Command Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="194"/>
-      <source>Minimum Altitude</source>
-      <translation type="unfinished">Minimum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="205"/>
-      <source>Maximum Altitude</source>
-      <translation type="unfinished">Maximum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
-      <source>UI Scaling</source>
-      <translation type="unfinished">UI Scaling</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="604"/>
-      <source>Use Vehicle Pairing</source>
-      <translation type="unfinished">Use Vehicle Pairing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="618"/>
-      <source>Check for Internet connection</source>
-      <translation type="unfinished">Check for Internet connection</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="719"/>
-      <source>Save CSV log of telemetry data</source>
-      <translation type="unfinished">Save CSV log of telemetry data</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="103"/>
-      <source>Use Preflight Checklist</source>
-      <translation type="unfinished">Use Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="111"/>
-      <source>Enforce Preflight Checklist</source>
-      <translation type="unfinished">Enforce Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="120"/>
-      <source>Keep Map Centered On Vehicle</source>
-      <translation type="unfinished">Keep Map Centered On Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="128"/>
-      <source>Show Telemetry Log Replay Status Bar</source>
-      <translation type="unfinished">Show Telemetry Log Replay Status Bar</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="139"/>
-      <source>Virtual Joystick</source>
-      <translation type="unfinished">Virtual Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="153"/>
-      <source>Use Vertical Instrument Panel</source>
-      <translation type="unfinished">Use Vertical Instrument Panel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="161"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="169"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="216"/>
-      <source>Go To Location Max Distance</source>
-      <translation type="unfinished">Go To Location Max Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="233"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="240"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="296"/>
-      <source>File Format</source>
-      <translation type="unfinished">File Format</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="318"/>
-      <source>Video decode priority</source>
-      <translation type="unfinished">Video decode priority</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="345"/>
-      <source>Auto-Delete Saved Recordings</source>
-      <translation type="unfinished">Auto-Delete Saved Recordings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="356"/>
-      <source>Plan View</source>
-      <translation type="unfinished">Plan View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="378"/>
-      <source>Default Mission Altitude</source>
-      <translation type="unfinished">Default Mission Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="384"/>
-      <source>VTOL TransitionDistance</source>
-      <translation type="unfinished">VTOL TransitionDistance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="392"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="397"/>
-      <source>Missions Do Not Require Takeoff Item</source>
-      <translation type="unfinished">Missions Do Not Require Takeoff Item</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="731"/>
-      <source>AutoConnect to the following devices</source>
-      <translation type="unfinished">AutoConnect to the following devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>LibrePilot</source>
-      <translation type="unfinished">LibrePilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="847"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Zero-Conf</source>
-      <translation type="unfinished">Zero-Conf</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="781"/>
-      <source>NMEA GPS Device</source>
-      <translation type="unfinished">NMEA GPS Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="812"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="832"/>
-      <source>NMEA stream UDP port</source>
-      <translation type="unfinished">NMEA stream UDP port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="870"/>
-      <source>Perform Survey-In</source>
-      <translation type="unfinished">Perform Survey-In</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="904"/>
-      <source>Use Specified Base Position</source>
-      <translation type="unfinished">Use Specified Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="965"/>
-      <source>Save Current Base Position</source>
-      <translation type="unfinished">Save Current Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="981"/>
-      <source>ADSB Server</source>
-      <translation type="unfinished">ADSB Server</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="999"/>
-      <source>Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</source>
-      <translation type="unfinished">Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="253"/>
-      <source>UDP Port</source>
-      <translation type="unfinished">UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="264"/>
-      <source>RTSP URL</source>
-      <translation type="unfinished">RTSP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="275"/>
-      <source>TCP URL</source>
-      <translation type="unfinished">TCP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="285"/>
-      <source>Aspect Ratio</source>
-      <translation type="unfinished">Aspect Ratio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="331"/>
-      <source>Disable When Disarmed</source>
-      <translation type="unfinished">Disable When Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="338"/>
-      <source>Low Latency Mode</source>
-      <translation type="unfinished">Low Latency Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="307"/>
-      <source>Max Storage Usage</source>
-      <translation type="unfinished">Max Storage Usage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1044"/>
-      <source>Brand Image</source>
-      <translation type="unfinished">Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1063"/>
-      <source>Indoor Image</source>
-      <translation type="unfinished">Indoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1076"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1098"/>
-      <source>Choose custom brand image file</source>
-      <translation type="unfinished">Choose custom brand image file</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1085"/>
-      <source>Outdoor Image</source>
-      <translation type="unfinished">Outdoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1106"/>
-      <source>Reset Default Brand Image</source>
-      <translation type="unfinished">Reset Default Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1119"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceController</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="151"/>
-      <source>GeoFence supports version %1</source>
-      <translation type="unfinished">GeoFence supports version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="158"/>
-      <source>GeoFence polygon not stored as object</source>
-      <translation type="unfinished">GeoFence polygon not stored as object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="172"/>
-      <source>GeoFence circle not stored as object</source>
-      <translation type="unfinished">GeoFence circle not stored as object</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceEditor</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="37"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="65"/>
-      <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
-      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="66"/>
-      <source>This vehicle does not support GeoFence.</source>
-      <translation type="unfinished">This vehicle does not support GeoFence.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="116"/>
-      <source>Insert GeoFence</source>
-      <translation type="unfinished">Insert GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="121"/>
-      <source>Polygon Fence</source>
-      <translation type="unfinished">Polygon Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="133"/>
-      <source>Circular Fence</source>
-      <translation type="unfinished">Circular Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
-      <source>Polygon Fences</source>
-      <translation type="unfinished">Polygon Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="151"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="226"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="162"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="238"/>
-      <source>Inclusion</source>
-      <translation type="unfinished">Inclusion</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="178"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="254"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="202"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="294"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="211"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="303"/>
-      <source>Del</source>
-      <translation type="unfinished">Del</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="222"/>
-      <source>Circular Fences</source>
-      <translation type="unfinished">Circular Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="278"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="314"/>
-      <source>Breach Return Point</source>
-      <translation type="unfinished">Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="318"/>
-      <source>Add Breach Return Point</source>
-      <translation type="unfinished">Add Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="327"/>
-      <source>Remove Breach Return Point</source>
-      <translation type="unfinished">Remove Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="342"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceManager</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="161"/>
-      <source>GeoFence load: Vertex count change mid-polygon - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="165"/>
-      <source>GeoFence load: Polygon type changed before last load complete - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="178"/>
-      <source>GeoFence load: Incomplete polygon loaded</source>
-      <translation type="unfinished">GeoFence load: Incomplete polygon loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="186"/>
-      <source>GeoFence load: Unsupported command %1</source>
-      <translation type="unfinished">GeoFence load: Unsupported command %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="170"/>
-      <source>B</source>
-      <comment>Breach Return Point item indicator</comment>
-      <translation type="unfinished">B</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagController</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="58"/>
-      <source>Images have alreay been tagged. Existing images will be removed.</source>
-      <translation type="unfinished">Images have alreay been tagged. Existing images will be removed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="81"/>
-      <source>The save folder already contains images.</source>
-      <translation type="unfinished">The save folder already contains images.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="95"/>
-      <source>Cannot find the image directory.</source>
-      <translation type="unfinished">Cannot find the image directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="103"/>
-      <source>Couldn&apos;t replace the previously tagged images</source>
-      <translation type="unfinished">Couldn&apos;t replace the previously tagged images</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="110"/>
-      <source>Cannot find the save directory.</source>
-      <translation type="unfinished">Cannot find the save directory.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="26"/>
-      <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="67"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="75"/>
-      <source>Select log file</source>
-      <translation type="unfinished">Select log file</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>ULog file (*.ulg)</source>
-      <translation type="unfinished">ULog file (*.ulg)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>PX4 log file (*.px4log)</source>
-      <translation type="unfinished">PX4 log file (*.px4log)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="95"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="103"/>
-      <source>Select image directory</source>
-      <translation type="unfinished">Select image directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="122"/>
-      <source>(Optionally) Select save directory</source>
-      <translation type="unfinished">(Optionally) Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="130"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Cancel Tagging</source>
-      <translation type="unfinished">Cancel Tagging</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Start Tagging</source>
-      <translation type="unfinished">Start Tagging</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagWorker</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="158"/>
-      <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
-      <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="169"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="257"/>
-      <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="181"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="213"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="228"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="242"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="284"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="291"/>
-      <source>Tagging cancelled</source>
-      <translation type="unfinished">Tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="190"/>
-      <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>%1 - tagging cancelled</source>
-      <translation type="unfinished">%1 - tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>Log parsing failed</source>
-      <translation type="unfinished">Log parsing failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="235"/>
-      <source>Geotagging failed in trigger filtering</source>
-      <translation type="unfinished">Geotagging failed in trigger filtering</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
-      <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="264"/>
-      <source>Geotagging failed. Couldn&apos;t write to image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="274"/>
-      <source>Geotagging failed. Couldn&apos;t write to an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to an image.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionConfirm</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="104"/>
-      <source>Slide to confirm</source>
-      <translation type="unfinished">Slide to confirm</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="81"/>
-      <source>Select Action</source>
-      <translation type="unfinished">Select Action</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionsController</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="36"/>
-      <source>EMERGENCY STOP</source>
-      <translation type="unfinished">EMERGENCY STOP</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="42"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
-      <source>Start Mission</source>
-      <translation type="unfinished">Start Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="44"/>
-      <source>Start Mission (MV)</source>
-      <translation type="unfinished">Start Mission (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="45"/>
-      <source>Continue Mission</source>
-      <translation type="unfinished">Continue Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="46"/>
-      <source>Resume FAILED</source>
-      <translation type="unfinished">Resume FAILED</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="47"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="48"/>
-      <source>Pause (MV)</source>
-      <translation type="unfinished">Pause (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="49"/>
-      <source>Change Altitude</source>
-      <translation type="unfinished">Change Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="50"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="51"/>
-      <source>Land Abort</source>
-      <translation type="unfinished">Land Abort</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
-      <source>Set Waypoint</source>
-      <translation type="unfinished">Set Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
-      <source>Go To Location</source>
-      <translation type="unfinished">Go To Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
-      <source>Return to the launch position of the vehicle.</source>
-      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
-      <source>VTOL Transition</source>
-      <translation type="unfinished">VTOL Transition</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
-      <source>Arm the vehicle.</source>
-      <translation type="unfinished">Arm the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
-      <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
-      <source>Disarm the vehicle</source>
-      <translation type="unfinished">Disarm the vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
-      <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
-      <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
-      <source>Takeoff from ground and hold position.</source>
-      <translation type="unfinished">Takeoff from ground and hold position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-      <source>Takeoff from ground and start the current mission.</source>
-      <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
-      <source>Continue the mission from the current waypoint.</source>
-      <translation type="unfinished">Continue the mission from the current waypoint.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
-      <source>Upload of resume mission failed. Confirm to retry upload</source>
-      <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
-      <source>Land the vehicle at the current position.</source>
-      <translation type="unfinished">Land the vehicle at the current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
-      <source>Change the altitude of the vehicle up or down.</source>
-      <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
-      <source>Move the vehicle to the specified location.</source>
-      <translation type="unfinished">Move the vehicle to the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
-      <source>Adjust current waypoint to %1.</source>
-      <translation type="unfinished">Adjust current waypoint to %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
-      <source>Orbit the vehicle around the specified location.</source>
-      <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
-      <source>Abort the landing sequence.</source>
-      <translation type="unfinished">Abort the landing sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
-      <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
-      <source>Pause all vehicles at their current position.</source>
-      <translation type="unfinished">Pause all vehicles at their current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
-      <source>Transition VTOL to fixed wing flight.</source>
-      <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
-      <source>Transition VTOL to multi-rotor flight.</source>
-      <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="77"/>
-      <source>Make the specified location a Region Of Interest.</source>
-      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="163"/>
-      <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="392"/>
-      <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="536"/>
-      <source>Internal error: unknown actionCode</source>
-      <translation type="unfinished">Internal error: unknown actionCode</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedAltitudeSlider</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="65"/>
-      <source>New Alt(rel)</source>
-      <translation type="unfinished">New Alt(rel)</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="37"/>
-      <source>QGroundControl User Guide</source>
-      <translation type="unfinished">QGroundControl User Guide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="44"/>
-      <source>PX4 Users Discussion Forum</source>
-      <translation type="unfinished">PX4 Users Discussion Forum</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="51"/>
-      <source>ArduPilot Users Discussion Forum</source>
-      <translation type="unfinished">ArduPilot Users Discussion Forum</translation>
-    </message>
-  </context>
-  <context>
-    <name>HorizontalFactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="128"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="153"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="136"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="160"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
-      <source>Color</source>
-      <translation type="unfinished">Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
-      <source>Opacity</source>
-      <translation type="unfinished">Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueArea</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="85"/>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="109"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <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/QmlControls/InstrumentValueArea.qml" line="127"/>
-      <source>Reset To Defaults</source>
-      <translation type="unfinished">Reset To Defaults</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueEditDialog</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
-      <source>Value Display</source>
-      <translation type="unfinished">Value Display</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
-      <source>Valuec requires a connected vehicle for setup.</source>
-      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="89"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="129"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="133"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="146"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="159"/>
-      <source>Show Units</source>
-      <translation type="unfinished">Show Units</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="164"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="246"/>
-      <source>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</source>
-      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="264"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="371"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="470"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="321"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="420"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="505"/>
-      <source>Add Row</source>
-      <translation type="unfinished">Add Row</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="353"/>
-      <source>Specify the icon you want to display based on value ranges.</source>
-      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="452"/>
-      <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="520"/>
-      <source>Select Icon</source>
-      <translation type="unfinished">Select Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueValue.qml" line="47"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>Joystick</name>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="44"/>
-      <source>No Action</source>
-      <translation type="unfinished">No Action</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="45"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="46"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="47"/>
-      <source>Toggle Arm</source>
-      <translation type="unfinished">Toggle Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="48"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="49"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="50"/>
-      <source>Continuous Zoom In</source>
-      <translation type="unfinished">Continuous Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="51"/>
-      <source>Continuous Zoom Out</source>
-      <translation type="unfinished">Continuous Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="52"/>
-      <source>Step Zoom In</source>
-      <translation type="unfinished">Step Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="53"/>
-      <source>Step Zoom Out</source>
-      <translation type="unfinished">Step Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="58"/>
-      <source>Trigger Camera</source>
-      <translation type="unfinished">Trigger Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="59"/>
-      <source>Start Recording Video</source>
-      <translation type="unfinished">Start Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="60"/>
-      <source>Stop Recording Video</source>
-      <translation type="unfinished">Stop Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="61"/>
-      <source>Toggle Recording Video</source>
-      <translation type="unfinished">Toggle Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="62"/>
-      <source>Gimbal Down</source>
-      <translation type="unfinished">Gimbal Down</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="63"/>
-      <source>Gimbal Up</source>
-      <translation type="unfinished">Gimbal Up</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="64"/>
-      <source>Gimbal Left</source>
-      <translation type="unfinished">Gimbal Left</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="65"/>
-      <source>Gimbal Right</source>
-      <translation type="unfinished">Gimbal Right</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="66"/>
-      <source>Gimbal Center</source>
-      <translation type="unfinished">Gimbal Center</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="67"/>
-      <source>Emergency Stop</source>
-      <translation type="unfinished">Emergency Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="54"/>
-      <source>Next Video Stream</source>
-      <translation type="unfinished">Next Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="55"/>
-      <source>Previous Video Stream</source>
-      <translation type="unfinished">Previous Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="56"/>
-      <source>Next Camera</source>
-      <translation type="unfinished">Next Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="57"/>
-      <source>Previous Camera</source>
-      <translation type="unfinished">Previous Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfig</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigAdvanced</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
-      <source>Full down stick is zero throttle</source>
-      <translation type="unfinished">Full down stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
-      <source>Center stick is zero throttle</source>
-      <translation type="unfinished">Center stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
-      <source>Spring loaded throttle smoothing</source>
-      <translation type="unfinished">Spring loaded throttle smoothing</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
-      <source>Allow negative Thrust</source>
-      <translation type="unfinished">Allow negative Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
-      <source>Exponential:</source>
-      <translation type="unfinished">Exponential:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
-      <source>Enable further advanced settings (careful!)</source>
-      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
-      <source>Axis frequency (Hz):</source>
-      <translation type="unfinished">Axis frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="127"/>
-      <source>Button repeat frequency (Hz):</source>
-      <translation type="unfinished">Button repeat frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="145"/>
-      <source>Enable circle correction</source>
-      <translation type="unfinished">Enable circle correction</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="163"/>
-      <source>Deadbands</source>
-      <translation type="unfinished">Deadbands</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="180"/>
-      <source>Deadband can be set during the first </source>
-      <translation type="unfinished">Deadband can be set during the first </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="181"/>
-      <source>step of calibration by gently wiggling each axis. </source>
-      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="182"/>
-      <source>Deadband can also be adjusted by clicking and </source>
-      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="183"/>
-      <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigButtons</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
-      <source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
-      <translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="124"/>
-      <source>#</source>
-      <translation type="unfinished">#</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="128"/>
-      <source>Function: </source>
-      <translation type="unfinished">Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="132"/>
-      <source>Shift Function: </source>
-      <translation type="unfinished">Shift Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="185"/>
-      <source>No firmware support</source>
-      <translation type="unfinished">No firmware support</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigCalibration</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="169"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="175"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigController</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="197"/>
-      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigGeneral</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable joystick input</source>
-      <translation type="unfinished">Enable joystick input</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable not allowed (Calibrate First)</source>
-      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
-      <source>Active joystick:</source>
-      <translation type="unfinished">Active joystick:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
-      <source>Active joystick name not in combo</source>
-      <translation type="unfinished">Active joystick name not in combo</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
-      <source>RC Mode:</source>
-      <translation type="unfinished">RC Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Lateral</source>
-      <translation type="unfinished">Lateral</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-      <source>Joystick Status</source>
-      <translation type="unfinished">Joystick Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-      <source>Connected:</source>
-      <translation type="unfinished">Connected:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-      <source>Enabled:</source>
-      <translation type="unfinished">Enabled:</translation>
-    </message>
-  </context>
-  <context>
-    <name>JsonHelper</name>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="181"/>
-      <source>File open failed: file:error %1 %2</source>
-      <translation type="unfinished">File open failed: file:error %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="334"/>
-      <source>Unable to open file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="343"/>
-      <source>Unable to parse json file: %1 error: %2 offset: %3</source>
-      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="348"/>
-      <source>Root of json file is not object: %1</source>
-      <translation type="unfinished">Root of json file is not object: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="355"/>
-      <source>Json file: &apos;%1&apos;. %2</source>
-      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLHelper</name>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="15"/>
-      <source>KML file load failed. %1</source>
-      <translation type="unfinished">KML file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="24"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="29"/>
-      <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="37"/>
-      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="61"/>
-      <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="77"/>
-      <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="83"/>
-      <location filename="../src/KMLHelper.cc" line="144"/>
-      <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="138"/>
-      <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLOrSHPFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>LandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="635"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="655"/>
-      <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkManager</name>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="235"/>
-      <source>Connect not allowed: %1</source>
-      <translation type="unfinished">Connect not allowed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="607"/>
-      <location filename="../src/comm/LinkManager.cc" line="613"/>
-      <location filename="../src/comm/LinkManager.cc" line="618"/>
-      <location filename="../src/comm/LinkManager.cc" line="623"/>
-      <source>%1 on %2 (AutoConnect)</source>
-      <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="667"/>
-      <source>Shutdown</source>
-      <translation type="unfinished">Shutdown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="683"/>
-      <source>Serial</source>
-      <translation type="unfinished">Serial</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="685"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="686"/>
-      <source>TCP</source>
-      <translation type="unfinished">TCP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="691"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="694"/>
-      <location filename="../src/comm/LinkManager.cc" line="884"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="95"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="104"/>
-      <source>Remove Link Configuration</source>
-      <translation type="unfinished">Remove Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="105"/>
-      <source>Remove %1. Is this really what you want?</source>
-      <translation type="unfinished">Remove %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="116"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="121"/>
-      <source>Add</source>
-      <translation type="unfinished">Add</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="125"/>
-      <source>Connect</source>
-      <translation type="unfinished">Connect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="130"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="135"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Edit Link Configuration Settings</source>
-      <translation type="unfinished">Edit Link Configuration Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Create New Link Configuration</source>
-      <translation type="unfinished">Create New Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="183"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="189"/>
-      <source>Enter name</source>
-      <translation type="unfinished">Enter name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="194"/>
-      <source>Automatically Connect on Start</source>
-      <translation type="unfinished">Automatically Connect on Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="201"/>
-      <source>High Latency</source>
-      <translation type="unfinished">High Latency</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="206"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="240"/>
-      <source>OK</source>
-      <translation type="unfinished">OK</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="260"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogCompressor</name>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="50"/>
-      <source>Log Compressor: Cannot start/compress log file, since input file %1 is not readable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since input file %1 is not readable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="67"/>
-      <source>Log Compressor: Cannot start/compress log file, since output file %1 is not writable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since output file %1 is not writable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="105"/>
-      <source>Log compressor: Dataset contains dimensions: </source>
-      <translation type="unfinished">Log compressor: Dataset contains dimensions: </translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="213"/>
-      <source>Log Compressor</source>
-      <translation type="unfinished">Log Compressor</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadController</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="180"/>
-      <source>Available</source>
-      <translation type="unfinished">Available</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="227"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="705"/>
-      <source>Canceled</source>
-      <translation type="unfinished">Canceled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="274"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="385"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="646"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="366"/>
-      <source>Downloaded</source>
-      <translation type="unfinished">Downloaded</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="436"/>
-      <source>Timed Out</source>
-      <translation type="unfinished">Timed Out</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="556"/>
-      <source>Waiting</source>
-      <translation type="unfinished">Waiting</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="601"/>
-      <source>UnknownDate</source>
-      <translation type="unfinished">UnknownDate</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="24"/>
-      <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation type="unfinished">Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="59"/>
-      <source>Id</source>
-      <translation type="unfinished">Id</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="72"/>
-      <source>Date</source>
-      <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="83"/>
-      <source>Date Unknown</source>
-      <translation type="unfinished">Date Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="94"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="107"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="124"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>Log Refresh</source>
-      <translation type="unfinished">Log Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation type="unfinished">You must be connected to a vehicle in order to download logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="136"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="153"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="170"/>
-      <source>Erase All</source>
-      <translation type="unfinished">Erase All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="174"/>
-      <source>Delete All Log Files</source>
-      <translation type="unfinished">Delete All Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="180"/>
-      <source>All log files will be erased permanently. Is this really what you want?</source>
-      <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="189"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLink</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="83"/>
-      <source>Log Replay Error</source>
-      <translation type="unfinished">Log Replay Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="104"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="269"/>
-      <source>Attempt to load new log while log being played</source>
-      <translation type="unfinished">Attempt to load new log while log being played</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="275"/>
-      <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="285"/>
-      <source>The log file &apos;%1&apos; is corrupt or empty.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="358"/>
-      <source>Connect not allowed during Flight Data replay.</source>
-      <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="425"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="445"/>
-      <source>Unable to seek to new position</source>
-      <translation type="unfinished">Unable to seek to new position</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkConfiguration</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.h" line="40"/>
-      <source>Log Replay Link Settings</source>
-      <translation type="unfinished">Log Replay Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkController</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="593"/>
-      <source>%2m:%3s</source>
-      <translation type="unfinished">%2m:%3s</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="595"/>
-      <source>%1h:%2m:%3s</source>
-      <translation type="unfinished">%1h:%2m:%3s</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplaySettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="26"/>
-      <source>Log File</source>
-      <translation type="unfinished">Log File</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="35"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="41"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayStatusBar</name>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Play</source>
-      <translation type="unfinished">Play</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="104"/>
-      <source>Load Telemetry Log</source>
-      <translation type="unfinished">Load Telemetry Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="110"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="195"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="196"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="197"/>
-      <source>Magnetometer</source>
-      <translation type="unfinished">Magnetometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="198"/>
-      <source>Absolute pressure</source>
-      <translation type="unfinished">Absolute pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="199"/>
-      <source>Differential pressure</source>
-      <translation type="unfinished">Differential pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="200"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="201"/>
-      <source>Optical flow</source>
-      <translation type="unfinished">Optical flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="202"/>
-      <source>Computer vision position</source>
-      <translation type="unfinished">Computer vision position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="203"/>
-      <source>Laser based position</source>
-      <translation type="unfinished">Laser based position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="204"/>
-      <source>External ground truth</source>
-      <translation type="unfinished">External ground truth</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="205"/>
-      <source>Angular rate control</source>
-      <translation type="unfinished">Angular rate control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="206"/>
-      <source>Attitude stabilization</source>
-      <translation type="unfinished">Attitude stabilization</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="207"/>
-      <source>Yaw position</source>
-      <translation type="unfinished">Yaw position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="208"/>
-      <source>Z/altitude control</source>
-      <translation type="unfinished">Z/altitude control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="209"/>
-      <source>X/Y position control</source>
-      <translation type="unfinished">X/Y position control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="210"/>
-      <source>Motor outputs / control</source>
-      <translation type="unfinished">Motor outputs / control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="211"/>
-      <source>RC receiver</source>
-      <translation type="unfinished">RC receiver</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="212"/>
-      <source>Gyro 2</source>
-      <translation type="unfinished">Gyro 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="213"/>
-      <source>Accelerometer 2</source>
-      <translation type="unfinished">Accelerometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="214"/>
-      <source>Magnetometer 2</source>
-      <translation type="unfinished">Magnetometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="215"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="216"/>
-      <source>AHRS</source>
-      <translation type="unfinished">AHRS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="217"/>
-      <source>Terrain</source>
-      <translation type="unfinished">Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="218"/>
-      <source>Motors reversed</source>
-      <translation type="unfinished">Motors reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="219"/>
-      <source>Logging</source>
-      <translation type="unfinished">Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="220"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="221"/>
-      <source>Proximity</source>
-      <translation type="unfinished">Proximity</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="222"/>
-      <source>Satellite Communication</source>
-      <translation type="unfinished">Satellite Communication</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="223"/>
-      <source>Pre-Arm Check</source>
-      <translation type="unfinished">Pre-Arm Check</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="224"/>
-      <source>Avoidance/collision prevention</source>
-      <translation type="unfinished">Avoidance/collision prevention</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink unknown SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="236"/>
-      <source>Unknown sensor</source>
-      <translation type="unfinished">Unknown sensor</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkChart</name>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
-      <source>Scale:</source>
-      <translation type="unfinished">Scale:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
-      <source>Range:</source>
-      <translation type="unfinished">Range:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorController</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
-      <source>5 Sec</source>
-      <translation type="unfinished">5 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
-      <source>10 Sec</source>
-      <translation type="unfinished">10 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
-      <source>30 Sec</source>
-      <translation type="unfinished">30 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
-      <source>60 Sec</source>
-      <translation type="unfinished">60 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="744"/>
-      <source>10,000</source>
-      <translation type="unfinished">10,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="745"/>
-      <source>1,000</source>
-      <translation type="unfinished">1,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="746"/>
-      <source>100</source>
-      <translation type="unfinished">100</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="747"/>
-      <source>10</source>
-      <translation type="unfinished">10</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="748"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="749"/>
-      <source>0.1</source>
-      <translation type="unfinished">0.1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="750"/>
-      <source>0.01</source>
-      <translation type="unfinished">0.01</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="751"/>
-      <source>0.001</source>
-      <translation type="unfinished">0.001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="752"/>
-      <source>0.0001</source>
-      <translation type="unfinished">0.0001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="846"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="859"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="874"/>
-      <source>System %1</source>
-      <translation type="unfinished">System %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="45"/>
-      <source>Inspect real time MAVLink messages.</source>
-      <translation type="unfinished">Inspect real time MAVLink messages.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="142"/>
-      <source>Message:</source>
-      <translation type="unfinished">Message:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="150"/>
-      <source>Component:</source>
-      <translation type="unfinished">Component:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="156"/>
-      <source>Count:</source>
-      <translation type="unfinished">Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="171"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="174"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="177"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="180"/>
-      <source>Plot 1</source>
-      <translation type="unfinished">Plot 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="183"/>
-      <source>Plot 2</source>
-      <translation type="unfinished">Plot 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkProtocol</name>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>MAVLink Protocol</source>
-      <translation type="unfinished">MAVLink Protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
-      <translation type="unfinished">MAVLink Logging failed. Could not write to file %1, logging disabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
-      <translation type="unfinished">Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="383"/>
-      <source>MAVLink protocol</source>
-      <translation type="unfinished">MAVLink protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
-      <translation type="unfinished">Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainRootWindow</name>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="270"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="287"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="306"/>
-      <source>%1 close</source>
-      <translation type="unfinished">%1 close</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="307"/>
-      <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
-      <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="271"/>
-      <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="156"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="385"/>
-      <source>Analyze Tools</source>
-      <translation type="unfinished">Analyze Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="160"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="370"/>
-      <source>Vehicle Setup</source>
-      <translation type="unfinished">Vehicle Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="164"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="401"/>
-      <source>Application Settings</source>
-      <translation type="unfinished">Application Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="288"/>
-      <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="351"/>
-      <source>Select Tool</source>
-      <translation type="unfinished">Select Tool</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="419"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="452"/>
-      <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="520"/>
-      <source>Back</source>
-      <translation type="unfinished">Back</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainStatusIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="35"/>
-      <source>Communication Lost</source>
-      <translation type="unfinished">Communication Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="36"/>
-      <source>Ready To Fly</source>
-      <translation type="unfinished">Ready To Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="37"/>
-      <source>Not Ready</source>
-      <translation type="unfinished">Not Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="38"/>
-      <source>Disconnected</source>
-      <translation type="unfinished">Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="39"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="40"/>
-      <source>Flying</source>
-      <translation type="unfinished">Flying</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="41"/>
-      <source>Landing</source>
-      <translation type="unfinished">Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>FW(vtol)</source>
-      <translation type="unfinished">FW(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>MR(vtol)</source>
-      <translation type="unfinished">MR(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="196"/>
-      <source>Sensor Status</source>
-      <translation type="unfinished">Sensor Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Multi-Rotor</source>
-      <translation type="unfinished">Transition to Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Fixed Wing</source>
-      <translation type="unfinished">Transition to Fixed Wing</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainToolBar</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="201"/>
-      <source>Downloading</source>
-      <translation type="unfinished">Downloading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="209"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="82"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-  </context>
-  <context>
-    <name>MapScale</name>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="46"/>
-      <source> km</source>
-      <translation type="unfinished"> km</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="48"/>
-      <source> m</source>
-      <translation type="unfinished"> m</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="59"/>
-      <source> mile</source>
-      <translation type="unfinished"> mile</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="61"/>
-      <source> miles</source>
-      <translation type="unfinished"> miles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="64"/>
-      <source> ft</source>
-      <translation type="unfinished"> ft</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="193"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="206"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="219"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkConsolePage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
-      <source>Provides a connection to the vehicle&apos;s system shell.</source>
-      <translation type="unfinished">Provides a connection to the vehicle&apos;s system shell.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="140"/>
-      <source>Copy</source>
-      <translation type="unfinished">Copy</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="146"/>
-      <source>Paste</source>
-      <translation type="unfinished">Paste</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="290"/>
-      <source>Send</source>
-      <translation type="unfinished">Send</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
-      <source>MAVLink Logging</source>
-      <translation type="unfinished">MAVLink Logging</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">Please enter an email address before uploading MAVLink log files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
-      <source>Ground Station</source>
-      <translation type="unfinished">Ground Station</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
-      <source>MAVLink System ID:</source>
-      <translation type="unfinished">MAVLink System ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
-      <source>Emit heartbeat</source>
-      <translation type="unfinished">Emit heartbeat</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
-      <source>Only accept MAVs with same protocol version</source>
-      <translation type="unfinished">Only accept MAVs with same protocol version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="159"/>
-      <source>Enable MAVLink forwarding</source>
-      <translation type="unfinished">Enable MAVLink forwarding</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="170"/>
-      <source>Host name:</source>
-      <translation type="unfinished">Host name:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="183"/>
-      <source>&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</source>
-      <translation type="unfinished">&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="199"/>
-      <source>Telemetry Stream Rates (ArduPilot Only)</source>
-      <translation type="unfinished">Telemetry Stream Rates (ArduPilot Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="219"/>
-      <source>All Streams Controlled By Vehicle Settings</source>
-      <translation type="unfinished">All Streams Controlled By Vehicle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="228"/>
-      <source>Raw Sensors</source>
-      <translation type="unfinished">Raw Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="235"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="242"/>
-      <source>RC Channel</source>
-      <translation type="unfinished">RC Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="249"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="256"/>
-      <source>Extra 1</source>
-      <translation type="unfinished">Extra 1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="263"/>
-      <source>Extra 2</source>
-      <translation type="unfinished">Extra 2</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="270"/>
-      <source>Extra 3</source>
-      <translation type="unfinished">Extra 3</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="288"/>
-      <source>MAVLink Link Status (Current Vehicle)</source>
-      <translation type="unfinished">MAVLink Link Status (Current Vehicle)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="309"/>
-      <source>Total messages sent (computed):</source>
-      <translation type="unfinished">Total messages sent (computed):</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="314"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="329"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="344"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="359"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="324"/>
-      <source>Total messages received:</source>
-      <translation type="unfinished">Total messages received:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="339"/>
-      <source>Total message loss:</source>
-      <translation type="unfinished">Total message loss:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="354"/>
-      <source>Loss rate:</source>
-      <translation type="unfinished">Loss rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="375"/>
-      <source>MAVLink 2.0 Logging (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Logging (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="398"/>
-      <source>Manual Start/Stop:</source>
-      <translation type="unfinished">Manual Start/Stop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="402"/>
-      <source>Start Logging</source>
-      <translation type="unfinished">Start Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="409"/>
-      <source>Stop Logging</source>
-      <translation type="unfinished">Stop Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="419"/>
-      <source>Enable automatic logging</source>
-      <translation type="unfinished">Enable automatic logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="438"/>
-      <source>MAVLink 2.0 Log Uploads (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Log Uploads (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="460"/>
-      <source>Email address for Log Upload:</source>
-      <translation type="unfinished">Email address for Log Upload:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="481"/>
-      <source>Default Description:</source>
-      <translation type="unfinished">Default Description:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="501"/>
-      <source>Default Upload URL</source>
-      <translation type="unfinished">Default Upload URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="522"/>
-      <source>Video URL:</source>
-      <translation type="unfinished">Video URL:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="540"/>
-      <source>Wind Speed:</source>
-      <translation type="unfinished">Wind Speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="578"/>
-      <source>Flight Rating:</source>
-      <translation type="unfinished">Flight Rating:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="616"/>
-      <source>Additional Feedback:</source>
-      <translation type="unfinished">Additional Feedback:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="635"/>
-      <source>Make this log publicly available</source>
-      <translation type="unfinished">Make this log publicly available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="646"/>
-      <source>Enable automatic log uploads</source>
-      <translation type="unfinished">Enable automatic log uploads</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="658"/>
-      <source>Delete log file after uploading</source>
-      <translation type="unfinished">Delete log file after uploading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="677"/>
-      <source>Saved Log Files</source>
-      <translation type="unfinished">Saved Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="740"/>
-      <source>Uploaded</source>
-      <translation type="unfinished">Uploaded</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="763"/>
-      <source>Check All</source>
-      <translation type="unfinished">Check All</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="773"/>
-      <source>Check None</source>
-      <translation type="unfinished">Check None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="783"/>
-      <source>Delete Selected</source>
-      <translation type="unfinished">Delete Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="791"/>
-      <source>Delete Selected Log Files</source>
-      <translation type="unfinished">Delete Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="792"/>
-      <source>Confirm deleting selected log files?</source>
-      <translation type="unfinished">Confirm deleting selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="799"/>
-      <source>Upload Selected</source>
-      <translation type="unfinished">Upload Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="814"/>
-      <source>Upload Selected Log Files</source>
-      <translation type="unfinished">Upload Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="815"/>
-      <source>Confirm uploading selected log files?</source>
-      <translation type="unfinished">Confirm uploading selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="822"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="831"/>
-      <source>Cancel Upload</source>
-      <translation type="unfinished">Cancel Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="832"/>
-      <source>Confirm canceling the upload process?</source>
-      <translation type="unfinished">Confirm canceling the upload process?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MessageIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MessageIndicator.qml" line="112"/>
-      <source>No Messages</source>
-      <translation type="unfinished">No Messages</translation>
-    </message>
-  </context>
-  <context>
-    <name>MicrohardSettings</name>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="63"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="80"/>
-      <source>Enable Microhard</source>
-      <translation type="unfinished">Enable Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="98"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="120"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="126"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="128"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="144"/>
-      <source>Login Error</source>
-      <translation type="unfinished">Login Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="130"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="137"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="152"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="158"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="176"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="198"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="209"/>
-      <source>Remote IP Address:</source>
-      <translation type="unfinished">Remote IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="219"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
-      <source>Configuration User Name:</source>
-      <translation type="unfinished">Configuration User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
-      <source>Configuration Password:</source>
-      <translation type="unfinished">Configuration Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
-      <source>Encryption key:</source>
-      <translation type="unfinished">Encryption key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="282"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandDialog</name>
-    <message>
-      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="32"/>
-      <source>Category:</source>
-      <translation type="unfinished">Category:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandTree</name>
-    <message>
-      <location filename="../src/MissionManager/MissionCommandTree.cc" line="23"/>
-      <source>All commands</source>
-      <translation type="unfinished">All commands</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionController</name>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="788"/>
-      <source>Mission item %1 is not an object</source>
-      <translation type="unfinished">Mission item %1 is not an object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="874"/>
-      <source>Unsupported complex item type: %1</source>
-      <translation type="unfinished">Unsupported complex item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="877"/>
-      <source>Unknown item type: %1</source>
-      <translation type="unfinished">Unknown item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="900"/>
-      <source>Could not find doJumpId: %1</source>
-      <translation type="unfinished">Could not find doJumpId: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="973"/>
-      <source>The mission file is corrupted.</source>
-      <translation type="unfinished">The mission file is corrupted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="978"/>
-      <source>The mission file is not compatible with this version of %1.</source>
-      <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="1026"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1041"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1065"/>
-      <source>Mission: %1</source>
-      <translation type="unfinished">Mission: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="285"/>
-      <source>Type found: %1 must be: %2</source>
-      <translation type="unfinished">Type found: %1 must be: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="291"/>
-      <source>%1 key must contains 7 values</source>
-      <translation type="unfinished">%1 key must contains 7 values</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="297"/>
-      <source>Param %1 incorrect type %2, must be double or null</source>
-      <translation type="unfinished">Param %1 incorrect type %2, must be double or null</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="101"/>
-      <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="206"/>
-      <source>Move to vehicle position</source>
-      <translation type="unfinished">Move to vehicle position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="215"/>
-      <source>Move to previous item position</source>
-      <translation type="unfinished">Move to previous item position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="221"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="223"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="231"/>
-      <source>Show all values</source>
-      <translation type="unfinished">Show all values</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>Mission Edit</source>
-      <translation type="unfinished">Mission Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
-      <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="251"/>
-      <source>Item #%1</source>
-      <translation type="unfinished">Item #%1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="155"/>
-      <source>Select Mission Command</source>
-      <translation type="unfinished">Select Mission Command</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemStatus</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemStatus.qml" line="46"/>
-      <source>Terrain Altitude</source>
-      <translation type="unfinished">Terrain Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionManager</name>
-    <message>
-      <location filename="../src/MissionManager/MissionManager.cc" line="92"/>
-      <source>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</source>
-      <translation type="unfinished">Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="42"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="43"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="119"/>
-      <source>Flight speed</source>
-      <translation type="unfinished">Flight speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="146"/>
-      <source>Above camera commands will take affect immediately upon mission start.</source>
-      <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="239"/>
-      <source>Launch Position</source>
-      <translation type="unfinished">Launch Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="275"/>
-      <source>Set To Map Center</source>
-      <translation type="unfinished">Set To Map Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="157"/>
-      <source>Vehicle Info</source>
-      <translation type="unfinished">Vehicle Info</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="68"/>
-      <source>All Altitudes</source>
-      <translation type="unfinished">All Altitudes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="103"/>
-      <source>Initial Waypoint Alt</source>
-      <translation type="unfinished">Initial Waypoint Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="208"/>
-      <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="213"/>
-      <source>Cruise speed</source>
-      <translation type="unfinished">Cruise speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="224"/>
-      <source>Hover speed</source>
-      <translation type="unfinished">Hover speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="258"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="270"/>
-      <source>Actual position set by vehicle at flight time.</source>
-      <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockConfiguration</name>
-    <message>
-      <location filename="../src/comm/MockLink.h" line="78"/>
-      <source>Mock Link Settings</source>
-      <translation type="unfinished">Mock Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLink</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="46"/>
-      <source>PX4 Vehicle</source>
-      <translation type="unfinished">PX4 Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="51"/>
-      <source>APM ArduCopter Vehicle</source>
-      <translation type="unfinished">APM ArduCopter Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="57"/>
-      <source>APM ArduPlane Vehicle</source>
-      <translation type="unfinished">APM ArduPlane Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="63"/>
-      <source>APM ArduSub Vehicle</source>
-      <translation type="unfinished">APM ArduSub Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="69"/>
-      <source>APM ArduRover Vehicle</source>
-      <translation type="unfinished">APM ArduRover Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="75"/>
-      <source>Generic Vehicle</source>
-      <translation type="unfinished">Generic Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="43"/>
-      <source>Send status text + voice</source>
-      <translation type="unfinished">Send status text + voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="80"/>
-      <source>Stop One MockLink</source>
-      <translation type="unfinished">Stop One MockLink</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkOptionsDlg</name>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="23"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="33"/>
-      <source>Stop Heartbeats</source>
-      <translation type="unfinished">Stop Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="42"/>
-      <source>Start Heartbeats</source>
-      <translation type="unfinished">Start Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="51"/>
-      <source>Connection Removed</source>
-      <translation type="unfinished">Connection Removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="73"/>
-      <source>Send Status Text and Voice</source>
-      <translation type="unfinished">Send Status Text and Voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="80"/>
-      <source>Increment Vehicle Id</source>
-      <translation type="unfinished">Increment Vehicle Id</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="84"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>Generic MAVLink</source>
-      <translation type="unfinished">Generic MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="94"/>
-      <source>Vehicle Type</source>
-      <translation type="unfinished">Vehicle Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduCopter</source>
-      <translation type="unfinished">ArduCopter</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduPlane</source>
-      <translation type="unfinished">ArduPlane</translation>
-    </message>
-  </context>
-  <context>
-    <name>ModeSwitchDisplay</name>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="95"/>
-      <source>Monitor:</source>
-      <translation type="unfinished">Monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="135"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
-      <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiRotorChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
-      <source>Multirotor Initial Checks</source>
-      <translation type="unfinished">Multirotor Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
-      <source>Props mounted and secured?</source>
-      <translation type="unfinished">Props mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleList</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="54"/>
-      <source>The following commands will be applied to all vehicles</source>
-      <translation type="unfinished">The following commands will be applied to all vehicles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleManager</name>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="121"/>
-      <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="139"/>
-      <source>Connected to Vehicle %1</source>
-      <translation type="unfinished">Connected to Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleSelector</name>
-    <message>
-      <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="49"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineMap</name>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="241"/>
-      <source>Error Message</source>
-      <translation type="unfinished">Error Message</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="271"/>
-      <source>Max Cache Disk Size (MB):</source>
-      <translation type="unfinished">Max Cache Disk Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="287"/>
-      <source>Max Cache Memory Size (MB):</source>
-      <translation type="unfinished">Max Cache Memory Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="303"/>
-      <source>Memory cache changes require a restart to take effect.</source>
-      <translation type="unfinished">Memory cache changes require a restart to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="307"/>
-      <source>Mapbox Access Token</source>
-      <translation type="unfinished">Mapbox Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="318"/>
-      <source>To enable Mapbox maps, enter your access token.</source>
-      <translation type="unfinished">To enable Mapbox maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="324"/>
-      <source>Mapbox User Name</source>
-      <translation type="unfinished">Mapbox User Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="335"/>
-      <source>To enable custom Mapbox styles, enter your account name.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your account name.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="341"/>
-      <source>Mapbox Style ID</source>
-      <translation type="unfinished">Mapbox Style ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="352"/>
-      <source>To enable custom Mapbox styles, enter your style ID.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your style ID.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="358"/>
-      <source>Esri Access Token</source>
-      <translation type="unfinished">Esri Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="369"/>
-      <source>To enable Esri maps, enter your access token.</source>
-      <translation type="unfinished">To enable Esri maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="375"/>
-      <source>VWorld Access Token</source>
-      <translation type="unfinished">VWorld Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="386"/>
-      <source>To enable VWorld maps, enter your access token.</source>
-      <translation type="unfinished">To enable VWorld maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="392"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="403"/>
-      <source>URL with {x} {y} {z} or {zoom} substitutions</source>
-      <translation type="unfinished">URL with {x} {y} {z} or {zoom} substitutions</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="418"/>
-      <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</source>
-      <translation type="unfinished">This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="420"/>
-      <source>Delete %1 and all its tiles.
-
-Is this really what you want?</source>
-      <translation type="unfinished">Delete %1 and all its tiles.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="525"/>
-      <source>System Wide Tile Cache</source>
-      <translation type="unfinished">System Wide Tile Cache</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="538"/>
-      <source>Zoom Levels:</source>
-      <translation type="unfinished">Zoom Levels:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="545"/>
-      <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="552"/>
-      <source>Unique:</source>
-      <translation type="unfinished">Unique:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="560"/>
-      <source>Downloaded:</source>
-      <translation type="unfinished">Downloaded:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="567"/>
-      <source>Error Count:</source>
-      <translation type="unfinished">Error Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="575"/>
-      <source>Size:</source>
-      <translation type="unfinished">Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="582"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="957"/>
-      <source>Tile Count:</source>
-      <translation type="unfinished">Tile Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="589"/>
-      <source>Resume Download</source>
-      <translation type="unfinished">Resume Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="598"/>
-      <source>Cancel Download</source>
-      <translation type="unfinished">Cancel Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="607"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="609"/>
-      <source>Confirm Delete</source>
-      <translation type="unfinished">Confirm Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="612"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1209"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1289"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1002"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1159"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1313"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="686"/>
-      <source>Min Zoom: %1</source>
-      <translation type="unfinished">Min Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="726"/>
-      <source>Max Zoom: %1</source>
-      <translation type="unfinished">Max Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="772"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1034"/>
-      <source>Add New Set</source>
-      <translation type="unfinished">Add New Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="800"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="813"/>
-      <source>Map type:</source>
-      <translation type="unfinished">Map type:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="836"/>
-      <source>Fetch elevation data</source>
-      <translation type="unfinished">Fetch elevation data</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="862"/>
-      <source>Min/Max Zoom Levels</source>
-      <translation type="unfinished">Min/Max Zoom Levels</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="966"/>
-      <source>Est Size:</source>
-      <translation type="unfinished">Est Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="978"/>
-      <source>Too many tiles</source>
-      <translation type="unfinished">Too many tiles</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="989"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1072"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1303"/>
-      <source>Import</source>
-      <translation type="unfinished">Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1081"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1149"/>
-      <source>Export</source>
-      <translation type="unfinished">Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1087"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1089"/>
-      <source>Offline Maps Options</source>
-      <translation type="unfinished">Offline Maps Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1110"/>
-      <source>Select Tile Sets to Export</source>
-      <translation type="unfinished">Select Tile Sets to Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1139"/>
-      <source>Select All</source>
-      <translation type="unfinished">Select All</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1144"/>
-      <source>Select None</source>
-      <translation type="unfinished">Select None</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1153"/>
-      <source>Export Tile Set</source>
-      <translation type="unfinished">Export Tile Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Progress</source>
-      <translation type="unfinished">Tile Set Export Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Completed</source>
-      <translation type="unfinished">Tile Set Export Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1244"/>
-      <source>Map Tile Set Import</source>
-      <translation type="unfinished">Map Tile Set Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1246"/>
-      <source>Map Tile Set Import Progress</source>
-      <translation type="unfinished">Map Tile Set Import Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1248"/>
-      <source>Map Tile Set Import Completed</source>
-      <translation type="unfinished">Map Tile Set Import Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1276"/>
-      <source>Append to existing set</source>
-      <translation type="unfinished">Append to existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1282"/>
-      <source>Replace existing set</source>
-      <translation type="unfinished">Replace existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1307"/>
-      <source>Import Tile Set</source>
-      <translation type="unfinished">Import Tile Set</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineVehicleFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
-      <source>Vehicle Information</source>
-      <translation type="unfinished">Vehicle Information</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
-      <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>PIDTuning</name>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune enabled</source>
-      <translation type="unfinished">Autotune enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune disabled</source>
-      <translation type="unfinished">Autotune disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="227"/>
-      <source>Select Tuning:</source>
-      <translation type="unfinished">Select Tuning:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="253"/>
-      <source>Clipboard Values:</source>
-      <translation type="unfinished">Clipboard Values:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="279"/>
-      <source>Save To Clipboard</source>
-      <translation type="unfinished">Save To Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="284"/>
-      <source>Restore From Clipboard</source>
-      <translation type="unfinished">Restore From Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="343"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="371"/>
-      <source>Automatic Flight Mode Switching</source>
-      <translation type="unfinished">Automatic Flight Mode Switching</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="381"/>
-      <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
-      <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
-      <source>Switches to &apos;%1&apos; when you click Stop.</source>
-      <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <source>FLIGHT MODES</source>
-      <translation type="unfinished">FLIGHT MODES</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <source>You can assign multiple flight modes to a single channel. </source>
-      <translation type="unfinished">You can assign multiple flight modes to a single channel. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <source>Turn your radio control on to test switch settings. </source>
-      <translation type="unfinished">Turn your radio control on to test switch settings. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <source>The following channels: </source>
-      <translation type="unfinished">The following channels: </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <source> are not available for Flight Modes since they are already in use for other functions.</source>
-      <translation type="unfinished"> are not available for Flight Modes since they are already in use for other functions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <source>Manual/Main</source>
-      <translation type="unfinished">Manual/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <source>Stabilized/Main</source>
-      <translation type="unfinished">Stabilized/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <source>The pilot has full control of the aircraft, no assistance is provided. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, no assistance is provided. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <source>The Main mode switch must always be assigned to a channel in order to fly</source>
-      <translation type="unfinished">The Main mode switch must always be assigned to a channel in order to fly</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <source>The pilot has full control of the aircraft, only attitude is stabilized. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, only attitude is stabilized. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <source>Assist</source>
-      <translation type="unfinished">Assist</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <source>If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <source>In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</source>
-      <translation type="unfinished">In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <source>If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <source>In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</source>
-      <translation type="unfinished">In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <source>Roll/pitch angles and rudder deflection are controlled. </source>
-      <translation type="unfinished">Roll/pitch angles and rudder deflection are controlled. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <source>The angular rates are controlled, but not the attitude. </source>
-      <translation type="unfinished">The angular rates are controlled, but not the attitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <source>Roll stick controls banking, pitch stick altitude </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick altitude </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <source>Throttle stick controls speed. </source>
-      <translation type="unfinished">Throttle stick controls speed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <source>With no stick inputs the plane holds heading, but drifts off in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane holds heading, but drifts off in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <source>Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </source>
-      <translation type="unfinished">Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <source>Position Control</source>
-      <translation type="unfinished">Position Control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <source>Roll stick controls banking, pitch stick controls altitude. </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick controls altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <source>Throttle stick controls speed.</source>
-      <translation type="unfinished">Throttle stick controls speed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <source>With no stick inputs the plane flies a straight line, even in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane flies a straight line, even in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <source>Roll and Pitch sticks control sideways and forward speed </source>
-      <translation type="unfinished">Roll and Pitch sticks control sideways and forward speed </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <source>Throttle stick controls climb / sink rade. </source>
-      <translation type="unfinished">Throttle stick controls climb / sink rade. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <source>The aircraft obeys the programmed mission sent by QGroundControl. </source>
-      <translation type="unfinished">The aircraft obeys the programmed mission sent by QGroundControl. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <source>The aircraft flies in a circle around the current position at the current altitude. </source>
-      <translation type="unfinished">The aircraft flies in a circle around the current position at the current altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <source>The multirotor hovers at the current position and altitude. </source>
-      <translation type="unfinished">The multirotor hovers at the current position and altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <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 launch position, loiters and then lands. </source>
-      <translation type="unfinished">The vehicle returns to the launch position, loiters and then lands. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <source>All flight control aspects are controlled by an offboard system.</source>
-      <translation type="unfinished">All flight control aspects are controlled by an offboard system.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <source>Flight Mode Config is disabled since you have a Joystick enabled.</source>
-      <translation type="unfinished">Flight Mode Config is disabled since you have a Joystick enabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <source>Use Single Channel Mode Selection</source>
-      <translation type="unfinished">Use Single Channel Mode Selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <source>Generate Thresholds</source>
-      <translation type="unfinished">Generate Thresholds</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModesController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="151"/>
-      <source>%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="167"/>
-      <source>%1 is set to same channel as %2.
-</source>
-      <translation type="unfinished">%1 is set to same channel as %2.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="177"/>
-      <source>%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="144"/>
-      <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="37"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="38"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
-      <source>Rattitude</source>
-      <translation type="unfinished">Rattitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
-      <source>Return to Groundstation</source>
-      <translation type="unfinished">Return to Groundstation</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="187"/>
-      <source>Unknown %1:%2</source>
-      <translation type="unfinished">Unknown %1:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="396"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="416"/>
-      <source>Unable to go to location, vehicle position not known.</source>
-      <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="489"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="498"/>
-      <source>Unable to change altitude, home position unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="502"/>
-      <source>Unable to change altitude, home position altitude unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="533"/>
-      <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="537"/>
-      <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="609"/>
-      <source>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</source>
-      <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwareUpgradeThreadWorker</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="153"/>
-      <source>Programming new version...</source>
-      <translation type="unfinished">Programming new version...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="163"/>
-      <source>Verifying program...</source>
-      <translation type="unfinished">Verifying program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="167"/>
-      <source>Verify complete</source>
-      <translation type="unfinished">Verify complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="174"/>
-      <source>Rebooting board</source>
-      <translation type="unfinished">Rebooting board</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="198"/>
-      <source>Erasing previous program...</source>
-      <translation type="unfinished">Erasing previous program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="202"/>
-      <source>Erase complete</source>
-      <translation type="unfinished">Erase complete</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehavior</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
-      <source>Flight Behavior</source>
-      <translation type="unfinished">Flight Behavior</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
-      <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehaviorCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <source>Responsiveness</source>
-      <translation type="unfinished">Responsiveness</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <source>Horizontal velocity (m/s)</source>
-      <translation type="unfinished">Horizontal velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <source>Vertial velocity (m/s)</source>
-      <translation type="unfinished">Vertial velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <source>Mission Turning Radius</source>
-      <translation type="unfinished">Mission Turning Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlowSensor</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FlowSensor.qml" line="23"/>
-      <source>PX4Flow Camera</source>
-      <translation type="unfinished">PX4Flow Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4ParameterMetaData</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="342"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="16"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="27"/>
-      <source>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</source>
-      <translation type="unfinished">Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <source>Flaps</source>
-      <translation type="unfinished">Flaps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <source>Aux1</source>
-      <translation type="unfinished">Aux1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <source>Aux2</source>
-      <translation type="unfinished">Aux2</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4SimpleFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <source>Mode Channel</source>
-      <translation type="unfinished">Mode Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <source>Flight Mode %1</source>
-      <translation type="unfinished">Flight Mode %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <source>Switch Settings</source>
-      <translation type="unfinished">Switch Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
-      <source>PID Tuning</source>
-      <translation type="unfinished">PID Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
-      <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <source>Rate Controller</source>
-      <translation type="unfinished">Rate Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <source>Attitude Controller</source>
-      <translation type="unfinished">Attitude Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <source>Velocity Controller</source>
-      <translation type="unfinished">Velocity Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <source>Position Controller</source>
-      <translation type="unfinished">Position Controller</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAttitude</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <source>Proportional Gain (MC_YAW_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterPosition</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <source>Proportional gain (MPC_Z_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterRate</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterVelocity</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <source>Increase to reduce steady-state error</source>
-      <translation type="unfinished">Increase to reduce steady-state error</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <source>TECS</source>
-      <translation type="unfinished">TECS</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneTECS</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <source>Altitude &amp; Airspeed</source>
-      <translation type="unfinished">Altitude &amp; Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <source>TODO</source>
-      <translation type="unfinished">TODO</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentVTOL</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <source>Multirotor</source>
-      <translation type="unfinished">Multirotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingManager</name>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
-      <source>Pairing Successfull</source>
-      <translation type="unfinished">Pairing Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
-      <source>Connection Successfull</source>
-      <translation type="unfinished">Connection Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
-      <source>Connection Rejected</source>
-      <translation type="unfinished">Connection Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
-      <source>Pairing Rejected</source>
-      <translation type="unfinished">Pairing Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
-      <source>No Response From Vehicle</source>
-      <translation type="unfinished">No Response From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
-      <source>Connecting to %1</source>
-      <translation type="unfinished">Connecting to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
-      <source>Invalid Pairing File</source>
-      <translation type="unfinished">Invalid Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="257"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="265"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="278"/>
-      <source>Error Parsing Pairing File</source>
-      <translation type="unfinished">Error Parsing Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
-      <source>NFC</source>
-      <translation type="unfinished">NFC</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="495"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="517"/>
-      <source>Pairing...</source>
-      <translation type="unfinished">Pairing...</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingNFC</name>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="30"/>
-      <source>Waiting for NFC connection</source>
-      <translation type="unfinished">Waiting for NFC connection</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
-      <source>Device detected</source>
-      <translation type="unfinished">Device detected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
-      <source>Device removed</source>
-      <translation type="unfinished">Device removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterDiffDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="42"/>
-      <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="43"/>
-      <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="71"/>
-      <source>Comp ID</source>
-      <translation type="unfinished">Comp ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="78"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="84"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="93"/>
-      <source>N/A</source>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditor</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="63"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="85"/>
-      <source>Show modified only</source>
-      <translation type="unfinished">Show modified only</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
-      <source>Tools</source>
-      <translation type="unfinished">Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="105"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="109"/>
-      <source>Reset all to firmware&apos;s defaults</source>
-      <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="110"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="115"/>
-      <source>Reset All</source>
-      <translation type="unfinished">Reset All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="113"/>
-      <source>Reset to vehicle&apos;s configuration defaults</source>
-      <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="119"/>
-      <source>Load from file...</source>
-      <translation type="unfinished">Load from file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="121"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="127"/>
-      <source>Save to file...</source>
-      <translation type="unfinished">Save to file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="129"/>
-      <source>Save Parameters</source>
-      <translation type="unfinished">Save Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="136"/>
-      <source>Clear all RC to Param</source>
-      <translation type="unfinished">Clear all RC to Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="318"/>
-      <source>Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="142"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="143"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="275"/>
-      <source>Parameter Editor</source>
-      <translation type="unfinished">Parameter Editor</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>Parameter Files (*.%1)</source>
-      <translation type="unfinished">Parameter Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="333"/>
-      <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="350"/>
-      <source>Select Ok to reboot vehicle.</source>
-      <translation type="unfinished">Select Ok to reboot vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorController</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="217"/>
-      <source>Unable to create file: %1</source>
-      <translation type="unfinished">Unable to create file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="258"/>
-      <source>Unable to open file: %1</source>
-      <translation type="unfinished">Unable to open file: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="135"/>
-      <source>Reset to default</source>
-      <translation type="unfinished">Reset to default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="209"/>
-      <source>Min: </source>
-      <translation type="unfinished">Min: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="214"/>
-      <source>Max: </source>
-      <translation type="unfinished">Max: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="219"/>
-      <source>Default: </source>
-      <translation type="unfinished">Default: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="225"/>
-      <source>Parameter name: </source>
-      <translation type="unfinished">Parameter name: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
-      <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
-      <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="243"/>
-      <source>Make sure you know what you are doing and double-check your values before Save!</source>
-      <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
-      <source>Force save (dangerous!)</source>
-      <translation type="unfinished">Force save (dangerous!)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="267"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="282"/>
-      <source>Manual Entry</source>
-      <translation type="unfinished">Manual Entry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
-      <source>Set RC to Param</source>
-      <translation type="unfinished">Set RC to Param</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterManager</name>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="678"/>
-      <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="700"/>
-      <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="926"/>
-      <source>Parameter cache CRC match failed</source>
-      <translation type="unfinished">Parameter cache CRC match failed</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="977"/>
-      <source>Parameters not loaded since they are not currently on the vehicle: %1
-</source>
-      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
-</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="981"/>
-      <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1149"/>
-      <source>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</source>
-      <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1175"/>
-      <source>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</source>
-      <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PhotoVideoControl</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
-      <source>Video Grab</source>
-      <translation type="unfinished">Video Grab</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="243"/>
-      <source>Camera Trigger</source>
-      <translation type="unfinished">Camera Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="299"/>
-      <source>Free Space: </source>
-      <translation type="unfinished">Free Space: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="305"/>
-      <source>Battery: </source>
-      <translation type="unfinished">Battery: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="316"/>
-      <source>Settings</source>
-      <translation type="unfinished">Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="331"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
-      <source>Video Stream</source>
-      <translation type="unfinished">Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
-      <source>Thermal View Mode</source>
-      <translation type="unfinished">Thermal View Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
-      <source>Blend Opacity</source>
-      <translation type="unfinished">Blend Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="364"/>
-      <source>Photo Mode</source>
-      <translation type="unfinished">Photo Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
-      <source>Photo Interval (seconds)</source>
-      <translation type="unfinished">Photo Interval (seconds)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
-      <source>Video Screen Fit</source>
-      <translation type="unfinished">Video Screen Fit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
-      <source>Reset Camera Defaults</source>
-      <translation type="unfinished">Reset Camera Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Blend</source>
-      <translation type="unfinished">Blend</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Full</source>
-      <translation type="unfinished">Full</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Picture In Picture</source>
-      <translation type="unfinished">Picture In Picture</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Time Lapse</source>
-      <translation type="unfinished">Time Lapse</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="533"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
-      <source>Reset Camera to Factory Settings</source>
-      <translation type="unfinished">Reset Camera to Factory Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
-      <source>Confirm resetting all settings?</source>
-      <translation type="unfinished">Confirm resetting all settings?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="551"/>
-      <source>Format</source>
-      <translation type="unfinished">Format</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="556"/>
-      <source>Format Camera Storage</source>
-      <translation type="unfinished">Format Camera Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="557"/>
-      <source>Confirm erasing all files?</source>
-      <translation type="unfinished">Confirm erasing all files?</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanManager</name>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="178"/>
-      <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
-      <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="183"/>
-      <source>Mission request list failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="187"/>
-      <source>Retrying %1 REQUEST_LIST retry Count</source>
-      <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="194"/>
-      <source>Mission read failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="198"/>
-      <source>Retrying %1 MISSION_REQUEST retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="206"/>
-      <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
-      <source>Mission write mission count failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="220"/>
-      <source>Vehicle did not request all items from ground station: %1</source>
-      <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="228"/>
-      <source>Mission remove all, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="232"/>
-      <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="239"/>
-      <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="350"/>
-      <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="500"/>
-      <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="615"/>
-      <source>Vehicle remove all failed. Error: %1</source>
-      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="690"/>
-      <source>Item #%1 Command: %2</source>
-      <translation type="unfinished">Item #%1 Command: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="694"/>
-      <source>Frame: %1</source>
-      <translation type="unfinished">Frame: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="700"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="703"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="706"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="709"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="712"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="715"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="718"/>
-      <source>Value: %1</source>
-      <translation type="unfinished">Value: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="737"/>
-      <source>Mission accepted.</source>
-      <translation type="unfinished">Mission accepted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="740"/>
-      <source>Unspecified error.</source>
-      <translation type="unfinished">Unspecified error.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="743"/>
-      <source>Coordinate frame is not supported.</source>
-      <translation type="unfinished">Coordinate frame is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="746"/>
-      <source>Command is not supported.</source>
-      <translation type="unfinished">Command is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="749"/>
-      <source>Mission item exceeds storage space.</source>
-      <translation type="unfinished">Mission item exceeds storage space.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="752"/>
-      <source>One of the parameters has an invalid value.</source>
-      <translation type="unfinished">One of the parameters has an invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="755"/>
-      <source>Param 1 invalid value.</source>
-      <translation type="unfinished">Param 1 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="758"/>
-      <source>Param 2 invalid value.</source>
-      <translation type="unfinished">Param 2 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="761"/>
-      <source>Param 3 invalid value.</source>
-      <translation type="unfinished">Param 3 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="764"/>
-      <source>Param 4 invalid value.</source>
-      <translation type="unfinished">Param 4 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="767"/>
-      <source>Param 5 invalid value.</source>
-      <translation type="unfinished">Param 5 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="770"/>
-      <source>Param 6 invalid value.</source>
-      <translation type="unfinished">Param 6 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="773"/>
-      <source>Param 7 invalid value.</source>
-      <translation type="unfinished">Param 7 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="776"/>
-      <source>Received mission item out of sequence.</source>
-      <translation type="unfinished">Received mission item out of sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="779"/>
-      <source>Not accepting any mission commands.</source>
-      <translation type="unfinished">Not accepting any mission commands.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-      <source>Unknown error: %1.</source>
-      <translation type="unfinished">Unknown error: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="626"/>
-      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanMasterController</name>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="223"/>
-      <source>Download not supported on high latency links.</source>
-      <translation type="unfinished">Download not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="337"/>
-      <source>Upload not supported on high latency links.</source>
-      <translation type="unfinished">Upload not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="357"/>
-      <source>Error loading Plan file (%1). %2</source>
-      <translation type="unfinished">Error loading Plan file (%1). %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="481"/>
-      <source>Plan save error %1 : %2</source>
-      <translation type="unfinished">Plan save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="513"/>
-      <source>KML save error %1 : %2</source>
-      <translation type="unfinished">KML save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="584"/>
-      <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
-      <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="585"/>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>Plan Files (*.%1)</source>
-      <translation type="unfinished">Plan Files (*.%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanToolBarIndicators</name>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="138"/>
-      <source>Selected Waypoint</source>
-      <translation type="unfinished">Selected Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="143"/>
-      <source>Alt diff:</source>
-      <translation type="unfinished">Alt diff:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="152"/>
-      <source>Azimuth:</source>
-      <translation type="unfinished">Azimuth:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="161"/>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="197"/>
-      <source>Distance:</source>
-      <translation type="unfinished">Distance:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="168"/>
-      <source>Gradient:</source>
-      <translation type="unfinished">Gradient:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="177"/>
-      <source>Heading:</source>
-      <translation type="unfinished">Heading:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="192"/>
-      <source>Total Mission</source>
-      <translation type="unfinished">Total Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="206"/>
-      <source>Max telem dist:</source>
-      <translation type="unfinished">Max telem dist:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="213"/>
-      <source>Time:</source>
-      <translation type="unfinished">Time:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="229"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="234"/>
-      <source>Batteries required:</source>
-      <translation type="unfinished">Batteries required:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload Required</source>
-      <translation type="unfinished">Upload Required</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="308"/>
-      <source>Syncing Mission</source>
-      <translation type="unfinished">Syncing Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="316"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanView</name>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="62"/>
-      <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation type="unfinished">Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="129"/>
-      <source>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</source>
-      <translation type="unfinished">You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="209"/>
-      <source>You need at least one item to create a KML.</source>
-      <translation type="unfinished">You need at least one item to create a KML.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Plan is waiting on terrain data from server for correct altitude values.</source>
-      <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="263"/>
-      <source>Plan Upload</source>
-      <translation type="unfinished">Plan Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="269"/>
-      <source>Select Plan File</source>
-      <translation type="unfinished">Select Plan File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="280"/>
-      <source>Save Plan</source>
-      <translation type="unfinished">Save Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="295"/>
-      <source>Save KML</source>
-      <translation type="unfinished">Save KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="401"/>
-      <source>Move the selected mission item to the be after following mission item:</source>
-      <translation type="unfinished">Move the selected mission item to the be after following mission item:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="642"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="685"/>
-      <source>Pattern</source>
-      <translation type="unfinished">Pattern</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="708"/>
-      <source>Center</source>
-      <translation type="unfinished">Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="619"/>
-      <location filename="../src/PlanView/PlanView.qml" line="785"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="121"/>
-      <source>Apply new altitude</source>
-      <translation type="unfinished">Apply new altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Disconnected</source>
-      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Changed</source>
-      <translation type="unfinished">Plan View - Vehicle Changed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="148"/>
-      <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="149"/>
-      <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="156"/>
-      <source>Discard Unsaved Changes</source>
-      <translation type="unfinished">Discard Unsaved Changes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="157"/>
-      <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="158"/>
-      <source>Load New Plan From Vehicle</source>
-      <translation type="unfinished">Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="169"/>
-      <source>Keep Current Plan</source>
-      <translation type="unfinished">Keep Current Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="170"/>
-      <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="187"/>
-      <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Send To Vehicle</source>
-      <translation type="unfinished">Send To Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="637"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="651"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>Cancel ROI</source>
-      <translation type="unfinished">Cancel ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="817"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="820"/>
-      <source>Fence</source>
-      <translation type="unfinished">Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="824"/>
-      <source>Rally</source>
-      <translation type="unfinished">Rally</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="942"/>
-      <source>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="954"/>
-      <source>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1228"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="978"/>
-      <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1004"/>
-      <source>Create complex pattern:</source>
-      <translation type="unfinished">Create complex pattern:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Mission overwrite</source>
-      <translation type="unfinished">Mission overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>GeoFence overwrite</source>
-      <translation type="unfinished">GeoFence overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Rally Points overwrite</source>
-      <translation type="unfinished">Rally Points overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1037"/>
-      <source>You have unsaved changes.</source>
-      <translation type="unfinished">You have unsaved changes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1136"/>
-      <source>Open...</source>
-      <translation type="unfinished">Open...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1150"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Unable to %1</source>
-      <translation type="unfinished">Unable to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <source>Plan has incomplete items. Complete all items and %1 again.</source>
-      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="967"/>
-      <source>Are you sure you want to remove current plan and create a new plan? </source>
-      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1036"/>
-      <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1044"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1096"/>
-      <source>Create Plan</source>
-      <translation type="unfinished">Create Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1115"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1164"/>
-      <source>Save As...</source>
-      <translation type="unfinished">Save As...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1176"/>
-      <source>Save Mission Waypoints As KML...</source>
-      <translation type="unfinished">Save Mission Waypoints As KML...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1181"/>
-      <source>KML</source>
-      <translation type="unfinished">KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1202"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1193"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1213"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-  </context>
-  <context>
-    <name>PolygonEditor</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>Click to add point %1</source>
-      <translation type="unfinished">Click to add point %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>- Right Click to end polygon</source>
-      <translation type="unfinished">- Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="185"/>
-      <source>Click to add point</source>
-      <translation type="unfinished">Click to add point</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="192"/>
-      <source>Click to add point - Right Click to end polygon</source>
-      <translation type="unfinished">Click to add point - Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="198"/>
-      <source>Adjust polygon by dragging corners</source>
-      <translation type="unfinished">Adjust polygon by dragging corners</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <source>Performing calibration. This will take a few seconds..</source>
-      <translation type="unfinished">Performing calibration. This will take a few seconds..</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>ESC Calibration failed</source>
-      <translation type="unfinished">ESC Calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <source>ESC Calibration failed. </source>
-      <translation type="unfinished">ESC Calibration failed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <source>Calibration complete. You can disconnect your battery now if you like.</source>
-      <translation type="unfinished">Calibration complete. You can disconnect your battery now if you like.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source> Connect the battery now and calibration will begin.</source>
-      <translation type="unfinished"> Connect the battery now and calibration will begin.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</source>
-      <translation type="unfinished">You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <source>Battery </source>
-      <translation type="unfinished">Battery </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <source>Voltage divider:</source>
-      <translation type="unfinished">Voltage divider:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <source>Number of Cells (in Series)</source>
-      <translation type="unfinished">Number of Cells (in Series)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <source>Full Voltage (per cell)</source>
-      <translation type="unfinished">Full Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <source>Battery Max:</source>
-      <translation type="unfinished">Battery Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <source>Empty Voltage (per cell)</source>
-      <translation type="unfinished">Empty Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <source>Battery Min:</source>
-      <translation type="unfinished">Battery Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <source>Voltage divider</source>
-      <translation type="unfinished">Voltage divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <source>Calculate Voltage Divider</source>
-      <translation type="unfinished">Calculate Voltage Divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <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. </source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <source>Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <source>Amps per volt</source>
-      <translation type="unfinished">Amps per volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <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. </source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <source>ESC PWM Minimum and Maximum Calibration</source>
-      <translation type="unfinished">ESC PWM Minimum and Maximum Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <source>You must use USB connection for this operation.</source>
-      <translation type="unfinished">You must use USB connection for this operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <source>Show UAVCAN Settings</source>
-      <translation type="unfinished">Show UAVCAN Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <source>UAVCAN Bus Configuration</source>
-      <translation type="unfinished">UAVCAN Bus Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <source>Change required restart</source>
-      <translation type="unfinished">Change required restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <source>UAVCAN Motor Index and Direction Assignment</source>
-      <translation type="unfinished">UAVCAN Motor Index and Direction Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <source>ESC parameters will only be accessible in the editor after assignment.</source>
-      <translation type="unfinished">ESC parameters will only be accessible in the editor after assignment.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <source>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</source>
-      <translation type="unfinished">Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <source>Start Assignment</source>
-      <translation type="unfinished">Start Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <source>Stop Assignment</source>
-      <translation type="unfinished">Stop Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <source>Show Advanced Settings</source>
-      <translation type="unfinished">Show Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <source>Voltage Drop on Full Load (per cell)</source>
-      <translation type="unfinished">Voltage Drop on Full Load (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <source>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </source>
-      <translation type="unfinished">Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <source>throttle, divided by the number of battery cells. Leave at the default if unsure. </source>
-      <translation type="unfinished">throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <source>If this value is set too high, the battery might be deep discharged and damaged.</source>
-      <translation type="unfinished">If this value is set too high, the battery might be deep discharged and damaged.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <source>Compensated Minimum Voltage:</source>
-      <translation type="unfinished">Compensated Minimum Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <source> V</source>
-      <translation type="unfinished"> V</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="19"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="30"/>
-      <source>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</source>
-      <translation type="unfinished">Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <source>Battery Full</source>
-      <translation type="unfinished">Battery Full</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <source>Battery Empty</source>
-      <translation type="unfinished">Battery Empty</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <source>Number of Cells</source>
-      <translation type="unfinished">Number of Cells</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightBatteryCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="18"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="19"/>
-      <source>Battery connector firmly plugged?</source>
-      <translation type="unfinished">Battery connector firmly plugged?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="22"/>
-      <source>Warning - Battery charge below %1%.</source>
-      <translation type="unfinished">Warning - Battery charge below %1%.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="23"/>
-      <source>Battery charge below %1%. Please recharge.</source>
-      <translation type="unfinished">Battery charge below %1%. Please recharge.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckButton</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="54"/>
-      <source>Passed</source>
-      <translation type="unfinished">Passed</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckGroup</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
-      <source> (passed)</source>
-      <translation type="unfinished"> (passed)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckList</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>Pre-Flight Checklist %1</source>
-      <translation type="unfinished">Pre-Flight Checklist %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>(passed)</source>
-      <translation type="unfinished">(passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="93"/>
-      <source>Reset the checklist (e.g. after a vehicle reboot)</source>
-      <translation type="unfinished">Reset the checklist (e.g. after a vehicle reboot)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>(Passed)</source>
-      <translation type="unfinished">(Passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>In Progress</source>
-      <translation type="unfinished">In Progress</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckListShowAction</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
-      <source>Checklist</source>
-      <translation type="unfinished">Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightGPSCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="17"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="20"/>
-      <source>Waiting for 3D lock.</source>
-      <translation type="unfinished">Waiting for 3D lock.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Warning - Sat count below %1.</source>
-      <translation type="unfinished">Warning - Sat count below %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Waiting for sat count above %1.</source>
-      <translation type="unfinished">Waiting for sat count above %1.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightRCCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="17"/>
-      <source>Radio Control</source>
-      <translation type="unfinished">Radio Control</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="18"/>
-      <source>Receiving signal. Perform range test &amp; confirm.</source>
-      <translation type="unfinished">Receiving signal. Perform range test &amp; confirm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="19"/>
-      <source>No signal or invalid autopilot-RC config. Check RC and console.</source>
-      <translation type="unfinished">No signal or invalid autopilot-RC config. Check RC and console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSensorsHealthCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="17"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="35"/>
-      <source>Failure. Magnetometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Magnetometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="36"/>
-      <source>Failure. Accelerometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Accelerometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="37"/>
-      <source>Failure. Gyroscope issues. Check console.</source>
-      <translation type="unfinished">Failure. Gyroscope issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="38"/>
-      <source>Failure. Barometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Barometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="39"/>
-      <source>Failure. Airspeed sensor issues. Check console.</source>
-      <translation type="unfinished">Failure. Airspeed sensor issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="40"/>
-      <source>Failure. AHRS issues. Check console.</source>
-      <translation type="unfinished">Failure. AHRS issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="41"/>
-      <source>Failure. GPS issues. Check console.</source>
-      <translation type="unfinished">Failure. GPS issues. Check console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSoundCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="16"/>
-      <source>Sound output</source>
-      <translation type="unfinished">Sound output</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="17"/>
-      <source>QGC audio output enabled. System audio output enabled, too?</source>
-      <translation type="unfinished">QGC audio output enabled. System audio output enabled, too?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="18"/>
-      <source>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</source>
-      <translation type="unfinished">QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
-    </message>
-  </context>
-  <context>
-    <name>ProximityRadarValues</name>
-    <message>
-      <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCApplication</name>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="198"/>
-      <source>You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="214"/>
-      <source>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="580"/>
-      <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
-      <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="588"/>
-      <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
-      <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="656"/>
-      <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
-      <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="714"/>
-      <source>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</source>
-      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>New Version Available</source>
-      <translation type="unfinished">New Version Available</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="673"/>
-      <source>Unable to save telemetry log. Application save directory is not set.</source>
-      <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="680"/>
-      <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
-      <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCControlDebug</name>
-    <message>
-      <location filename="../src/QmlControls/QGCControlDebug.qml" line="22"/>
-      <source>%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</source>
-      <comment>Do not translate</comment>
-      <translation type="unfinished">%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCCorePlugin</name>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="134"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="138"/>
-      <source>Comm Links</source>
-      <translation type="unfinished">Comm Links</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="142"/>
-      <source>Offline Maps</source>
-      <translation type="unfinished">Offline Maps</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="147"/>
-      <source>Taisync</source>
-      <translation type="unfinished">Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="153"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="159"/>
-      <source>AirMap</source>
-      <translation type="unfinished">AirMap</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="164"/>
-      <source>MAVLink</source>
-      <translation type="unfinished">MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="168"/>
-      <source>Console</source>
-      <translation type="unfinished">Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="171"/>
-      <source>Help</source>
-      <translation type="unfinished">Help</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="176"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="179"/>
-      <source>Debug</source>
-      <translation type="unfinished">Debug</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="182"/>
-      <source>Palette Test</source>
-      <translation type="unfinished">Palette Test</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="201"/>
-      <source>Vibration</source>
-      <translation type="unfinished">Vibration</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
-      <source>Log Download</source>
-      <translation type="unfinished">Log Download</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
-      <source>GeoTag Images</source>
-      <translation type="unfinished">GeoTag Images</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="197"/>
-      <source>MAVLink Console</source>
-      <translation type="unfinished">MAVLink Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="199"/>
-      <source>MAVLink Inspector</source>
-      <translation type="unfinished">MAVLink Inspector</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="286"/>
-      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
-      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFenceCircle</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
-      <source>GeoFence Circle only supports version %1</source>
-      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFencePolygon</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
-      <source>GeoFence Polygon only supports version %1</source>
-      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="123"/>
-      <source>Path: %1</source>
-      <translation type="unfinished">Path: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="154"/>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="267"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="165"/>
-      <source>No files</source>
-      <translation type="unfinished">No files</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="206"/>
-      <source>New file name:</source>
-      <translation type="unfinished">New file name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="219"/>
-      <source>File names must end with .%1 file extension. If missing it will be added.</source>
-      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="227"/>
-      <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="235"/>
-      <source>Save to existing file:</source>
-      <translation type="unfinished">Save to existing file:</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDownload</name>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="102"/>
-      <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="112"/>
-      <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="135"/>
-      <source>Download cancelled</source>
-      <translation type="unfinished">Download cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="138"/>
-      <source>Error: File Not Found</source>
-      <translation type="unfinished">Error: File Not Found</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="141"/>
-      <source>Error during download. Error: %1</source>
-      <translation type="unfinished">Error during download. Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCLogEntry</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-      <source>Pending</source>
-      <translation type="unfinished">Pending</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMAVLinkSystem</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="587"/>
-      <source>Comp All</source>
-      <translation type="unfinished">Comp All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="592"/>
-      <source>Comp %1</source>
-      <translation type="unfinished">Comp %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolygonVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
-      <source>Polygon Tools</source>
-      <translation type="unfinished">Polygon Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="51"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
-      <source>Set radius...</source>
-      <translation type="unfinished">Set radius...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
-      <source>Edit Center Position</source>
-      <translation type="unfinished">Edit Center Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
-      <source>Edit Vertex Position</source>
-      <translation type="unfinished">Edit Vertex Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
-      <source>Circular</source>
-      <translation type="unfinished">Circular</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolylineVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
-      <source>Polyline Tools</source>
-      <translation type="unfinished">Polyline Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="41"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
-      <source>Select KML File</source>
-      <translation type="unfinished">Select KML File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="335"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="359"/>
-      <source>Load KML...</source>
-      <translation type="unfinished">Load KML...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCOptionsComboBox</name>
-    <message>
-      <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPluginHost</name>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
-      <source>Loaded Plugins</source>
-      <translation type="unfinished">Loaded Plugins</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
-      <source>Plugin Log</source>
-      <translation type="unfinished">Plugin Log</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPopupDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCTextField</name>
-    <message>
-      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-      <source>?</source>
-      <translation type="unfinished">?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCViewDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="34"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="37"/>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="46"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="40"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="43"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="49"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="52"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="55"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="58"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="61"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="64"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="67"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="73"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="76"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="79"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="82"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="85"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGroundControlQmlGlobal</name>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="254"/>
-      <source>32 bit</source>
-      <translation type="unfinished">32 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="256"/>
-      <source>64 bit</source>
-      <translation type="unfinished">64 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="270"/>
-      <source>(AMSL)</source>
-      <translation type="unfinished">(AMSL)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="272"/>
-      <source>(CalcT)</source>
-      <translation type="unfinished">(CalcT)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="292"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="294"/>
-      <source>Calc Above Terrain</source>
-      <translation type="unfinished">Calc Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="298"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="274"/>
-      <source>(TerrF)</source>
-      <translation type="unfinished">(TerrF)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="290"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="296"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-  </context>
-  <context>
-    <name>QMap3D</name>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="20"/>
-      <source>Map</source>
-      <translation type="unfinished">Map</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="30"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>QObject</name>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
-      <source>OpenPilot</source>
-      <translation type="unfinished">OpenPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="68"/>
-      <source>Guided mode not supported by Vehicle.</source>
-      <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="32"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="46"/>
-      <source>The following required keys are missing: %1</source>
-      <translation type="unfinished">The following required keys are missing: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="60"/>
-      <source>value for coordinate is not array</source>
-      <translation type="unfinished">value for coordinate is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="67"/>
-      <source>Coordinate array must contain %1 values</source>
-      <translation type="unfinished">Coordinate array must contain %1 values</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="73"/>
-      <source>Coordinate array may only contain double values, found: %1</source>
-      <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="151"/>
-      <source>Incorrect value type - key:type:expected %1:%2:%3</source>
-      <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="209"/>
-      <source>Incorrect file type key expected:%1 actual:%2</source>
-      <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="216"/>
-      <source>File version %1 is no longer supported</source>
-      <translation type="unfinished">File version %1 is no longer supported</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="220"/>
-      <source>File version %1 is newer than current supported version %2</source>
-      <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="379"/>
-      <source>value for coordinate array is not array</source>
-      <translation type="unfinished">value for coordinate array is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="488"/>
-      <source>Unknown type: %1</source>
-      <translation type="unfinished">Unknown type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="252"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="253"/>
-      <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
-      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QmlTest</name>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
-      <source>Window Color</source>
-      <translation type="unfinished">Window Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
-      <source>Import/Export</source>
-      <translation type="unfinished">Import/Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
-      <source>Light</source>
-      <translation type="unfinished">Light</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
-      <source>Dark</source>
-      <translation type="unfinished">Dark</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
-      <source>QGC name</source>
-      <translation type="unfinished">QGC name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</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>
-      <translation type="unfinished">Button</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
-      <source>Hover Button</source>
-      <translation type="unfinished">Hover Button</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>
-      <translation type="unfinished">Item 1</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>
-      <translation type="unfinished">Item 2</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>
-      <translation type="unfinished">Item 3</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
-      <source>Check Box</source>
-      <translation type="unfinished">Check Box</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
-      <source>SUB MENU</source>
-      <translation type="unfinished">SUB MENU</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Status</source>
-      <translation type="unfinished">RC RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Data Unavailable</source>
-      <translation type="unfinished">RC RSSI Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>N/A</source>
-      <comment>No data available</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
-      <source>RSSI:</source>
-      <translation type="unfinished">RSSI:</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCToParamDialog</name>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
-      <source>RC To Param</source>
-      <translation type="unfinished">RC To Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="44"/>
-      <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
-      <source>Waiting on parameter update from Vehicle.</source>
-      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
-      <source>Parameter</source>
-      <translation type="unfinished">Parameter</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
-      <source>Tuning ID</source>
-      <translation type="unfinished">Tuning ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
-      <source>Scale</source>
-      <translation type="unfinished">Scale</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
-      <source>Center Value</source>
-      <translation type="unfinished">Center Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
-      <source>Min Value</source>
-      <translation type="unfinished">Min Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
-      <source>Max Value</source>
-      <translation type="unfinished">Max Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
-      <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ROIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="53"/>
-      <source>ROI Disabled</source>
-      <translation type="unfinished">ROI Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="62"/>
-      <source>Disable ROI</source>
-      <translation type="unfinished">Disable ROI</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-      <source>Reboot required</source>
-      <translation type="unfinished">Reboot required</translation>
-    </message>
-    <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>
-      <translation type="unfinished">Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-      <source>Throttle channel reversed</source>
-      <translation type="unfinished">Throttle channel reversed</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>
-      <translation type="unfinished">Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</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>
-      <translation type="unfinished">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.</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>
-      <translation type="unfinished">Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
-
-%1</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>
-      <translation type="unfinished">Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>Please turn on transmitter.</source>
-      <translation type="unfinished">Please turn on transmitter.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>%1 channels or more are needed to fly.</source>
-      <translation type="unfinished">%1 channels or more are needed to fly.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="110"/>
-      <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
-      <translation type="unfinished">Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
-      <source>DSM2 Mode</source>
-      <translation type="unfinished">DSM2 Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
-      <source>DSMX (7 channels or less)</source>
-      <translation type="unfinished">DSMX (7 channels or less)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
-      <source>DSMX (8 channels or more)</source>
-      <translation type="unfinished">DSMX (8 channels or more)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
-      <source>Attitude Controls</source>
-      <translation type="unfinished">Attitude Controls</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="246"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="275"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="304"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="332"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="338"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="348"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="371"/>
-      <source>Additional Radio setup:</source>
-      <translation type="unfinished">Additional Radio setup:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="408"/>
-      <source>Spektrum Bind</source>
-      <translation type="unfinished">Spektrum Bind</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="413"/>
-      <source>Copy Trims</source>
-      <translation type="unfinished">Copy Trims</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="437"/>
-      <source>Mode 1</source>
-      <translation type="unfinished">Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="443"/>
-      <source>Mode 2</source>
-      <translation type="unfinished">Mode 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="118"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
-      <source>Move the Throttle stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="125"/>
-      <source>Move the Throttle stick all the way down and leave it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="126"/>
-      <source>Move the Yaw stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
-      <source>Move the Yaw stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
-      <source>Move the Roll stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
-      <source>Move the Roll stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
-      <source>Move the Pitch stick all the way down and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
-      <source>Move the Pitch stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
-      <source>Allow the Pitch stick to move back to center...</source>
-      <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
-      <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-      <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
-      <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-      <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="201"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="804"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="826"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="850"/>
-      <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">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.</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointController</name>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
-      <source>Rally: %1</source>
-      <translation type="unfinished">Rally: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
-      <source>Rally Points supports version %1</source>
-      <translation type="unfinished">Rally Points supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointEditorHeader</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
-      <source>Rally Points</source>
-      <translation type="unfinished">Rally Points</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">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-  </context>
-  <context>
-    <name>RoverChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
-      <source>Rover Initial Checks</source>
-      <translation type="unfinished">Rover Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
-      <source>Battery mounted and secured?</source>
-      <translation type="unfinished">Battery mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
-      <source>Mission area</source>
-      <translation type="unfinished">Mission area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
-      <source>Mission area and path free of obstacles/people?</source>
-      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SHPFileHelper</name>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="18"/>
-      <source>SHP file load failed. %1</source>
-      <translation type="unfinished">SHP file load failed. %1</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">UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="54"/>
-      <source>Only WGS84 or UTM projections are supported.</source>
-      <translation type="unfinished">Only WGS84 or UTM projections are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="57"/>
-      <source>PRJ file open failed: %1</source>
-      <translation type="unfinished">PRJ file open failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="60"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="63"/>
-      <source>File is not a .shp file: %1</source>
-      <translation type="unfinished">File is not a .shp file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="79"/>
-      <source>SHPOpen failed.</source>
-      <translation type="unfinished">SHPOpen failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="101"/>
-      <source>More than one entity found.</source>
-      <translation type="unfinished">More than one entity found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="105"/>
-      <source>No supported types found.</source>
-      <translation type="unfinished">No supported types found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="133"/>
-      <source>File does not contain a polygon.</source>
-      <translation type="unfinished">File does not contain a polygon.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="139"/>
-      <source>Only single part polygons are supported.</source>
-      <translation type="unfinished">Only single part polygons are supported.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <source>Low Battery Failsafe Trigger</source>
-      <translation type="unfinished">Low Battery Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <source>Battery Warn Level:</source>
-      <translation type="unfinished">Battery Warn Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <source>Battery Failsafe Level:</source>
-      <translation type="unfinished">Battery Failsafe Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <source>Battery Emergency Level:</source>
-      <translation type="unfinished">Battery Emergency Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <source>Object Detection</source>
-      <translation type="unfinished">Object Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <source>Collision Prevention:</source>
-      <translation type="unfinished">Collision Prevention:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <source>Obstacle Avoidance:</source>
-      <translation type="unfinished">Obstacle Avoidance:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <source>Minimum Distance: (</source>
-      <translation type="unfinished">Minimum Distance: (</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <source>Show obstacle distance overlay</source>
-      <translation type="unfinished">Show obstacle distance overlay</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <source>RC Loss Failsafe Trigger</source>
-      <translation type="unfinished">RC Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <source>RC Loss Timeout:</source>
-      <translation type="unfinished">RC Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <source>Data Link Loss Failsafe Trigger</source>
-      <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <source>Data Link Loss Timeout:</source>
-      <translation type="unfinished">Data Link Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <source>Geofence Failsafe Trigger</source>
-      <translation type="unfinished">Geofence Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <source>Action on breach:</source>
-      <translation type="unfinished">Action on breach:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <source>Max Radius:</source>
-      <translation type="unfinished">Max Radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <source>Max Altitude:</source>
-      <translation type="unfinished">Max Altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <source>Return To Launch Settings</source>
-      <translation type="unfinished">Return To Launch Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <source>Return to launch, then:</source>
-      <translation type="unfinished">Return to launch, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <source>Telemetry logging to vehicle storage:</source>
-      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <source>Climb to altitude of:</source>
-      <translation type="unfinished">Climb to altitude of:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <source>Loiter Altitude</source>
-      <translation type="unfinished">Loiter Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <source>Land Mode Settings</source>
-      <translation type="unfinished">Land Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <source>Landing Descent Rate:</source>
-      <translation type="unfinished">Landing Descent Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <source>Disarm After:</source>
-      <translation type="unfinished">Disarm After:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <source>Vehicle Telemetry Logging</source>
-      <translation type="unfinished">Vehicle Telemetry Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <source>Hardware in the Loop Simulation</source>
-      <translation type="unfinished">Hardware in the Loop Simulation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <source>HITL Enabled:</source>
-      <translation type="unfinished">HITL Enabled:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="19"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <source>Low Battery Failsafe</source>
-      <translation type="unfinished">Low Battery Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <source>RC Loss Failsafe</source>
-      <translation type="unfinished">RC Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <source>RC Loss Timeout</source>
-      <translation type="unfinished">RC Loss Timeout</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <source>Data Link Loss Failsafe</source>
-      <translation type="unfinished">Data Link Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <source>RTL Climb To</source>
-      <translation type="unfinished">RTL Climb To</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <source>RTL, Then</source>
-      <translation type="unfinished">RTL, Then</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <source>Loiter Alt</source>
-      <translation type="unfinished">Loiter Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <source>Land Delay</source>
-      <translation type="unfinished">Land Delay</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="27"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="39"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="173"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="190"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="276"/>
-      <source>Unsupported calibration firmware version, using log</source>
-      <translation type="unfinished">Unsupported calibration firmware version, using log</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="308"/>
-      <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
-      <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation type="unfinished">Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="395"/>
-      <source>Hold still in the current orientation</source>
-      <translation type="unfinished">Hold still in the current orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="433"/>
-      <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation type="unfinished">Place you vehicle into one of the orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="442"/>
-      <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="502"/>
-      <source>Reset successful</source>
-      <translation type="unfinished">Reset successful</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="509"/>
-      <source>Reset failed</source>
-      <translation type="unfinished">Reset failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <source>Compass 0</source>
-      <translation type="unfinished">Compass 0</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <source>Compass 1</source>
-      <translation type="unfinished">Compass 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <source>Compass 2</source>
-      <translation type="unfinished">Compass 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummaryFixedWing</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <source>Compass:</source>
-      <translation type="unfinished">Compass:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <source>Gyro:</source>
-      <translation type="unfinished">Gyro:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <source>Accelerometer:</source>
-      <translation type="unfinished">Accelerometer:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <source>Airspeed:</source>
-      <translation type="unfinished">Airspeed:</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsSetup</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <source>If the orientation is in the direction of flight, select ROTATION_NONE.</source>
-      <translation type="unfinished">If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <source>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <source>Compass Calibration Complete</source>
-      <translation type="unfinished">Compass Calibration Complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Sensor Calibration</source>
-      <translation type="unfinished">Sensor Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</source>
-      <translation type="unfinished">Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <source>Set autopilot orientation before calibrating.</source>
-      <translation type="unfinished">Set autopilot orientation before calibrating.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <source>Autopilot Orientation</source>
-      <translation type="unfinished">Autopilot Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <source>Click Ok to start calibration.</source>
-      <translation type="unfinished">Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <source>Reboot the vehicle prior to flight.</source>
-      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <source>Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <source>Mag %1 Orientation</source>
-      <translation type="unfinished">Mag %1 Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <source>Gyroscope</source>
-      <translation type="unfinished">Gyroscope</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <source>Airspeed</source>
-      <translation type="unfinished">Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <source>Calibrate Airspeed</source>
-      <translation type="unfinished">Calibrate Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <source>Orientations</source>
-      <translation type="unfinished">Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <source>Set Orientations</source>
-      <translation type="unfinished">Set Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <source>Factory reset</source>
-      <translation type="unfinished">Factory reset</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialConfiguration</name>
-    <message>
-      <location filename="../src/comm/SerialLink.h" line="83"/>
-      <source>Serial Link Settings</source>
-      <translation type="unfinished">Serial Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialLink</name>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="75"/>
-      <source>Could not send data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not send data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="121"/>
-      <source>Error connecting: Could not create port. %1</source>
-      <translation type="unfinished">Error connecting: Could not create port. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="244"/>
-      <source>Could not read data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not read data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="282"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="92"/>
-      <source>Baud rate name not in combo box</source>
-      <translation type="unfinished">Baud rate name not in combo box</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="114"/>
-      <source>Enable Flow Control</source>
-      <translation type="unfinished">Enable Flow Control</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="31"/>
-      <source>Serial Port</source>
-      <translation type="unfinished">Serial Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="65"/>
-      <source>None Available</source>
-      <translation type="unfinished">None Available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="73"/>
-      <source>Baud Rate</source>
-      <translation type="unfinished">Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="102"/>
-      <source>Advanced Settings</source>
-      <translation type="unfinished">Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="119"/>
-      <source>Parity</source>
-      <translation type="unfinished">Parity</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Even</source>
-      <translation type="unfinished">Even</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Odd</source>
-      <translation type="unfinished">Odd</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="157"/>
-      <source>Data Bits</source>
-      <translation type="unfinished">Data Bits</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="165"/>
-      <source>Stop Bits</source>
-      <translation type="unfinished">Stop Bits</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupPage</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>flying</source>
-      <translation type="unfinished">flying</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="44"/>
-      <source>%1 Setup</source>
-      <translation type="unfinished">%1 Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="66"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="77"/>
-      <source> (Disabled while the vehicle is %1)</source>
-      <translation type="unfinished"> (Disabled while the vehicle is %1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupView</name>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="35"/>
-      <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation type="unfinished">This operation cannot be performed while the vehicle is armed.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="38"/>
-      <source>missing message panel text</source>
-      <translation type="unfinished">missing message panel text</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="80"/>
-      <source>%1 setup must be completed prior to %2 setup.</source>
-      <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="132"/>
-      <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="150"/>
-      <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="171"/>
-      <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="172"/>
-      <source>As a result, the full set of vehicle setup options are not available.</source>
-      <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="231"/>
-      <source>Summary</source>
-      <translation type="unfinished">Summary</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="243"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="254"/>
-      <source>PX4Flow</source>
-      <translation type="unfinished">PX4Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="266"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="293"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>ShapeFileHelper</name>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="17"/>
-      <source>Shape file load failed. %1</source>
-      <translation type="unfinished">Shape file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="40"/>
-      <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
-      <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="93"/>
-      <source>Polyline not support from SHP files.</source>
-      <translation type="unfinished">Polyline not support from SHP files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="102"/>
-      <source>KML Files (*.%1)</source>
-      <translation type="unfinished">KML Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="107"/>
-      <source>KML/SHP Files (*.%1 *.%2)</source>
-      <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="76"/>
-      <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="157"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="38"/>
-      <source>Internal Error</source>
-      <translation type="unfinished">Internal Error</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="65"/>
-      <source>Provides advanced access to all commands/parameters. Be very careful!</source>
-      <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="77"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>desired</source>
-      <translation type="unfinished">desired</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>climbout</source>
-      <translation type="unfinished">climbout</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
-      <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
-      <source>Ensure clear of obstacles and into the wind.</source>
-      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="105"/>
-      <source>Click in map to set planned Takeoff location.</source>
-      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="106"/>
-      <source>Click in map to set planned Launch location.</source>
-      <translation type="unfinished">Click in map to set planned Launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="129"/>
-      <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="183"/>
-      <source>Actual AMSL alt sent: %1 %2</source>
-      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="243"/>
-      <source>Flight Speed</source>
-      <translation type="unfinished">Flight Speed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="406"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="410"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="412"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="414"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="416"/>
-      <source>VTOL Land</source>
-      <translation type="unfinished">VTOL Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="419"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-  </context>
-  <context>
-    <name>StructureScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="235"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="241"/>
-      <source>%1 version %2 not supported</source>
-      <translation type="unfinished">%1 version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="26"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</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">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
-      <source>Grid</source>
-      <translation type="unfinished">Grid</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
-      <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
-      <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="121"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
-      <source>Scan Distance</source>
-      <translation type="unfinished">Scan Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="131"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="222"/>
-      <source>Layer Height</source>
-      <translation type="unfinished">Layer Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="132"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="237"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="139"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Bottom</source>
-      <translation type="unfinished">Start Scan From Bottom</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Top</source>
-      <translation type="unfinished">Start Scan From Top</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="164"/>
-      <source>Structure Height</source>
-      <translation type="unfinished">Structure Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="171"/>
-      <source>Scan Bottom Alt</source>
-      <translation type="unfinished">Scan Bottom Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="178"/>
-      <source>Entrance/Exit Alt</source>
-      <translation type="unfinished">Entrance/Exit Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="186"/>
-      <source>Gimbal Pitch</source>
-      <translation type="unfinished">Gimbal Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="202"/>
-      <source>Rotate entry point</source>
-      <translation type="unfinished">Rotate entry point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="211"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="219"/>
-      <source>Layers</source>
-      <translation type="unfinished">Layers</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="225"/>
-      <source>Top Layer Alt</source>
-      <translation type="unfinished">Top Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="228"/>
-      <source>Bottom Layer Alt</source>
-      <translation type="unfinished">Bottom Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="231"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="234"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="235"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-  </context>
-  <context>
-    <name>SubChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
-      <source>Submarine Initial checks</source>
-      <translation type="unfinished">Submarine Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
-      <source>All seals in place?</source>
-      <translation type="unfinished">All seals in place?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="169"/>
-      <source>Survey items do not support version %1</source>
-      <translation type="unfinished">Survey items do not support version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="226"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="282"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="330"/>
-      <source>%1 but %2 object is missing</source>
-      <translation type="unfinished">%1 but %2 object is missing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="58"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="59"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="60"/>
-      <source>S</source>
-      <translation type="unfinished">S</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="18"/>
-      <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="19"/>
-      <source>Transects</source>
-      <translation type="unfinished">Transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="39"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="61"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="77"/>
-      <source>Hover and capture image</source>
-      <translation type="unfinished">Hover and capture image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="83"/>
-      <source>Refly at 90 deg offset</source>
-      <translation type="unfinished">Refly at 90 deg offset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="89"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="95"/>
-      <source>Fly alternate transects</source>
-      <translation type="unfinished">Fly alternate transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="107"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>SysStatusSensorInfo</name>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="103"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="111"/>
-      <source>Normal</source>
-      <translation type="unfinished">Normal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="119"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>SyslinkComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="43"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="61"/>
-      <source>Channel</source>
-      <translation type="unfinished">Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="86"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="112"/>
-      <source>Data Rate</source>
-      <translation type="unfinished">Data Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="16"/>
-      <source>Syslink</source>
-      <translation type="unfinished">Syslink</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="28"/>
-      <source>The Syslink Component is used to setup the radio connection on Crazyflies.</source>
-      <translation type="unfinished">The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPConfiguration</name>
-    <message>
-      <location filename="../src/comm/TCPLink.h" line="58"/>
-      <source>TCP Link Settings</source>
-      <translation type="unfinished">TCP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPLink</name>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <source>Error on link %1. Connection failed</source>
-      <translation type="unfinished">Error on link %1. Connection failed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Error on link %1. Error on socket: %2.</source>
-      <translation type="unfinished">Error on link %1. Error on socket: %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncManager</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="127"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="128"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="150"/>
-      <source>Stream</source>
-      <translation type="unfinished">Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="151"/>
-      <source>HDMI Port</source>
-      <translation type="unfinished">HDMI Port</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="172"/>
-      <source>Low</source>
-      <translation type="unfinished">Low</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="173"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="174"/>
-      <source>High</source>
-      <translation type="unfinished">High</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncSettings</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="56"/>
-      <source>Reboot ground unit for changes to take effect.</source>
-      <translation type="unfinished">Reboot ground unit for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="71"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="88"/>
-      <source>Enable Taisync</source>
-      <translation type="unfinished">Enable Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="94"/>
-      <source>Enable Taisync Video</source>
-      <translation type="unfinished">Enable Taisync Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="112"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="134"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="143"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="150"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="156"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="174"/>
-      <source>Device Info</source>
-      <translation type="unfinished">Device Info</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="196"/>
-      <source>Serial Number:</source>
-      <translation type="unfinished">Serial Number:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="200"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="204"/>
-      <source>Firmware Version:</source>
-      <translation type="unfinished">Firmware Version:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="222"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="244"/>
-      <source>Radio Mode:</source>
-      <translation type="unfinished">Radio Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="254"/>
-      <source>Radio Frequency:</source>
-      <translation type="unfinished">Radio Frequency:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="275"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="297"/>
-      <source>Video Output:</source>
-      <translation type="unfinished">Video Output:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="307"/>
-      <source>Encoder:</source>
-      <translation type="unfinished">Encoder:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="316"/>
-      <source>Bit Rate:</source>
-      <translation type="unfinished">Bit Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="337"/>
-      <source>Streaming Settings</source>
-      <translation type="unfinished">Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="359"/>
-      <source>RTSP URI:</source>
-      <translation type="unfinished">RTSP URI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="370"/>
-      <source>Account:</source>
-      <translation type="unfinished">Account:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="379"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="406"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="512"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="415"/>
-      <source>Set Streaming Settings</source>
-      <translation type="unfinished">Set Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="416"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="438"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="460"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="471"/>
-      <source>Ground Unit IP Address:</source>
-      <translation type="unfinished">Ground Unit IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="481"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="521"/>
-      <source>Set Network Settings</source>
-      <translation type="unfinished">Set Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="522"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</translation>
-    </message>
-  </context>
-  <context>
-    <name>TakeoffItemMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>TcpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="29"/>
-      <source>Server Address</source>
-      <translation type="unfinished">Server Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="36"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-  </context>
-  <context>
-    <name>TelemetryRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
-      <source>Telemetry RSSI Status</source>
-      <translation type="unfinished">Telemetry RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
-      <source>Local RSSI:</source>
-      <translation type="unfinished">Local RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
-      <source>Remote RSSI:</source>
-      <translation type="unfinished">Remote RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
-      <source>RX Errors:</source>
-      <translation type="unfinished">RX Errors:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
-      <source>Errors Fixed:</source>
-      <translation type="unfinished">Errors Fixed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
-      <source>TX Buffer:</source>
-      <translation type="unfinished">TX Buffer:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
-      <source>Local Noise:</source>
-      <translation type="unfinished">Local Noise:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
-      <source>Remote Noise:</source>
-      <translation type="unfinished">Remote Noise:</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainProgress</name>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
-      <source>Terrain Load Progress</source>
-      <translation type="unfinished">Terrain Load Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainStatus</name>
-    <message>
-      <location filename="../src/PlanView/TerrainStatus.qml" line="45"/>
-      <source>Height AMSL (%1)</source>
-      <translation type="unfinished">Height AMSL (%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="233"/>
-      <source>TransectStyleComplexItem version %2 not supported</source>
-      <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="101"/>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="102"/>
-      <source>Transect</source>
-      <translation type="unfinished">Transect</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="36"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="92"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="102"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="103"/>
-      <source>Trigger Dist</source>
-      <translation type="unfinished">Trigger Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="104"/>
-      <source>Spacing</source>
-      <translation type="unfinished">Spacing</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="123"/>
-      <source>Rotate Entry Point</source>
-      <translation type="unfinished">Rotate Entry Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="131"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="234"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="163"/>
-      <source>Presets</source>
-      <translation type="unfinished">Presets</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="178"/>
-      <source>Apply Preset</source>
-      <translation type="unfinished">Apply Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="185"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="193"/>
-      <source>Delete Preset</source>
-      <translation type="unfinished">Delete Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="196"/>
-      <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="212"/>
-      <source>Save Settings As New Preset</source>
-      <translation type="unfinished">Save Settings As New Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="249"/>
-      <source>Save Preset</source>
-      <translation type="unfinished">Save Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="265"/>
-      <source>Save the current settings as a named preset.</source>
-      <translation type="unfinished">Save the current settings as a named preset.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="270"/>
-      <source>Preset Name</source>
-      <translation type="unfinished">Preset Name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="276"/>
-      <source>Enter preset name</source>
-      <translation type="unfinished">Enter preset name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="283"/>
-      <source>Preset name cannot be blank.</source>
-      <translation type="unfinished">Preset name cannot be blank.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="286"/>
-      <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemStats</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
-      <source>Survey Area</source>
-      <translation type="unfinished">Survey Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemTerrainFollow</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
-      <source>Tolerance</source>
-      <translation type="unfinished">Tolerance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
-      <source>Max Climb Rate</source>
-      <translation type="unfinished">Max Climb Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
-      <source>Max Descent Rate</source>
-      <translation type="unfinished">Max Descent Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>UAS</name>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="318"/>
-      <source>UNINIT</source>
-      <translation type="unfinished">UNINIT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="319"/>
-      <source>Unitialized, booting up.</source>
-      <translation type="unfinished">Unitialized, booting up.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="322"/>
-      <source>BOOT</source>
-      <translation type="unfinished">BOOT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="323"/>
-      <source>Booting system, please wait.</source>
-      <translation type="unfinished">Booting system, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="326"/>
-      <source>CALIBRATING</source>
-      <translation type="unfinished">CALIBRATING</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="327"/>
-      <source>Calibrating sensors, please wait.</source>
-      <translation type="unfinished">Calibrating sensors, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="330"/>
-      <source>ACTIVE</source>
-      <translation type="unfinished">ACTIVE</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="331"/>
-      <source>Active, normal operation.</source>
-      <translation type="unfinished">Active, normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="334"/>
-      <source>STANDBY</source>
-      <translation type="unfinished">STANDBY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="335"/>
-      <source>Standby mode, ready for launch.</source>
-      <translation type="unfinished">Standby mode, ready for launch.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="338"/>
-      <source>CRITICAL</source>
-      <translation type="unfinished">CRITICAL</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="339"/>
-      <source>FAILURE: Continuing operation.</source>
-      <translation type="unfinished">FAILURE: Continuing operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="342"/>
-      <source>EMERGENCY</source>
-      <translation type="unfinished">EMERGENCY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="343"/>
-      <source>EMERGENCY: Land Immediately!</source>
-      <translation type="unfinished">EMERGENCY: Land Immediately!</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="351"/>
-      <source>SHUTDOWN</source>
-      <translation type="unfinished">SHUTDOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="352"/>
-      <source>Powering off system.</source>
-      <translation type="unfinished">Powering off system.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="356"/>
-      <source>UNKNOWN</source>
-      <translation type="unfinished">UNKNOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="357"/>
-      <source>Unknown system state</source>
-      <translation type="unfinished">Unknown system state</translation>
-    </message>
-  </context>
-  <context>
-    <name>UASMessageHandler</name>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
-      <source> EMERGENCY:</source>
-      <translation type="unfinished"> EMERGENCY:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
-      <source> ALERT:</source>
-      <translation type="unfinished"> ALERT:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
-      <source> Critical:</source>
-      <translation type="unfinished"> Critical:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
-      <source> Error:</source>
-      <translation type="unfinished"> Error:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
-      <source> Warning:</source>
-      <translation type="unfinished"> Warning:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
-      <source> Notice:</source>
-      <translation type="unfinished"> Notice:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
-      <source> Info:</source>
-      <translation type="unfinished"> Info:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
-      <source> Debug:</source>
-      <translation type="unfinished"> Debug:</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPConfiguration</name>
-    <message>
-      <location filename="../src/comm/UDPLink.h" line="79"/>
-      <source>UDP Link Settings</source>
-      <translation type="unfinished">UDP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPLink</name>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>UDP Link Error</source>
-      <translation type="unfinished">UDP Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <source>Error binding UDP port: %1</source>
-      <translation type="unfinished">Error binding UDP port: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>Error registering Zeroconf</source>
-      <translation type="unfinished">Error registering Zeroconf</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>
-      <translation type="unfinished">Could not detect ULog file header magic</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
-      <source>Could not detect camera_capture packets in ULog</source>
-      <translation type="unfinished">Could not detect camera_capture packets in ULog</translation>
-    </message>
-  </context>
-  <context>
-    <name>UdpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="31"/>
-      <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="37"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="48"/>
-      <source>Server Addresses (optional)</source>
-      <translation type="unfinished">Server Addresses (optional)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="62"/>
-      <source>Remove</source>
-      <translation type="unfinished">Remove</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="74"/>
-      <source>Example: 127.0.0.1:14550</source>
-      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="77"/>
-      <source>Add Server</source>
-      <translation type="unfinished">Add Server</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
-      <source>Measurement Units</source>
-      <translation type="unfinished">Measurement Units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="64"/>
-      <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
-      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
-      <source>System of units</source>
-      <translation type="unfinished">System of units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Metric System</source>
-      <translation type="unfinished">Metric System</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Imperial System</source>
-      <translation type="unfinished">Imperial System</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsSettings</name>
-    <message>
-      <location filename="../src/Settings/UnitsSettings.cc" line="196"/>
-      <source>Weight units</source>
-      <translation type="unfinished">Weight units</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
-      <source>VTOL Initial Checks</source>
-      <translation type="unfinished">VTOL Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="23"/>
-      <source>VTOL Landing</source>
-      <translation type="unfinished">VTOL Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="82"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="150"/>
-      <source>Landing Dist</source>
-      <translation type="unfinished">Landing Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="180"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="218"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="227"/>
-      <source>* Avoid tailwind on approach to land.</source>
-      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="236"/>
-      <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="262"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="269"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="301"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="305"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="259"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLModeIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: FW</source>
-      <translation type="unfinished">VTOL: FW</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: MR</source>
-      <translation type="unfinished">VTOL: MR</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle</name>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="558"/>
-      <source>MAVLink Generic</source>
-      <translation type="unfinished">MAVLink Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="565"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="567"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="569"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="571"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="573"/>
-      <source>Rover</source>
-      <translation type="unfinished">Rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="575"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="577"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="866"/>
-      <source> ... </source>
-      <comment>Indicates missing chunk from chunked STATUS_TEXT</comment>
-      <translation type="unfinished"> ... </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2168"/>
-      <source>Mission transfer failed. Error: %1</source>
-      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2174"/>
-      <source>GeoFence transfer failed. Error: %1</source>
-      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2180"/>
-      <source>Rally Point transfer failed. Error: %1</source>
-      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1423"/>
-      <source>battery %1 level low</source>
-      <translation type="unfinished">battery %1 level low</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1429"/>
-      <source>battery %1 level is critical</source>
-      <translation type="unfinished">battery %1 level is critical</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1435"/>
-      <source>battery %1 level emergency</source>
-      <translation type="unfinished">battery %1 level emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1441"/>
-      <source>battery %1 failed</source>
-      <translation type="unfinished">battery %1 failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1447"/>
-      <source>battery %1 unhealthy</source>
-      <translation type="unfinished">battery %1 unhealthy</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1459"/>
-      <source>warning</source>
-      <translation type="unfinished">warning</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2391"/>
-      <source>Generic micro air vehicle</source>
-      <translation type="unfinished">Generic micro air vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2392"/>
-      <source>Fixed wing aircraft</source>
-      <translation type="unfinished">Fixed wing aircraft</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2393"/>
-      <source>Quadrotor</source>
-      <translation type="unfinished">Quadrotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2394"/>
-      <source>Coaxial helicopter</source>
-      <translation type="unfinished">Coaxial helicopter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2395"/>
-      <source>Normal helicopter with tail rotor.</source>
-      <translation type="unfinished">Normal helicopter with tail rotor.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2396"/>
-      <source>Ground installation</source>
-      <translation type="unfinished">Ground installation</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2397"/>
-      <source>Operator control unit / ground control station</source>
-      <translation type="unfinished">Operator control unit / ground control station</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2398"/>
-      <source>Airship, controlled</source>
-      <translation type="unfinished">Airship, controlled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2399"/>
-      <source>Free balloon, uncontrolled</source>
-      <translation type="unfinished">Free balloon, uncontrolled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2400"/>
-      <source>Rocket</source>
-      <translation type="unfinished">Rocket</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2401"/>
-      <source>Ground rover</source>
-      <translation type="unfinished">Ground rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2402"/>
-      <source>Surface vessel, boat, ship</source>
-      <translation type="unfinished">Surface vessel, boat, ship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2403"/>
-      <source>Submarine</source>
-      <translation type="unfinished">Submarine</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2404"/>
-      <source>Hexarotor</source>
-      <translation type="unfinished">Hexarotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2405"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2406"/>
-      <source>Octorotor</source>
-      <translation type="unfinished">Octorotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2407"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2408"/>
-      <source>Flapping wing</source>
-      <translation type="unfinished">Flapping wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2409"/>
-      <source>Onboard companion controller</source>
-      <translation type="unfinished">Onboard companion controller</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2410"/>
-      <source>Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</source>
-      <translation type="unfinished">Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2411"/>
-      <source>Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</source>
-      <translation type="unfinished">Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2412"/>
-      <source>Tiltrotor VTOL</source>
-      <translation type="unfinished">Tiltrotor VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2413"/>
-      <source>VTOL reserved 2</source>
-      <translation type="unfinished">VTOL reserved 2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2414"/>
-      <source>VTOL reserved 3</source>
-      <translation type="unfinished">VTOL reserved 3</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2415"/>
-      <source>VTOL reserved 4</source>
-      <translation type="unfinished">VTOL reserved 4</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2416"/>
-      <source>VTOL reserved 5</source>
-      <translation type="unfinished">VTOL reserved 5</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2417"/>
-      <source>Onboard gimbal</source>
-      <translation type="unfinished">Onboard gimbal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2418"/>
-      <source>Onboard ADSB peripheral</source>
-      <translation type="unfinished">Onboard ADSB peripheral</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2427"/>
-      <source>Vehicle %1 </source>
-      <translation type="unfinished">Vehicle %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3224"/>
-      <source>Vehicle reboot failed.</source>
-      <translation type="unfinished">Vehicle reboot failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2435"/>
-      <source>%1 %2 flight mode</source>
-      <translation type="unfinished">%1 %2 flight mode</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>disarmed</source>
-      <translation type="unfinished">disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Unable to send command: %1.</source>
-      <translation type="unfinished">Unable to send command: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Waiting on previous response to same command.</source>
-      <translation type="unfinished">Waiting on previous response to same command.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2886"/>
-      <source>Vehicle did not respond to command: %1</source>
-      <translation type="unfinished">Vehicle did not respond to command: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2997"/>
-      <source>Bootloader flash succeeded</source>
-      <translation type="unfinished">Bootloader flash succeeded</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3012"/>
-      <source>%1 command temporarily rejected</source>
-      <translation type="unfinished">%1 command temporarily rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3015"/>
-      <source>%1 command denied</source>
-      <translation type="unfinished">%1 command denied</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3018"/>
-      <source>%1 command not supported</source>
-      <translation type="unfinished">%1 command not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3021"/>
-      <source>%1 command failed</source>
-      <translation type="unfinished">%1 command failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="149"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="151"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="153"/>
-      <source>Rover-Boat</source>
-      <translation type="unfinished">Rover-Boat</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="155"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="157"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="159"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="161"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="163"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleLinkManager</name>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <source>%1Communication regained on %2 link</source>
-      <translation type="unfinished">%1Communication regained on %2 link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>primary</source>
-      <translation type="unfinished">primary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>secondary</source>
-      <translation type="unfinished">secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="64"/>
-      <source>%1Communication regained</source>
-      <translation type="unfinished">%1Communication regained</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="69"/>
-      <source>%1Switching communication to new primary link</source>
-      <translation type="unfinished">%1Switching communication to new primary link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>%1Communication lost on %2 link.</source>
-      <translation type="unfinished">%1Communication lost on %2 link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="126"/>
-      <source>%1Switching communication to secondary link.</source>
-      <translation type="unfinished">%1Switching communication to secondary link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="146"/>
-      <source>%1Communication lost</source>
-      <translation type="unfinished">%1Communication lost</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="392"/>
-      <source>Comm Lost</source>
-      <translation type="unfinished">Comm Lost</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleMapItem</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/VehicleMapItem.qml" line="89"/>
-      <source>Vehicle %1</source>
-      <translation type="unfinished">Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleRotationCal</name>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="26"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Incomplete</source>
-      <translation type="unfinished">Incomplete</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleSummary</name>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="87"/>
-      <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation type="unfinished">Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="88"/>
-      <source>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</source>
-      <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleWarnings</name>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
-      <source>No GPS Lock for Vehicle</source>
-      <translation type="unfinished">No GPS Lock for Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
-      <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
-      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VibrationPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
-      <source>Analyze vibration associated with your vehicle.</source>
-      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="74"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="96"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="118"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="139"/>
-      <source>Clip count</source>
-      <translation type="unfinished">Clip count</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="143"/>
-      <source>Accel 1: </source>
-      <translation type="unfinished">Accel 1: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="147"/>
-      <source>Accel 2: </source>
-      <translation type="unfinished">Accel 2: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="151"/>
-      <source>Accel 3: </source>
-      <translation type="unfinished">Accel 3: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="165"/>
-      <source>Not Available</source>
-      <translation type="unfinished">Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoManager</name>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="288"/>
-      <source>Video receiver is not ready.</source>
-      <translation type="unfinished">Video receiver is not ready.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="295"/>
-      <source>Invalid video format defined.</source>
-      <translation type="unfinished">Invalid video format defined.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="306"/>
-      <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoSettings</name>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="22"/>
-      <source>No Video Available</source>
-      <translation type="unfinished">No Video Available</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="23"/>
-      <source>Video Stream Disabled</source>
-      <translation type="unfinished">Video Stream Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="24"/>
-      <source>RTSP Video Stream</source>
-      <translation type="unfinished">RTSP Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="25"/>
-      <source>UDP h.264 Video Stream</source>
-      <translation type="unfinished">UDP h.264 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="26"/>
-      <source>UDP h.265 Video Stream</source>
-      <translation type="unfinished">UDP h.265 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="27"/>
-      <source>TCP-MPEG2 Video Stream</source>
-      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="28"/>
-      <source>MPEG-TS (h.264) Video Stream</source>
-      <translation type="unfinished">MPEG-TS (h.264) Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="29"/>
-      <source>3DR Solo (requires restart)</source>
-      <translation type="unfinished">3DR Solo (requires restart)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="30"/>
-      <source>Parrot Discovery</source>
-      <translation type="unfinished">Parrot Discovery</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="31"/>
-      <source>Yuneec Mantis G</source>
-      <translation type="unfinished">Yuneec Mantis G</translation>
-    </message>
-  </context>
-</TS>
diff --git a/translations/qgc_zh_CN.ts b/translations/qgc_zh_CN.ts
deleted file mode 100644
index 8d9dae3b7035..000000000000
--- a/translations/qgc_zh_CN.ts
+++ /dev/null
@@ -1,18078 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="zh-CN" sourcelanguage="en">
-  <context>
-    <name>ADSBVehicleManager</name>
-    <message>
-      <location filename="../src/ADSB/ADSBVehicleManager.cc" line="70"/>
-      <source>ADSB Server Error: %1</source>
-      <translation type="unfinished">ADSB Server Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="71"/>
-      <source>Airframe is currently not set.</source>
-      <translation type="unfinished">Airframe is currently not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="72"/>
-      <source>Currently set to frame class &apos;%1&apos;</source>
-      <translation type="unfinished">Currently set to frame class &apos;%1&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="73"/>
-      <source> and frame type &apos;%2&apos;</source>
-      <translation type="unfinished"> and frame type &apos;%2&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="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="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="75"/>
-      <source> To change this configuration, select the desired frame class below.</source>
-      <translation type="unfinished"> To change this configuration, select the desired frame class below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="166"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.qml" line="209"/>
-      <source>Invalid setting for FRAME_TYPE. Click to Reset.</source>
-      <translation type="unfinished">Invalid setting for FRAME_TYPE. Click to Reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="19"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponent.cc" line="40"/>
-      <source>Frame Setup is used to select the airframe which matches your vehicle.</source>
-      <translation type="unfinished">Frame Setup is used to select the airframe which matches your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="251"/>
-      <source>Param file github json download failed: %1</source>
-      <translation type="unfinished">Param file github json download failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentController.cc" line="261"/>
-      <source>Param file download failed: %1</source>
-      <translation type="unfinished">Param file download failed: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="23"/>
-      <source>Frame Class</source>
-      <translation type="unfinished">Frame Class</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="29"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="35"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml" line="36"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMAutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc" line="226"/>
-      <source>WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</source>
-      <translation type="unfinished">WARNING: The flight board you are using has a critical service bulletin against it which advises against flying. For details see: https://discuss.cubepilot.org/t/sb-0000002-critical-service-bulletin-for-cubes-purchased-between-january-2019-to-present-do-not-fly/406</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="175"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="183"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="221"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="239"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="251"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="265"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="286"/>
-      <source>Input channel:</source>
-      <translation type="unfinished">Input channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="306"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="359"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="333"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="378"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="351"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="406"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="423"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="445"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="453"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="473"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="491"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.qml" line="509"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="20"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponent.cc" line="31"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="27"/>
-      <source>Gimbal type</source>
-      <translation type="unfinished">Gimbal type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="32"/>
-      <source>Tilt input channel</source>
-      <translation type="unfinished">Tilt input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="37"/>
-      <source>Pan input channel</source>
-      <translation type="unfinished">Pan input channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml" line="42"/>
-      <source>Roll input channel</source>
-      <translation type="unfinished">Roll input channel</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMCameraSubComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="183"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="184"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="185"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="186"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="187"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="188"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="189"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="190"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="191"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="192"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="193"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="282"/>
-      <source>Gimbal </source>
-      <translation type="unfinished">Gimbal </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="315"/>
-      <source>Output channel:</source>
-      <translation type="unfinished">Output channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="340"/>
-      <source>Servo reverse</source>
-      <translation type="unfinished">Servo reverse</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="350"/>
-      <source>Stabilize</source>
-      <translation type="unfinished">Stabilize</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="368"/>
-      <source>Servo PWM limits:</source>
-      <translation type="unfinished">Servo PWM limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="409"/>
-      <source>min</source>
-      <translation type="unfinished">min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="384"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="419"/>
-      <source>max</source>
-      <translation type="unfinished">max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="404"/>
-      <source>Gimbal angle limits:</source>
-      <translation type="unfinished">Gimbal angle limits:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="445"/>
-      <source>Gimbal Settings</source>
-      <translation type="unfinished">Gimbal Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="462"/>
-      <source>Type:</source>
-      <translation type="unfinished">Type:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="484"/>
-      <source>Gimbal Type changes takes affect next reboot of autopilot</source>
-      <translation type="unfinished">Gimbal Type changes takes affect next reboot of autopilot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="492"/>
-      <source>Default Mode:</source>
-      <translation type="unfinished">Default Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="513"/>
-      <source>Tilt</source>
-      <translation type="unfinished">Tilt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="533"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMCameraSubComponent.qml" line="553"/>
-      <source>Pan</source>
-      <translation type="unfinished">Pan</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="648"/>
-      <source>Error during Solo video link setup: %1</source>
-      <translation type="unfinished">Error during Solo video link setup: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="770"/>
-      <source>Unable to change altitude, vehicle altitude not known.</source>
-      <translation type="unfinished">Unable to change altitude, vehicle altitude not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="775"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="838"/>
-      <source>Vehicle does not support guided takeoff</source>
-      <translation type="unfinished">Vehicle does not support guided takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="844"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="854"/>
-      <source>Unable to takeoff: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="859"/>
-      <source>Unable to takeoff: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to takeoff: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="877"/>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="897"/>
-      <source>Unable to start mission: Vehicle failed to change to Auto mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="885"/>
-      <source>Unable to start mission: Vehicle failed to change to Guided mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to change to Guided mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="890"/>
-      <source>Unable to start mission: Vehicle failed to arm.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle failed to arm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="975"/>
-      <source>Follow failed: Home position not set.</source>
-      <translation type="unfinished">Follow failed: Home position not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/APM/APMFirmwarePlugin.cc" line="985"/>
-      <source>Follow failed: Ground station cannot provide required position information.</source>
-      <translation type="unfinished">Follow failed: Ground station cannot provide required position information.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="58"/>
-      <source> (Channel 5)</source>
-      <translation type="unfinished"> (Channel 5)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="82"/>
-      <source>Flight mode channel:</source>
-      <translation type="unfinished">Flight mode channel:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Not assigned</source>
-      <translation type="unfinished">Not assigned</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 1</source>
-      <translation type="unfinished">Channel 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="88"/>
-      <source>Channel 2</source>
-      <translation type="unfinished">Channel 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 3</source>
-      <translation type="unfinished">Channel 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 4</source>
-      <translation type="unfinished">Channel 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="89"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="90"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="106"/>
-      <source>Flight Mode </source>
-      <translation type="unfinished">Flight Mode </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="127"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="142"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="168"/>
-      <source>Simple Mode</source>
-      <translation type="unfinished">Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="185"/>
-      <source>Switch Options</source>
-      <translation type="unfinished">Switch Options</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.qml" line="213"/>
-      <source>Channel option %1 :</source>
-      <translation type="unfinished">Channel option %1 :</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="18"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponent.cc" line="29"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Super-Simple</source>
-      <translation type="unfinished">Super-Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentController.cc" line="38"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="28"/>
-      <source>Flight Mode 1</source>
-      <translation type="unfinished">Flight Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="33"/>
-      <source>Flight Mode 2</source>
-      <translation type="unfinished">Flight Mode 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="38"/>
-      <source>Flight Mode 3</source>
-      <translation type="unfinished">Flight Mode 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="43"/>
-      <source>Flight Mode 4</source>
-      <translation type="unfinished">Flight Mode 4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="48"/>
-      <source>Flight Mode 5</source>
-      <translation type="unfinished">Flight Mode 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml" line="53"/>
-      <source>Flight Mode 6</source>
-      <translation type="unfinished">Flight Mode 6</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="193"/>
-      <source>Enable Follow Me</source>
-      <translation type="unfinished">Enable Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="212"/>
-      <source>Waiting for Vehicle to update</source>
-      <translation type="unfinished">Waiting for Vehicle to update</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="224"/>
-      <source>The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</source>
-      <translation type="unfinished">The vehicle parameters required for follow me are currently set in a way which is not supported. Using follow with this setup may lead to unpredictable/hazardous results.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="230"/>
-      <source>Reset To Supported Settings</source>
-      <translation type="unfinished">Reset To Supported Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="248"/>
-      <source>Vehicle Position</source>
-      <translation type="unfinished">Vehicle Position</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Maintain Current Offsets</source>
-      <translation type="unfinished">Maintain Current Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="252"/>
-      <source>Specify Offsets</source>
-      <translation type="unfinished">Specify Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="265"/>
-      <source>Point Vehicle</source>
-      <translation type="unfinished">Point Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Maintain current vehicle orientation</source>
-      <translation type="unfinished">Maintain current vehicle orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Point at ground station location</source>
-      <translation type="unfinished">Point at ground station location</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="275"/>
-      <source>Same direction as ground station movement</source>
-      <translation type="unfinished">Same direction as ground station movement</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="288"/>
-      <source>Vehicle Offsets</source>
-      <translation type="unfinished">Vehicle Offsets</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="291"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="297"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="305"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="346"/>
-      <source>Click in the graphic to change angle</source>
-      <translation type="unfinished">Click in the graphic to change angle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.qml" line="507"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="17"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponent.cc" line="28"/>
-      <source>Follow Me Setup is used to configure support for the vehicle following the ground station location.</source>
-      <translation type="unfinished">Follow Me Setup is used to configure support for the vehicle following the ground station location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMFollowComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMHeliComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="79"/>
-      <source>Servo Setup</source>
-      <translation type="unfinished">Servo Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="84"/>
-      <source>Servo</source>
-      <translation type="unfinished">Servo</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="85"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="86"/>
-      <source>Min</source>
-      <translation type="unfinished">Min</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="87"/>
-      <source>Max</source>
-      <translation type="unfinished">Max</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="88"/>
-      <source>Trim</source>
-      <translation type="unfinished">Trim</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="89"/>
-      <source>Reversed</source>
-      <translation type="unfinished">Reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="91"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="114"/>
-      <source>2</source>
-      <translation type="unfinished">2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="137"/>
-      <source>3</source>
-      <translation type="unfinished">3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="160"/>
-      <source>4</source>
-      <translation type="unfinished">4</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="183"/>
-      <source>5</source>
-      <translation type="unfinished">5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="206"/>
-      <source>6</source>
-      <translation type="unfinished">6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="229"/>
-      <source>7</source>
-      <translation type="unfinished">7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="252"/>
-      <source>8</source>
-      <translation type="unfinished">8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="278"/>
-      <source>Swashplate Setup</source>
-      <translation type="unfinished">Swashplate Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="328"/>
-      <source>Throttle Settings</source>
-      <translation type="unfinished">Throttle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="372"/>
-      <source>Governor Settings</source>
-      <translation type="unfinished">Governor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="395"/>
-      <source>Miscellaneous Settings</source>
-      <translation type="unfinished">Miscellaneous Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="400"/>
-      <source>* Stabilize Collective Curve *</source>
-      <translation type="unfinished">* Stabilize Collective Curve *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="401"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.qml" line="415"/>
-      <source>* Tail &amp; Gyros *</source>
-      <translation type="unfinished">* Tail &amp; Gyros *</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="15"/>
-      <source>Heli</source>
-      <translation type="unfinished">Heli</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMHeliComponent.cc" line="26"/>
-      <source>Heli Setup is used to setup parameters which are specific to a helicopter.</source>
-      <translation type="unfinished">Heli Setup is used to setup parameters which are specific to a helicopter.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="135"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="143"/>
-      <source>Channel </source>
-      <translation type="unfinished">Channel </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="167"/>
-      <source>Light Output Channels</source>
-      <translation type="unfinished">Light Output Channels</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="184"/>
-      <source>Lights 1:</source>
-      <translation type="unfinished">Lights 1:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="205"/>
-      <source>Lights 2:</source>
-      <translation type="unfinished">Lights 2:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.qml" line="226"/>
-      <source>Brightness Steps:</source>
-      <translation type="unfinished">Brightness Steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="21"/>
-      <source>Lights</source>
-      <translation type="unfinished">Lights</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponent.cc" line="32"/>
-      <source>Lights setup is used to adjust light output channels.</source>
-      <translation type="unfinished">Lights setup is used to adjust light output channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMLightsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="63"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="64"/>
-      <source>Channel 5</source>
-      <translation type="unfinished">Channel 5</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="65"/>
-      <source>Channel 6</source>
-      <translation type="unfinished">Channel 6</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="66"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="67"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="68"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="69"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="70"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="71"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="72"/>
-      <source>Channel 13</source>
-      <translation type="unfinished">Channel 13</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="73"/>
-      <source>Channel 14</source>
-      <translation type="unfinished">Channel 14</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="89"/>
-      <source>Lights Output 1</source>
-      <translation type="unfinished">Lights Output 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml" line="94"/>
-      <source>Lights Output 2</source>
-      <translation type="unfinished">Lights Output 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.cc" line="15"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMMotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMNotSupported</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMNotSupported.qml" line="17"/>
-      <source>Not supported</source>
-      <translation type="unfinished">Not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="50"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="110"/>
-      <source>Battery 1</source>
-      <translation type="unfinished">Battery 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="80"/>
-      <source>Battery1 monitor:</source>
-      <translation type="unfinished">Battery1 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="182"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="197"/>
-      <source>Battery 2</source>
-      <translation type="unfinished">Battery 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="167"/>
-      <source>Battery2 monitor:</source>
-      <translation type="unfinished">Battery2 monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="233"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="252"/>
-      <source>WARNING: Remove props prior to calibration!</source>
-      <translation type="unfinished">WARNING: Remove props prior to calibration!</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="260"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Now perform these steps:</source>
-      <translation type="unfinished">Now perform these steps:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="267"/>
-      <source>Click Calibrate to start, then:</source>
-      <translation type="unfinished">Click Calibrate to start, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="268"/>
-      <source>- Disconnect USB and battery so flight controller powers down</source>
-      <translation type="unfinished">- Disconnect USB and battery so flight controller powers down</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="269"/>
-      <source>- Connect the battery</source>
-      <translation type="unfinished">- Connect the battery</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="270"/>
-      <source>- The arming tone will be played (if the vehicle has a buzzer attached)</source>
-      <translation type="unfinished">- The arming tone will be played (if the vehicle has a buzzer attached)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="271"/>
-      <source>- If using a flight controller with a safety button press it until it displays solid red</source>
-      <translation type="unfinished">- If using a flight controller with a safety button press it until it displays solid red</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="272"/>
-      <source>- You will hear a musical tone then two beeps</source>
-      <translation type="unfinished">- You will hear a musical tone then two beeps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="273"/>
-      <source>- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</source>
-      <translation type="unfinished">- A few seconds later you should hear a number of beeps (one for each battery cell you&apos;re using)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="274"/>
-      <source>- And finally a single long beep indicating the end points have been set and the ESC is calibrated</source>
-      <translation type="unfinished">- And finally a single long beep indicating the end points have been set and the ESC is calibrated</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="275"/>
-      <source>- Disconnect the battery and power up again normally</source>
-      <translation type="unfinished">- Disconnect the battery and power up again normally</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="317"/>
-      <source>Power Module 90A</source>
-      <translation type="unfinished">Power Module 90A</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="326"/>
-      <source>Power Module HV</source>
-      <translation type="unfinished">Power Module HV</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="335"/>
-      <source>3DR Iris</source>
-      <translation type="unfinished">3DR Iris</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="344"/>
-      <source>Blue Robotics Power Sense Module R2</source>
-      <translation type="unfinished">Blue Robotics Power Sense Module R2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="353"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="363"/>
-      <source>Battery monitor:</source>
-      <translation type="unfinished">Battery monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="375"/>
-      <source>Battery capacity:</source>
-      <translation type="unfinished">Battery capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="387"/>
-      <source>Minimum arming voltage:</source>
-      <translation type="unfinished">Minimum arming voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="399"/>
-      <source>Power sensor:</source>
-      <translation type="unfinished">Power sensor:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="424"/>
-      <source>Current pin:</source>
-      <translation type="unfinished">Current pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="439"/>
-      <source>Voltage pin:</source>
-      <translation type="unfinished">Voltage pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="579"/>
-      <source>Voltage multiplier:</source>
-      <translation type="unfinished">Voltage multiplier:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="465"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="497"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="471"/>
-      <source>Calculate Voltage Multiplier</source>
-      <translation type="unfinished">Calculate Voltage Multiplier</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="481"/>
-      <source>If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="486"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="641"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="503"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="512"/>
-      <source>If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="517"/>
-      <source>Amps Offset:</source>
-      <translation type="unfinished">Amps Offset:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="532"/>
-      <source>If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</source>
-      <translation type="unfinished">If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="563"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new adjusted voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="572"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="576"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="584"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="646"/>
-      <source>Calculate And Set</source>
-      <translation type="unfinished">Calculate And Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="625"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="634"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.qml" line="638"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="18"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponent.cc" line="29"/>
-      <source>The Power Component is used to setup battery parameters.</source>
-      <translation type="unfinished">The Power Component is used to setup battery parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMPowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="36"/>
-      <source>Batt1 monitor</source>
-      <translation type="unfinished">Batt1 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="41"/>
-      <source>Batt1 capacity</source>
-      <translation type="unfinished">Batt1 capacity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="47"/>
-      <source>Batt2 monitor</source>
-      <translation type="unfinished">Batt2 monitor</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml" line="53"/>
-      <source>Batt2 capacity</source>
-      <translation type="unfinished">Batt2 capacity</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="18"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponent.cc" line="37"/>
-      <source>The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</source>
-      <translation type="unfinished">The Radio Component is used to setup which channels on your RC Transmitter you will use for each vehicle control such as Roll, Pitch, Yaw and Throttle. It also allows you to assign switches and dials to the various flight modes. Prior to flight you must also calibrate the extents for all of your channels.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMRadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="23"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="24"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="39"/>
-      <source>Channel %1</source>
-      <translation type="unfinished">Channel %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="28"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="33"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml" line="38"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="66"/>
-      <source>Requires vehicle reboot</source>
-      <translation type="unfinished">Requires vehicle reboot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="79"/>
-      <source>Low action:</source>
-      <translation type="unfinished">Low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="86"/>
-      <source>Critical action:</source>
-      <translation type="unfinished">Critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="93"/>
-      <source>Low voltage threshold:</source>
-      <translation type="unfinished">Low voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="101"/>
-      <source>Critical voltage threshold:</source>
-      <translation type="unfinished">Critical voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="108"/>
-      <source>Low mAh threshold:</source>
-      <translation type="unfinished">Low mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="115"/>
-      <source>Critical mAh threshold:</source>
-      <translation type="unfinished">Critical mAh threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="136"/>
-      <source>Reboot vehicle</source>
-      <translation type="unfinished">Reboot vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="147"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="181"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="279"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="238"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="252"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="366"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="303"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="373"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="310"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="383"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="316"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="345"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="375"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="376"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="414"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="429"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="454"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="479"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="490"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="500"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="516"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="678"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="692"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="596"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="703"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="617"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="635"/>
-      <source>Final land stage altitude:</source>
-      <translation type="unfinished">Final land stage altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="650"/>
-      <source>Final land stage descent speed:</source>
-      <translation type="unfinished">Final land stage descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="730"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.qml" line="761"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="20"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="33"/>
-      <source>Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</source>
-      <translation type="unfinished">Safety Setup is used to setup failsafe actions, leak detection, and arming checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponent.cc" line="44"/>
-      <source>Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</source>
-      <translation type="unfinished">Safety Setup is used to setup triggers for Return to Land as well as the settings for Return to Land itself.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="85"/>
-      <source>Battery1 Failsafe Triggers</source>
-      <translation type="unfinished">Battery1 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="178"/>
-      <source>Battery low action:</source>
-      <translation type="unfinished">Battery low action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="186"/>
-      <source>Battery critical action:</source>
-      <translation type="unfinished">Battery critical action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="195"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="136"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="206"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="155"/>
-      <source>Battery2 Failsafe Triggers</source>
-      <translation type="unfinished">Battery2 Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="224"/>
-      <source>General Failsafe Triggers</source>
-      <translation type="unfinished">General Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="245"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="252"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="254"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Continue with Mission in Auto Mode</source>
-      <translation type="unfinished">Continue with Mission in Auto Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="255"/>
-      <source>Always Land</source>
-      <translation type="unfinished">Always Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="262"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="278"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="293"/>
-      <source>Circle GeoFence enabled</source>
-      <translation type="unfinished">Circle GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="318"/>
-      <source>Altitude GeoFence enabled</source>
-      <translation type="unfinished">Altitude GeoFence enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="343"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="355"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="366"/>
-      <source>Max radius:</source>
-      <translation type="unfinished">Max radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="382"/>
-      <source>Max altitude:</source>
-      <translation type="unfinished">Max altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="402"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="438"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="450"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="472"/>
-      <source>Loiter above Home for:</source>
-      <translation type="unfinished">Loiter above Home for:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="491"/>
-      <source>Land with descent speed:</source>
-      <translation type="unfinished">Land with descent speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="512"/>
-      <source>Final loiter altitude:</source>
-      <translation type="unfinished">Final loiter altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="534"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml" line="565"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="67"/>
-      <source>Throttle PWM threshold:</source>
-      <translation type="unfinished">Throttle PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="88"/>
-      <source>Voltage threshold:</source>
-      <translation type="unfinished">Voltage threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="109"/>
-      <source>MAH threshold:</source>
-      <translation type="unfinished">MAH threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="130"/>
-      <source>GCS failsafe</source>
-      <translation type="unfinished">GCS failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="142"/>
-      <source>Return to Launch</source>
-      <translation type="unfinished">Return to Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="156"/>
-      <source>Return at current altitude</source>
-      <translation type="unfinished">Return at current altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml" line="168"/>
-      <source>Return at specified altitude:</source>
-      <translation type="unfinished">Return at specified altitude:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="53"/>
-      <source>Failsafe Triggers</source>
-      <translation type="unfinished">Failsafe Triggers</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="68"/>
-      <source>Ground Station failsafe:</source>
-      <translation type="unfinished">Ground Station failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="87"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="105"/>
-      <source>PWM threshold:</source>
-      <translation type="unfinished">PWM threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="122"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="131"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="143"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml" line="174"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="69"/>
-      <source>Failsafe Actions</source>
-      <translation type="unfinished">Failsafe Actions</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="95"/>
-      <source>GCS Heartbeat:</source>
-      <translation type="unfinished">GCS Heartbeat:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="114"/>
-      <source>Leak:</source>
-      <translation type="unfinished">Leak:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="126"/>
-      <source>Detector Pin:</source>
-      <translation type="unfinished">Detector Pin:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="141"/>
-      <source>Logic when Dry:</source>
-      <translation type="unfinished">Logic when Dry:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="164"/>
-      <source>Battery:</source>
-      <translation type="unfinished">Battery:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="176"/>
-      <source>Voltage:</source>
-      <translation type="unfinished">Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="190"/>
-      <source>Remaining Capacity:</source>
-      <translation type="unfinished">Remaining Capacity:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="212"/>
-      <source>EKF:</source>
-      <translation type="unfinished">EKF:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="246"/>
-      <source>Pilot Input:</source>
-      <translation type="unfinished">Pilot Input:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="258"/>
-      <source>Timeout:</source>
-      <translation type="unfinished">Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="281"/>
-      <source>Internal Temperature:</source>
-      <translation type="unfinished">Internal Temperature:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="314"/>
-      <source>Internal Pressure:</source>
-      <translation type="unfinished">Internal Pressure:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="293"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="326"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="347"/>
-      <source>Arming Checks</source>
-      <translation type="unfinished">Arming Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml" line="378"/>
-      <source>Warning: Turning off arming checks can lead to loss of Vehicle control.</source>
-      <translation type="unfinished">Warning: Turning off arming checks can lead to loss of Vehicle control.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="37"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="38"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="60"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="68"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="76"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="84"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="90"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="96"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="102"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="129"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="112"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="115"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="118"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="120"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="131"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="132"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="145"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml" line="146"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="41"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="42"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="46"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="51"/>
-      <source>Batt1 low failsafe:</source>
-      <translation type="unfinished">Batt1 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="57"/>
-      <source>Batt1 critical failsafe:</source>
-      <translation type="unfinished">Batt1 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="63"/>
-      <source>Batt2 low failsafe:</source>
-      <translation type="unfinished">Batt2 low failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="69"/>
-      <source>Batt2 critical failsafe:</source>
-      <translation type="unfinished">Batt2 critical failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="84"/>
-      <source>GeoFence:</source>
-      <translation type="unfinished">GeoFence:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="77"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="79"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Circle</source>
-      <translation type="unfinished">Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="80"/>
-      <source>Altitude,Circle</source>
-      <translation type="unfinished">Altitude,Circle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="86"/>
-      <source>Report only</source>
-      <translation type="unfinished">Report only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>RTL or Land</source>
-      <translation type="unfinished">RTL or Land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="87"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="92"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml" line="93"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryPlane</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="27"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="38"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="32"/>
-      <source>Voltage failsafe:</source>
-      <translation type="unfinished">Voltage failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="37"/>
-      <source>mAh failsafe:</source>
-      <translation type="unfinished">mAh failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="42"/>
-      <source>RTL min alt:</source>
-      <translation type="unfinished">RTL min alt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml" line="43"/>
-      <source>current</source>
-      <translation type="unfinished">current</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummaryRover</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="93"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="57"/>
-      <source>Always RTL</source>
-      <translation type="unfinished">Always RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="60"/>
-      <source>Always Hold</source>
-      <translation type="unfinished">Always Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="73"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="76"/>
-      <source>Hold and Disarm</source>
-      <translation type="unfinished">Hold and Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="87"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="88"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="92"/>
-      <source>Throttle failsafe:</source>
-      <translation type="unfinished">Throttle failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="97"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml" line="102"/>
-      <source>Failsafe Crash Check:</source>
-      <translation type="unfinished">Failsafe Crash Check:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSafetyComponentSummarySub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="42"/>
-      <source>Arming Checks:</source>
-      <translation type="unfinished">Arming Checks:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="43"/>
-      <source>Some disabled</source>
-      <translation type="unfinished">Some disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="46"/>
-      <source>GCS failsafe:</source>
-      <translation type="unfinished">GCS failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="50"/>
-      <source>Leak failsafe:</source>
-      <translation type="unfinished">Leak failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="55"/>
-      <source>Battery failsafe:</source>
-      <translation type="unfinished">Battery failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="70"/>
-      <source>EKF failsafe:</source>
-      <translation type="unfinished">EKF failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="75"/>
-      <source>Pilot Input failsafe:</source>
-      <translation type="unfinished">Pilot Input failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="79"/>
-      <source>Int. Temperature failsafe:</source>
-      <translation type="unfinished">Int. Temperature failsafe:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml" line="83"/>
-      <source>Int. Pressure failsafe:</source>
-      <translation type="unfinished">Int. Pressure failsafe:</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="40"/>
-      <source>If mounted in the direction of flight, select None.</source>
-      <translation type="unfinished">If mounted in the direction of flight, select None.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="41"/>
-      <source>Before calibrating make sure rotation settings are correct. </source>
-      <translation type="unfinished">Before calibrating make sure rotation settings are correct. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="42"/>
-      <source>If the compass or GPS module is mounted in flight direction, leave the default value (None)</source>
-      <translation type="unfinished">If the compass or GPS module is mounted in flight direction, leave the default value (None)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press OK.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press OK.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="49"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="57"/>
-      <source>The calibration for Compass %1 appears to be poor. </source>
-      <translation type="unfinished">The calibration for Compass %1 appears to be poor. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="58"/>
-      <source>Check the compass position within your vehicle and re-do the calibration.</source>
-      <translation type="unfinished">Check the compass position within your vehicle and re-do the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="101"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="692"/>
-      <source>Sensor Settings</source>
-      <translation type="unfinished">Sensor Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="155"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="162"/>
-      <source>Accelerometer calibration complete</source>
-      <translation type="unfinished">Accelerometer calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="165"/>
-      <source>Compass calibration complete</source>
-      <translation type="unfinished">Compass calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="169"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="185"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(primary</source>
-      <translation type="unfinished">(primary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="119"/>
-      <source>(secondary</source>
-      <translation type="unfinished">(secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="349"/>
-      <source>Use Compass</source>
-      <translation type="unfinished">Use Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="281"/>
-      <source>Shown in the indicator bars is the quality of the calibration for each compass.
-
-</source>
-      <translation type="unfinished">Shown in the indicator bars is the quality of the calibration for each compass.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="115"/>
-      <source>Compass %1 </source>
-      <translation type="unfinished">Compass %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="128"/>
-      <source>, </source>
-      <translation type="unfinished">, </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>external</source>
-      <translation type="unfinished">external</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="130"/>
-      <source>internal</source>
-      <translation type="unfinished">internal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="282"/>
-      <source>- Green indicates a well functioning compass.
-</source>
-      <translation type="unfinished">- Green indicates a well functioning compass.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="283"/>
-      <source>- Yellow indicates a questionable compass or calibration.
-</source>
-      <translation type="unfinished">- Yellow indicates a questionable compass or calibration.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="284"/>
-      <source>- Red indicates a compass which should not be used.
-
-</source>
-      <translation type="unfinished">- Red indicates a compass which should not be used.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="285"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="313"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE AFTER EACH CALIBRATION.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="317"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 1</source>
-      <translation type="unfinished">Priority 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 2</source>
-      <translation type="unfinished">Priority 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Priority 3</source>
-      <translation type="unfinished">Priority 3</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="355"/>
-      <source>Not Set</source>
-      <translation type="unfinished">Not Set</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="389"/>
-      <source>Orientation:</source>
-      <translation type="unfinished">Orientation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="436"/>
-      <source>Autopilot Rotation:</source>
-      <translation type="unfinished">Autopilot Rotation:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="454"/>
-      <source>Magnetic Declination</source>
-      <translation type="unfinished">Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="466"/>
-      <source>Manual Magnetic Declination</source>
-      <translation type="unfinished">Manual Magnetic Declination</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="513"/>
-      <source>This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </source>
-      <translation type="unfinished">This is recommended for vehicles that have only an internal compass and on vehicles where there is significant interference on the compass from the motors, power wires, etc. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="514"/>
-      <source>CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </source>
-      <translation type="unfinished">CompassMot only works well if you have a battery current monitor because the magnetic interference is linear with current drawn. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="515"/>
-      <source>It is technically possible to set-up CompassMot using throttle but this is not recommended.</source>
-      <translation type="unfinished">It is technically possible to set-up CompassMot using throttle but this is not recommended.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="522"/>
-      <source>Disconnect your props, flip them over and rotate them one position around the frame. </source>
-      <translation type="unfinished">Disconnect your props, flip them over and rotate them one position around the frame. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="523"/>
-      <source>In this configuration they should push the copter down into the ground when the throttle is raised.</source>
-      <translation type="unfinished">In this configuration they should push the copter down into the ground when the throttle is raised.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="530"/>
-      <source>Secure the copter (perhaps with tape) so that it does not move.</source>
-      <translation type="unfinished">Secure the copter (perhaps with tape) so that it does not move.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="537"/>
-      <source>Turn on your transmitter and keep throttle at zero.</source>
-      <translation type="unfinished">Turn on your transmitter and keep throttle at zero.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="544"/>
-      <source>Click Ok to start CompassMot calibration.</source>
-      <translation type="unfinished">Click Ok to start CompassMot calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="566"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and press Ok.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and press Ok.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>depth</source>
-      <translation type="unfinished">depth</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="588"/>
-      <source>altitude</source>
-      <translation type="unfinished">altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="589"/>
-      <source>Pressure calibration will set the %1 to zero at the current pressure reading. %2</source>
-      <translation type="unfinished">Pressure calibration will set the %1 to zero at the current pressure reading. %2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="590"/>
-      <source>To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">To calibrate the airspeed sensor shield it from the wind. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="610"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.
-
-Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="632"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="640"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="645"/>
-      <source>Accelerometer must be calibrated prior to Compass.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Compass.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="656"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="660"/>
-      <source>Accelerometer must be calibrated prior to Level Horizon.</source>
-      <translation type="unfinished">Accelerometer must be calibrated prior to Level Horizon.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="669"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="671"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Baro/Airspeed</source>
-      <translation type="unfinished">Baro/Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="679"/>
-      <source>Pressure</source>
-      <translation type="unfinished">Pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="684"/>
-      <source>CompassMot</source>
-      <translation type="unfinished">CompassMot</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="687"/>
-      <source>CompassMot - Compass Motor Interference Calibration</source>
-      <translation type="unfinished">CompassMot - Compass Motor Interference Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="707"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="715"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="789"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="798"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="807"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="816"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="825"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.qml" line="834"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="21"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponent.cc" line="33"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="186"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="203"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="267"/>
-      <source>Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</source>
-      <translation type="unfinished">Rotate the vehicle randomly around all axes until the progress bar fills all the way to the right .</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="347"/>
-      <source>Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</source>
-      <translation type="unfinished">Raise the throttle slowly to between 50% ~ 75% (the props will spin!) for 5 ~ 10 seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="348"/>
-      <source>Quickly bring the throttle back down to zero</source>
-      <translation type="unfinished">Quickly bring the throttle back down to zero</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="349"/>
-      <source>Press the Next button to complete the calibration</source>
-      <translation type="unfinished">Press the Next button to complete the calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="358"/>
-      <source>Hold the vehicle in its level flight position.</source>
-      <translation type="unfinished">Hold the vehicle in its level flight position.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="367"/>
-      <source>Requesting pressure calibration...</source>
-      <translation type="unfinished">Requesting pressure calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="376"/>
-      <source>Requesting gyro calibration...</source>
-      <translation type="unfinished">Requesting gyro calibration...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="506"/>
-      <source>Successfully completed</source>
-      <translation type="unfinished">Successfully completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="510"/>
-      <source>Failed</source>
-      <translation type="unfinished">Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="302"/>
-      <source>Hold still in the current orientation and press Next when ready</source>
-      <translation type="unfinished">Hold still in the current orientation and press Next when ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="558"/>
-      <source>Compass %1 calibration complete</source>
-      <translation type="unfinished">Compass %1 calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="560"/>
-      <source>Compass %1 calibration below quality threshold</source>
-      <translation type="unfinished">Compass %1 calibration below quality threshold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="579"/>
-      <source>All compasses calibrated successfully</source>
-      <translation type="unfinished">All compasses calibrated successfully</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="580"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW FOR NEW SETTINGS TO TAKE AFFECT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="583"/>
-      <source>Compass calibration failed</source>
-      <translation type="unfinished">Compass calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="584"/>
-      <source>YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</source>
-      <translation type="unfinished">YOU MUST REBOOT YOUR VEHICLE NOW AND RETRY COMPASS CALIBRATION PRIOR TO FLIGHT</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentController.cc" line="588"/>
-      <source>Continue rotating...</source>
-      <translation type="unfinished">Continue rotating...</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="33"/>
-      <source>Compass </source>
-      <translation type="unfinished">Compass </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="41"/>
-      <source>Not installed</source>
-      <translation type="unfinished">Not installed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="46"/>
-      <source>Accelerometer(s)</source>
-      <translation type="unfinished">Accelerometer(s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml" line="47"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="21"/>
-      <source>Frame</source>
-      <translation type="unfinished">Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.cc" line="32"/>
-      <source>Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</source>
-      <translation type="unfinished">Frame setup allows you to choose your vehicle&apos;s motor configuration. Install &lt;b&gt;clockwise&lt;/b&gt;&lt;br&gt;propellers on the &lt;b&gt;green thrusters&lt;/b&gt; and &lt;b&gt;counter-clockwise&lt;/b&gt; propellers on the &lt;b&gt;blue thrusters&lt;/b&gt;&lt;br&gt;(or vice-versa). The flight controller will need to be rebooted to apply changes.&lt;br&gt;When selecting a frame, you can choose to load the default parameter set for that frame configuration if available.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="178"/>
-      <source>Frame selection</source>
-      <translation type="unfinished">Frame selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="201"/>
-      <source>Would you like to load the default parameters for the frame ?</source>
-      <translation type="unfinished">Would you like to load the default parameters for the frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="204"/>
-      <source>Would you like to set the desired frame ?</source>
-      <translation type="unfinished">Would you like to set the desired frame ?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="219"/>
-      <source>Yes, Load default parameter set for %1</source>
-      <translation type="unfinished">Yes, Load default parameter set for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="237"/>
-      <source>No, set frame only</source>
-      <translation type="unfinished">No, set frame only</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponent.qml" line="240"/>
-      <source>Confirm frame %1</source>
-      <translation type="unfinished">Confirm frame %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubFrameComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="44"/>
-      <source>Frame Type</source>
-      <translation type="unfinished">Frame Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="49"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="55"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml" line="54"/>
-      <source>Git Revision</source>
-      <translation type="unfinished">Git Revision</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMSubMotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="116"/>
-      <source>Reverse Motor Direction</source>
-      <translation type="unfinished">Reverse Motor Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="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">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.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="206"/>
-      <source>A 10 second coooldown is required before testing again, please stand by...</source>
-      <translation type="unfinished">A 10 second coooldown is required before testing again, please stand by...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="207"/>
-      <source>Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</source>
-      <translation type="unfinished">Slide this switch to arm the vehicle and enable the motor test (CAUTION!)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="217"/>
-      <source>Automatic Motor Direction Detection</source>
-      <translation type="unfinished">Automatic Motor Direction Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMSubMotorComponent.qml" line="225"/>
-      <source>This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</source>
-      <translation type="unfinished">This will attempt to automatically detect the direction (normal/reversed) of your thrusters.
-Please place your vehicle in water, click the button, and wait. Note that the thrusters still need to be connected to the correct outputs (thrusters 2 and 3 can&apos;t be swapped, for example).</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="18"/>
-      <source>Tuning</source>
-      <translation type="unfinished">Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponent.cc" line="29"/>
-      <source>Tuning Setup is used to tune the flight characteristics of the Vehicle.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight characteristics of the Vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="125"/>
-      <source>Basic Tuning</source>
-      <translation type="unfinished">Basic Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="149"/>
-      <source>Roll/Pitch Sensitivity</source>
-      <translation type="unfinished">Roll/Pitch Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="154"/>
-      <source>Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</source>
-      <translation type="unfinished">Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="182"/>
-      <source>Climb Sensitivity</source>
-      <translation type="unfinished">Climb Sensitivity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="187"/>
-      <source>Slide to the right to climb more aggressively or slide to the left to climb more gently</source>
-      <translation type="unfinished">Slide to the right to climb more aggressively or slide to the left to climb more gently</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="215"/>
-      <source>RC Roll/Pitch Feel</source>
-      <translation type="unfinished">RC Roll/Pitch Feel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="220"/>
-      <source>Slide to the left for soft control, slide to the right for crisp control</source>
-      <translation type="unfinished">Slide to the left for soft control, slide to the right for crisp control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="245"/>
-      <source>Spin While Armed</source>
-      <translation type="unfinished">Spin While Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="250"/>
-      <source>Adjust the amount the motors spin to indicate armed</source>
-      <translation type="unfinished">Adjust the amount the motors spin to indicate armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="275"/>
-      <source>Minimum Thrust</source>
-      <translation type="unfinished">Minimum Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="280"/>
-      <source>Adjust the minimum amount of thrust require for the vehicle to move</source>
-      <translation type="unfinished">Adjust the minimum amount of thrust require for the vehicle to move</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="284"/>
-      <source>Warning: This setting should be higher than &apos;Spin While Armed&apos;</source>
-      <translation type="unfinished">Warning: This setting should be higher than &apos;Spin While Armed&apos;</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="320"/>
-      <source>AutoTune</source>
-      <translation type="unfinished">AutoTune</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="341"/>
-      <source>Axes to AutoTune:</source>
-      <translation type="unfinished">Axes to AutoTune:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="350"/>
-      <source>Channel for AutoTune switch:</source>
-      <translation type="unfinished">Channel for AutoTune switch:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 7</source>
-      <translation type="unfinished">Channel 7</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 8</source>
-      <translation type="unfinished">Channel 8</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 9</source>
-      <translation type="unfinished">Channel 9</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 10</source>
-      <translation type="unfinished">Channel 10</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 11</source>
-      <translation type="unfinished">Channel 11</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="356"/>
-      <source>Channel 12</source>
-      <translation type="unfinished">Channel 12</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="380"/>
-      <source>In Flight Tuning</source>
-      <translation type="unfinished">In Flight Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="404"/>
-      <source>RC Channel 6 Option (Tuning):</source>
-      <translation type="unfinished">RC Channel 6 Option (Tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="422"/>
-      <source>Min:</source>
-      <translation type="unfinished">Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="434"/>
-      <source>Max:</source>
-      <translation type="unfinished">Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml" line="462"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-  </context>
-  <context>
-    <name>APMTuningComponentSub</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="41"/>
-      <source>Attitude Controller Parameters</source>
-      <translation type="unfinished">Attitude Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="49"/>
-      <source>Position Controller Parameters</source>
-      <translation type="unfinished">Position Controller Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <location filename="../src/AutoPilotPlugins/APM/APMTuningComponentSub.qml" line="56"/>
-      <source>Waypoint navigation parameters</source>
-      <translation type="unfinished">Waypoint navigation parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirMapManager</name>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="178"/>
-      <source>AirMap Enabled</source>
-      <translation type="unfinished">AirMap Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="186"/>
-      <source>Failed to create airmap::services::Client instance</source>
-      <translation type="unfinished">Failed to create airmap::services::Client instance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirMapManager.cc" line="198"/>
-      <source>No API key for AirMap</source>
-      <translation type="unfinished">No API key for AirMap</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="45"/>
-      <source>Your vehicle is using a custom airframe configuration. </source>
-      <translation type="unfinished">Your vehicle is using a custom airframe configuration. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="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">This configuration can only be modified through the Parameter Editor.
-
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="47"/>
-      <source>If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</source>
-      <translation type="unfinished">If you want to reset your airframe configuration and select a standard configuration, click &apos;Reset&apos; below.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="50"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="114"/>
-      <source>Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</source>
-      <translation type="unfinished">Clicking &apos;Apply&apos; will save the changes you have made to your airframe configuration.&lt;br&gt;&lt;br&gt;All vehicle parameters other than Radio Calibration will be reset.&lt;br&gt;&lt;br&gt;Your vehicle will also be restarted in order to complete the process.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="133"/>
-      <source>To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</source>
-      <translation type="unfinished">To change this configuration, select the desired airframe below then click &apos;Apply and Restart&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="131"/>
-      <source>You&apos;ve connected a %1.</source>
-      <translation type="unfinished">You&apos;ve connected a %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="132"/>
-      <source>Airframe is not set.</source>
-      <translation type="unfinished">Airframe is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="141"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.qml" line="143"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="19"/>
-      <source>Airframe</source>
-      <translation type="unfinished">Airframe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponent.cc" line="31"/>
-      <source>Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</source>
-      <translation type="unfinished">Airframe Setup is used to select the airframe that matches your vehicle. This will in turn set up the various tuning values for flight parameters.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentController.cc" line="85"/>
-      <source>You cannot change airframe configuration while connected to multiple vehicles.</source>
-      <translation type="unfinished">You cannot change airframe configuration while connected to multiple vehicles.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirframeComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="23"/>
-      <source>System ID</source>
-      <translation type="unfinished">System ID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="27"/>
-      <source>Airframe type</source>
-      <translation type="unfinished">Airframe type</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="32"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="31"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="36"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="37"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml" line="41"/>
-      <source>Custom Fw. Ver.</source>
-      <translation type="unfinished">Custom Fw. Ver.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirmapSettings</name>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="67"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="84"/>
-      <source>Enable AirMap Services</source>
-      <translation type="unfinished">Enable AirMap Services</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="89"/>
-      <source>Enable Telemetry</source>
-      <translation type="unfinished">Enable Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="96"/>
-      <source>Show Airspace on Map (Experimental)</source>
-      <translation type="unfinished">Show Airspace on Map (Experimental)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="104"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="113"/>
-      <source>Clear Saved Answers</source>
-      <translation type="unfinished">Clear Saved Answers</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="114"/>
-      <source>All saved ruleset answers will be cleared. Is this really what you want?</source>
-      <translation type="unfinished">All saved ruleset answers will be cleared. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="136"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="153"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="205"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="176"/>
-      <source>Login / Registration</source>
-      <translation type="unfinished">Login / Registration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="192"/>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="292"/>
-      <source>User Name:</source>
-      <translation type="unfinished">User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="208"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="210"/>
-      <source>Anonymous</source>
-      <translation type="unfinished">Anonymous</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="212"/>
-      <source>Authenticated</source>
-      <translation type="unfinished">Authenticated</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="214"/>
-      <source>Authentication Error</source>
-      <translation type="unfinished">Authentication Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="220"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="241"/>
-      <source>Forgot Your AirMap Password?</source>
-      <translation type="unfinished">Forgot Your AirMap Password?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="251"/>
-      <source>Register for an AirMap Account</source>
-      <translation type="unfinished">Register for an AirMap Account</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="272"/>
-      <source>Pilot Profile (WIP)</source>
-      <translation type="unfinished">Pilot Profile (WIP)</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="290"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="291"/>
-      <source>John Doe</source>
-      <translation type="unfinished">John Doe</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="293"/>
-      <source>joe36</source>
-      <translation type="unfinished">joe36</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="294"/>
-      <source>Email:</source>
-      <translation type="unfinished">Email:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="295"/>
-      <source>jonh@doe.com</source>
-      <translation type="unfinished">jonh@doe.com</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="296"/>
-      <source>Phone:</source>
-      <translation type="unfinished">Phone:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="297"/>
-      <source>+1 212 555 1212</source>
-      <translation type="unfinished">+1 212 555 1212</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="310"/>
-      <source>License</source>
-      <translation type="unfinished">License</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="329"/>
-      <source>Personal API Key</source>
-      <translation type="unfinished">Personal API Key</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="339"/>
-      <source>API Key:</source>
-      <translation type="unfinished">API Key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="341"/>
-      <source>Client ID:</source>
-      <translation type="unfinished">Client ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="355"/>
-      <source>Flight List Management</source>
-      <translation type="unfinished">Flight List Management</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="367"/>
-      <source>Show Flight List</source>
-      <translation type="unfinished">Show Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="421"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="433"/>
-      <source>Created</source>
-      <translation type="unfinished">Created</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="448"/>
-      <source>Flight Start</source>
-      <translation type="unfinished">Flight Start</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="463"/>
-      <source>Flight End</source>
-      <translation type="unfinished">Flight End</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="478"/>
-      <source>State</source>
-      <translation type="unfinished">State</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Active</source>
-      <translation type="unfinished">Active</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="485"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="499"/>
-      <source>Loading Flight List</source>
-      <translation type="unfinished">Loading Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="531"/>
-      <source>Flight List</source>
-      <translation type="unfinished">Flight List</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="546"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="555"/>
-      <source>From</source>
-      <translation type="unfinished">From</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="576"/>
-      <source>To</source>
-      <translation type="unfinished">To</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="593"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="609"/>
-      <source>End Selected</source>
-      <translation type="unfinished">End Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="627"/>
-      <source>End Flight</source>
-      <translation type="unfinished">End Flight</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="628"/>
-      <source>Confirm ending active flight?</source>
-      <translation type="unfinished">Confirm ending active flight?</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="642"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source> Flights Loaded</source>
-      <translation type="unfinished"> Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="653"/>
-      <source>No Flights Loaded</source>
-      <translation type="unfinished">No Flights Loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="657"/>
-      <source>A maximum of 250 flights were loaded</source>
-      <translation type="unfinished">A maximum of 250 flights were loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirmapSettings.qml" line="665"/>
-      <source>Flight Area </source>
-      <translation type="unfinished">Flight Area </translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceAdvisory</name>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="30"/>
-      <source>Airport</source>
-      <translation type="unfinished">Airport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="31"/>
-      <source>Controlled Airspace</source>
-      <translation type="unfinished">Controlled Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="32"/>
-      <source>Special Use Airspace</source>
-      <translation type="unfinished">Special Use Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="33"/>
-      <source>TFR</source>
-      <translation type="unfinished">TFR</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="34"/>
-      <source>Wild Fire</source>
-      <translation type="unfinished">Wild Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="35"/>
-      <source>Park</source>
-      <translation type="unfinished">Park</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="36"/>
-      <source>Power Plant</source>
-      <translation type="unfinished">Power Plant</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="37"/>
-      <source>Heliport</source>
-      <translation type="unfinished">Heliport</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="38"/>
-      <source>Prison</source>
-      <translation type="unfinished">Prison</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="39"/>
-      <source>School</source>
-      <translation type="unfinished">School</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="40"/>
-      <source>Hospital</source>
-      <translation type="unfinished">Hospital</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="41"/>
-      <source>Fire</source>
-      <translation type="unfinished">Fire</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="42"/>
-      <source>Emergency</source>
-      <translation type="unfinished">Emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="43"/>
-      <source>Custom</source>
-      <translation type="unfinished">Custom</translation>
-    </message>
-    <message>
-      <location filename="../src/AirspaceManagement/AirspaceAdvisoryProvider.cc" line="44"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>AirspaceControl</name>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="109"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="200"/>
-      <source>Airspace</source>
-      <translation type="unfinished">Airspace</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="113"/>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="204"/>
-      <source> Advisories</source>
-      <translation type="unfinished"> Advisories</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="130"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="280"/>
-      <source>Airspace Regulations</source>
-      <translation type="unfinished">Airspace Regulations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="285"/>
-      <source>Advisories based on the selected rules.</source>
-      <translation type="unfinished">Advisories based on the selected rules.</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="326"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>File Flight Plan</source>
-      <translation type="unfinished">File Flight Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="372"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="384"/>
-      <source>Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</source>
-      <translation type="unfinished">Powered by &lt;b&gt;AIRMAP&lt;/b&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="434"/>
-      <source>Airspace Regulation Options</source>
-      <translation type="unfinished">Airspace Regulation Options</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="456"/>
-      <source>PICK ONE REGULATION</source>
-      <translation type="unfinished">PICK ONE REGULATION</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="477"/>
-      <source>OPTIONAL</source>
-      <translation type="unfinished">OPTIONAL</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/AirspaceControl.qml" line="497"/>
-      <source>REQUIRED</source>
-      <translation type="unfinished">REQUIRED</translation>
-    </message>
-  </context>
-  <context>
-    <name>AltModeDialog</name>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="20"/>
-      <source>Select Altitude Mode</source>
-      <translation type="unfinished">Select Altitude Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="47"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="48"/>
-      <source>Specified altitudes are relative to launch position height.</source>
-      <translation type="unfinished">Specified altitudes are relative to launch position height.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="52"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="53"/>
-      <source>Specified altitudes are Above Mean Sea Level.</source>
-      <translation type="unfinished">Specified altitudes are Above Mean Sea Level.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="57"/>
-      <source>Calculated Above Terrain</source>
-      <translation type="unfinished">Calculated Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="58"/>
-      <source>Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. Actual altitudes sent to vehicle are calculated from terrain data and sent as AMSL values.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="62"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="63"/>
-      <source>Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</source>
-      <translation type="unfinished">Specified altitudes are distance above terrain. The actual altitude flown is controlled by the vehicle either from terrain height maps being sent to vehicle or a distance sensor.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="67"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AltModeDialog.qml" line="68"/>
-      <source>The altitude mode can differ for each individual item.</source>
-      <translation type="unfinished">The altitude mode can differ for each individual item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppLogModel</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.cc" line="108"/>
-      <source>Open console log output file failed %1 : %2</source>
-      <translation type="unfinished">Open console log output file failed %1 : %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppMessages</name>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="115"/>
-      <source>GStreamer Debug Level</source>
-      <translation type="unfinished">GStreamer Debug Level</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="159"/>
-      <source>Logging categories</source>
-      <translation type="unfinished">Logging categories</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="170"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="181"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="189"/>
-      <source>Clear All</source>
-      <translation type="unfinished">Clear All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>Log files (*.txt)</source>
-      <translation type="unfinished">Log files (*.txt)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="87"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="89"/>
-      <source>Select log save file</source>
-      <translation type="unfinished">Select log save file</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="107"/>
-      <source>Save App Log</source>
-      <translation type="unfinished">Save App Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="134"/>
-      <source>Show Latest</source>
-      <translation type="unfinished">Show Latest</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AppMessages.qml" line="149"/>
-      <source>Set Logging</source>
-      <translation type="unfinished">Set Logging</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppSettings</name>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="30"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="31"/>
-      <source>Telemetry</source>
-      <translation type="unfinished">Telemetry</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="32"/>
-      <source>Missions</source>
-      <translation type="unfinished">Missions</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="33"/>
-      <source>Logs</source>
-      <translation type="unfinished">Logs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="34"/>
-      <source>Video</source>
-      <translation type="unfinished">Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="35"/>
-      <source>Photo</source>
-      <translation type="unfinished">Photo</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="36"/>
-      <source>CrashLogs</source>
-      <translation type="unfinished">CrashLogs</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="182"/>
-      <source> (Partial)</source>
-      <translation type="unfinished"> (Partial)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/AppSettings.cc" line="191"/>
-      <source> (Test only)</source>
-      <translation type="unfinished"> (Test only)</translation>
-    </message>
-  </context>
-  <context>
-    <name>ArmedIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="24"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ArmedIndicator.qml" line="25"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-  </context>
-  <context>
-    <name>AudioOutput</name>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="155"/>
-      <source> negative </source>
-      <translation type="unfinished"> negative </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="166"/>
-      <source> point </source>
-      <translation type="unfinished"> point </translation>
-    </message>
-    <message>
-      <location filename="../src/Audio/AudioOutput.cc" line="177"/>
-      <source> meters</source>
-      <translation type="unfinished"> meters</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/AutoPilotPlugin.cc" line="74"/>
-      <source>One or more vehicle components require setup prior to flight.</source>
-      <translation type="unfinished">One or more vehicle components require setup prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Autotune</name>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="37"/>
-      <source>Autotune: In progress</source>
-      <translation type="unfinished">Autotune: In progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="90"/>
-      <source>Autotune: initializing</source>
-      <translation type="unfinished">Autotune: initializing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="93"/>
-      <source>Autotune: roll</source>
-      <translation type="unfinished">Autotune: roll</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="96"/>
-      <source>Autotune: pitch</source>
-      <translation type="unfinished">Autotune: pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="99"/>
-      <source>Autotune: yaw</source>
-      <translation type="unfinished">Autotune: yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="102"/>
-      <source>Wait for disarm</source>
-      <translation type="unfinished">Wait for disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="105"/>
-      <source>Land and disarm the vehicle in order to apply the parameters.</source>
-      <translation type="unfinished">Land and disarm the vehicle in order to apply the parameters.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="110"/>
-      <source>Autotune: in progress</source>
-      <translation type="unfinished">Autotune: in progress</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="117"/>
-      <source>Autotune: Success</source>
-      <translation type="unfinished">Autotune: Success</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="119"/>
-      <source>Autotune successful.</source>
-      <translation type="unfinished">Autotune successful.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="122"/>
-      <source>Autotune: Unknown error</source>
-      <translation type="unfinished">Autotune: Unknown error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="134"/>
-      <source>Autotune: Failed</source>
-      <translation type="unfinished">Autotune: Failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.cpp" line="144"/>
-      <source>Autotune: Ack error %1</source>
-      <translation type="unfinished">Autotune: Ack error %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Autotune.h" line="59"/>
-      <source>Autotune: Not performed</source>
-      <translation type="unfinished">Autotune: Not performed</translation>
-    </message>
-  </context>
-  <context>
-    <name>AutotuneUI</name>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="27"/>
-      <source>Autotune</source>
-      <translation type="unfinished">Autotune</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/AutotuneUI.qml" line="37"/>
-      <source>WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</source>
-      <translation type="unfinished">WARNING!
-
-The auto-tuning procedure should be executed with caution and requires the vehicle to fly stable enough before attempting the procedure!
-
-Before starting the auto-tuning process, make sure that: 
-1. You have read the auto-tuning guide and have followed the preliminary steps 
-2. The current control gains are good enough to stabilize the drone in presence of medium disturbances 
-3. You are ready to abort the auto-tuning sequence by moving the RC sticks, if anything unexpected happens. 
-
-Click Ok to start the auto-tuning process.
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>AxisMonitor</name>
-    <message>
-      <location filename="../src/QmlControls/AxisMonitor.qml" line="69"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-  </context>
-  <context>
-    <name>BatteryIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="82"/>
-      <source>100%</source>
-      <translation type="unfinished">100%</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="145"/>
-      <source>Battery Status</source>
-      <translation type="unfinished">Battery Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="168"/>
-      <source>Battery %1</source>
-      <translation type="unfinished">Battery %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="169"/>
-      <source>Charge State</source>
-      <translation type="unfinished">Charge State</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="170"/>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="171"/>
-      <source>Remaining</source>
-      <translation type="unfinished">Remaining</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="172"/>
-      <source>Voltage</source>
-      <translation type="unfinished">Voltage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="173"/>
-      <source>Consumed</source>
-      <translation type="unfinished">Consumed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="174"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/BatteryIndicator.qml" line="175"/>
-      <source>Function</source>
-      <translation type="unfinished">Function</translation>
-    </message>
-  </context>
-  <context>
-    <name>BlankPlanCreator</name>
-    <message>
-      <location filename="../src/MissionManager/BlankPlanCreator.cc" line="16"/>
-      <source>Blank</source>
-      <translation type="unfinished">Blank</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothConfiguration</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="222"/>
-      <source>Bluetooth Link Settings</source>
-      <translation type="unfinished">Bluetooth Link Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="224"/>
-      <source>Bluetooth Not Available</source>
-      <translation type="unfinished">Bluetooth Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothLink</name>
-    <message>
-      <location filename="../src/comm/BluetoothLink.cc" line="185"/>
-      <source>Bluetooth Link Error</source>
-      <translation type="unfinished">Bluetooth Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>BluetoothSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="31"/>
-      <source>Device</source>
-      <translation type="unfinished">Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="37"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="44"/>
-      <source>Bluetooth Devices</source>
-      <translation type="unfinished">Bluetooth Devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="67"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/BluetoothSettings.qml" line="73"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-  </context>
-  <context>
-    <name>Bootloader</name>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="224"/>
-      <source>Write failed: %1</source>
-      <translation type="unfinished">Write failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="229"/>
-      <source>Incorrect number of bytes returned for write: actual(%1) expected(%2)</source>
-      <translation type="unfinished">Incorrect number of bytes returned for write: actual(%1) expected(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="250"/>
-      <source>Timeout waiting for bytes to be available</source>
-      <translation type="unfinished">Timeout waiting for bytes to be available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="260"/>
-      <source>Read failed: error: %1</source>
-      <translation type="unfinished">Read failed: error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="274"/>
-      <source>Get Command Response: </source>
-      <translation type="unfinished">Get Command Response: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="280"/>
-      <source>Invalid sync response: 0x%1 0x%2</source>
-      <translation type="unfinished">Invalid sync response: 0x%1 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="283"/>
-      <source>This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</source>
-      <translation type="unfinished">This board is using a microcontroller with faulty silicon and an incorrect configuration and should be put out of service.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="286"/>
-      <source>Unknown response code</source>
-      <translation type="unfinished">Unknown response code</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="292"/>
-      <source>Command failed: 0x%1 (%2)</source>
-      <translation type="unfinished">Command failed: 0x%1 (%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="156"/>
-      <source>Get Board Info: </source>
-      <translation type="unfinished">Get Board Info: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="342"/>
-      <source>Send Command: </source>
-      <translation type="unfinished">Send Command: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="350"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="516"/>
-      <source>Unable to open firmware file %1: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="371"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="541"/>
-      <source>Firmware file read failed: %1</source>
-      <translation type="unfinished">Firmware file read failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="387"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="470"/>
-      <source>Flash failed: %1 at address 0x%2</source>
-      <translation type="unfinished">Flash failed: %1 at address 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="421"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="593"/>
-      <source>Unable to retrieve block from ihx: index %1</source>
-      <translation type="unfinished">Unable to retrieve block from ihx: index %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="441"/>
-      <source>Unable to set flash start address: 0x%2</source>
-      <translation type="unfinished">Unable to set flash start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="559"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="644"/>
-      <source>Read failed: %1 at address: 0x%2</source>
-      <translation type="unfinished">Read failed: %1 at address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="565"/>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="652"/>
-      <source>Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</source>
-      <translation type="unfinished">Compare failed: expected(0x%1) actual(0x%2) at address: 0x%3</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="613"/>
-      <source>Unable to set read start address: 0x%2</source>
-      <translation type="unfinished">Unable to set read start address: 0x%2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="689"/>
-      <source>CRC mismatch: board(0x%1) file(0x%2)</source>
-      <translation type="unfinished">CRC mismatch: board(0x%1) file(0x%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="40"/>
-      <source>Open failed on port %1: %2</source>
-      <translation type="unfinished">Open failed on port %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="92"/>
-      <source>Unable to put radio into command mode +++</source>
-      <translation type="unfinished">Unable to put radio into command mode +++</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="97"/>
-      <source>Radio did not respond to command mode</source>
-      <translation type="unfinished">Radio did not respond to command mode</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="105"/>
-      <source>Radio did not respond to ATI2 command</source>
-      <translation type="unfinished">Radio did not respond to ATI2 command</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="112"/>
-      <source>Radio did not return board id</source>
-      <translation type="unfinished">Radio did not return board id</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="129"/>
-      <source>Found unsupported bootloader version: %1</source>
-      <translation type="unfinished">Found unsupported bootloader version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="165"/>
-      <source>Unable to reboot radio (ready read)</source>
-      <translation type="unfinished">Unable to reboot radio (ready read)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="181"/>
-      <source>Erase failed: %1</source>
-      <translation type="unfinished">Erase failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="319"/>
-      <source>Get Device: </source>
-      <translation type="unfinished">Get Device: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/Bootloader.cc" line="747"/>
-      <source>Get Board Id: </source>
-      <translation type="unfinished">Get Board Id: </translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalc</name>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="238"/>
-      <source>CameraCalc section version %1 not supported</source>
-      <translation type="unfinished">CameraCalc section version %1 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="310"/>
-      <source>Custom Camera</source>
-      <translation type="unfinished">Custom Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CameraCalc.cc" line="315"/>
-      <source>Manual (no camera specs)</source>
-      <translation type="unfinished">Manual (no camera specs)</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcCamera</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="108"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="112"/>
-      <source>Height</source>
-      <translation type="unfinished">Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="120"/>
-      <source>Sensor</source>
-      <translation type="unfinished">Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="135"/>
-      <source>Image</source>
-      <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcCamera.qml" line="150"/>
-      <source>Focal length</source>
-      <translation type="unfinished">Focal length</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraCalcGrid</name>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="47"/>
-      <source>Front Lap</source>
-      <translation type="unfinished">Front Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="51"/>
-      <source>Side Lap</source>
-      <translation type="unfinished">Side Lap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="59"/>
-      <source>Overlap</source>
-      <translation type="unfinished">Overlap</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="72"/>
-      <source>Select one:</source>
-      <translation type="unfinished">Select one:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraCalcGrid.qml" line="102"/>
-      <source>Grnd Res</source>
-      <translation type="unfinished">Grnd Res</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="88"/>
-      <source>Vehicle must be restarted for changes to take effect.</source>
-      <translation type="unfinished">Vehicle must be restarted for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="91"/>
-      <source>Apply and Restart</source>
-      <translation type="unfinished">Apply and Restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="102"/>
-      <source>Camera Trigger Settings</source>
-      <translation type="unfinished">Camera Trigger Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="125"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="140"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="154"/>
-      <source>Time Interval</source>
-      <translation type="unfinished">Time Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="169"/>
-      <source>Distance Interval</source>
-      <translation type="unfinished">Distance Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="186"/>
-      <source>Hardware Settings</source>
-      <translation type="unfinished">Hardware Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="199"/>
-      <source>AUX Pin Assignment</source>
-      <translation type="unfinished">AUX Pin Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="258"/>
-      <source>Trigger Pin Polarity</source>
-      <translation type="unfinished">Trigger Pin Polarity</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.qml" line="289"/>
-      <source>Trigger Period</source>
-      <translation type="unfinished">Trigger Period</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="21"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponent.cc" line="32"/>
-      <source>Camera setup is used to adjust camera and gimbal settings.</source>
-      <translation type="unfinished">Camera setup is used to adjust camera and gimbal settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="25"/>
-      <source>Trigger interface</source>
-      <translation type="unfinished">Trigger interface</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="30"/>
-      <source>Trigger mode</source>
-      <translation type="unfinished">Trigger mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="36"/>
-      <source>Time interval</source>
-      <translation type="unfinished">Time interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="42"/>
-      <source>Distance interval</source>
-      <translation type="unfinished">Distance interval</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="48"/>
-      <source>AUX pins</source>
-      <translation type="unfinished">AUX pins</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/CameraComponentSummary.qml" line="54"/>
-      <source>AUX pin polarity</source>
-      <translation type="unfinished">AUX pin polarity</translation>
-    </message>
-  </context>
-  <context>
-    <name>CameraSection</name>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="29"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="54"/>
-      <source>Time</source>
-      <translation type="unfinished">Time</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="70"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="87"/>
-      <source>Mode</source>
-      <translation type="unfinished">Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="107"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="108"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CameraSection.qml" line="106"/>
-      <source>Gimbal</source>
-      <translation type="unfinished">Gimbal</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropButton</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="162"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="165"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="177"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="189"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="200"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="212"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="222"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropButton.qml" line="234"/>
-      <source>Follow Vehicle</source>
-      <translation type="unfinished">Follow Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>CenterMapDropPanel</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="29"/>
-      <source>Center map on:</source>
-      <translation type="unfinished">Center map on:</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="32"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="43"/>
-      <source>All items</source>
-      <translation type="unfinished">All items</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="54"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="64"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="75"/>
-      <source>Current Location</source>
-      <translation type="unfinished">Current Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/CenterMapDropPanel.qml" line="86"/>
-      <source>Specified Location</source>
-      <translation type="unfinished">Specified Location</translation>
-    </message>
-  </context>
-  <context>
-    <name>CompInfoParam</name>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="135"/>
-      <source>Component %1</source>
-      <translation type="unfinished">Component %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/CompInfoParam.cc" line="262"/>
-      <source>Internal Error: Parameter MetaData major must be 1</source>
-      <translation type="unfinished">Internal Error: Parameter MetaData major must be 1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplexMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="57"/>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="63"/>
-      <source>This Pattern does not support Presets.</source>
-      <translation type="unfinished">This Pattern does not support Presets.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/ComplexMissionItem.cc" line="69"/>
-      <source>&apos;%1&apos; is a built-in preset which cannot be deleted.</source>
-      <translation type="unfinished">&apos;%1&apos; is a built-in preset which cannot be deleted.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ComplianceRules</name>
-    <message>
-      <location filename="../src/Airmap/ComplianceRules.qml" line="102"/>
-      <source>Rule</source>
-      <translation type="unfinished">Rule</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="124"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="131"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="52"/>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="53"/>
-      <source>Corridor Scan</source>
-      <translation type="unfinished">Corridor Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/CorridorScanComplexItem.h" line="54"/>
-      <source>C</source>
-      <translation type="unfinished">C</translation>
-    </message>
-  </context>
-  <context>
-    <name>CorridorScanEditor</name>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="19"/>
-      <source>Corridor</source>
-      <translation type="unfinished">Corridor</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="38"/>
-      <source>Width</source>
-      <translation type="unfinished">Width</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="45"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="18"/>
-      <source>Use the Polyline Tools to create the polyline which defines the corridor.</source>
-      <translation type="unfinished">Use the Polyline Tools to create the polyline which defines the corridor.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/CorridorScanEditor.qml" line="56"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-  </context>
-  <context>
-    <name>DebugWindow</name>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="38"/>
-      <source>Qt Platform:</source>
-      <translation type="unfinished">Qt Platform:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="48"/>
-      <source>Font Point Size 10</source>
-      <translation type="unfinished">Font Point Size 10</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="54"/>
-      <source>Default font width:</source>
-      <translation type="unfinished">Default font width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="64"/>
-      <source>Font Point Size 10.5</source>
-      <translation type="unfinished">Font Point Size 10.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="70"/>
-      <source>Default font height:</source>
-      <translation type="unfinished">Default font height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="80"/>
-      <source>Font Point Size 11</source>
-      <translation type="unfinished">Font Point Size 11</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="86"/>
-      <source>Default font pixel size:</source>
-      <translation type="unfinished">Default font pixel size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="96"/>
-      <source>Font Point Size 11.5</source>
-      <translation type="unfinished">Font Point Size 11.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="102"/>
-      <source>Default font point size:</source>
-      <translation type="unfinished">Default font point size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="112"/>
-      <source>Font Point Size 12</source>
-      <translation type="unfinished">Font Point Size 12</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="118"/>
-      <source>QML Screen Desktop:</source>
-      <translation type="unfinished">QML Screen Desktop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="128"/>
-      <source>Font Point Size 12.5</source>
-      <translation type="unfinished">Font Point Size 12.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="134"/>
-      <source>QML Screen Size:</source>
-      <translation type="unfinished">QML Screen Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="144"/>
-      <source>Font Point Size 13</source>
-      <translation type="unfinished">Font Point Size 13</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="150"/>
-      <source>QML Pixel Density:</source>
-      <translation type="unfinished">QML Pixel Density:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="160"/>
-      <source>Font Point Size 13.5</source>
-      <translation type="unfinished">Font Point Size 13.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="166"/>
-      <source>QML Pixel Ratio:</source>
-      <translation type="unfinished">QML Pixel Ratio:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="176"/>
-      <source>Font Point Size 14</source>
-      <translation type="unfinished">Font Point Size 14</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="182"/>
-      <source>Default Point:</source>
-      <translation type="unfinished">Default Point:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="192"/>
-      <source>Font Point Size 14.5</source>
-      <translation type="unfinished">Font Point Size 14.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="198"/>
-      <source>Computed Font Height:</source>
-      <translation type="unfinished">Computed Font Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="208"/>
-      <source>Font Point Size 15</source>
-      <translation type="unfinished">Font Point Size 15</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="214"/>
-      <source>Computed Screen Height:</source>
-      <translation type="unfinished">Computed Screen Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="224"/>
-      <source>Font Point Size 15.5</source>
-      <translation type="unfinished">Font Point Size 15.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="230"/>
-      <source>Computed Screen Width:</source>
-      <translation type="unfinished">Computed Screen Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="240"/>
-      <source>Font Point Size 16</source>
-      <translation type="unfinished">Font Point Size 16</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="246"/>
-      <source>Desktop Available Width:</source>
-      <translation type="unfinished">Desktop Available Width:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="256"/>
-      <source>Font Point Size 16.5</source>
-      <translation type="unfinished">Font Point Size 16.5</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="262"/>
-      <source>Desktop Available Height:</source>
-      <translation type="unfinished">Desktop Available Height:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/DebugWindow.qml" line="272"/>
-      <source>Font Point Size 17</source>
-      <translation type="unfinished">Font Point Size 17</translation>
-    </message>
-  </context>
-  <context>
-    <name>DefaultChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="25"/>
-      <source>Generic Initial checks</source>
-      <translation type="unfinished">Generic Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/DefaultChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266Component</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="33"/>
-      <source>controller WiFi Bridge</source>
-      <translation type="unfinished">controller WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="66"/>
-      <source>Error fetching WiFi Bridge Status: %1</source>
-      <translation type="unfinished">Error fetching WiFi Bridge Status: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="116"/>
-      <source>ESP WiFi Bridge Settings</source>
-      <translation type="unfinished">ESP WiFi Bridge Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="143"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="159"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="176"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="192"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="208"/>
-      <source>WiFi STA SSID</source>
-      <translation type="unfinished">WiFi STA SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="225"/>
-      <source>WiFi STA Password</source>
-      <translation type="unfinished">WiFi STA Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="242"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="258"/>
-      <source>QGC UDP Port</source>
-      <translation type="unfinished">QGC UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="277"/>
-      <source>ESP WiFi Bridge Status</source>
-      <translation type="unfinished">ESP WiFi Bridge Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="290"/>
-      <source>Bridge/Vehicle Link</source>
-      <translation type="unfinished">Bridge/Vehicle Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="294"/>
-      <source>Bridge/QGC Link</source>
-      <translation type="unfinished">Bridge/QGC Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="298"/>
-      <source>QGC/Bridge Link</source>
-      <translation type="unfinished">QGC/Bridge Link</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="304"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="319"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="333"/>
-      <source>Messages Received</source>
-      <translation type="unfinished">Messages Received</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="346"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="360"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="374"/>
-      <source>Messages Lost</source>
-      <translation type="unfinished">Messages Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="388"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="416"/>
-      <source>Messages Sent</source>
-      <translation type="unfinished">Messages Sent</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="433"/>
-      <source>Restore Defaults</source>
-      <translation type="unfinished">Restore Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="440"/>
-      <source>Restart WiFi Bridge</source>
-      <translation type="unfinished">Restart WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="451"/>
-      <source>Reboot WiFi Bridge</source>
-      <translation type="unfinished">Reboot WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="452"/>
-      <source>This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</source>
-      <translation type="unfinished">This will restart the WiFi Bridge so the settings you&apos;ve changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.qml" line="463"/>
-      <source>Reset Counters</source>
-      <translation type="unfinished">Reset Counters</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="16"/>
-      <source>WiFi Bridge</source>
-      <translation type="unfinished">WiFi Bridge</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266Component.cc" line="28"/>
-      <source>The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</source>
-      <translation type="unfinished">The ESP8266 WiFi Bridge Component is used to setup the WiFi link.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ESP8266ComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="29"/>
-      <source>Firmware Version</source>
-      <translation type="unfinished">Firmware Version</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="33"/>
-      <source>WiFi Mode</source>
-      <translation type="unfinished">WiFi Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="37"/>
-      <source>WiFi Channel</source>
-      <translation type="unfinished">WiFi Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="42"/>
-      <source>WiFi AP SSID</source>
-      <translation type="unfinished">WiFi AP SSID</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="46"/>
-      <source>WiFi AP Password</source>
-      <translation type="unfinished">WiFi AP Password</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml" line="60"/>
-      <source>UART Baud Rate</source>
-      <translation type="unfinished">UART Baud Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>EditPositionDialog</name>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="51"/>
-      <source>Latitude</source>
-      <translation type="unfinished">Latitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="59"/>
-      <source>Longitude</source>
-      <translation type="unfinished">Longitude</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="67"/>
-      <source>Set Geographic</source>
-      <translation type="unfinished">Set Geographic</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="79"/>
-      <source>Zone</source>
-      <translation type="unfinished">Zone</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="87"/>
-      <source>Hemisphere</source>
-      <translation type="unfinished">Hemisphere</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="96"/>
-      <source>Easting</source>
-      <translation type="unfinished">Easting</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="104"/>
-      <source>Northing</source>
-      <translation type="unfinished">Northing</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="112"/>
-      <source>Set UTM</source>
-      <translation type="unfinished">Set UTM</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="124"/>
-      <source>MGRS</source>
-      <translation type="unfinished">MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="132"/>
-      <source>Set MGRS</source>
-      <translation type="unfinished">Set MGRS</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/EditPositionDialog.qml" line="144"/>
-      <source>Set From Vehicle Position</source>
-      <translation type="unfinished">Set From Vehicle Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>ExitWithErrorWindow</name>
-    <message>
-      <location filename="../src/ui/ExitWithErrorWindow.qml" line="47"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FTPManager</name>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="234"/>
-      <source>Invalid Nak format</source>
-      <translation type="unfinished">Invalid Nak format</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="236"/>
-      <source>errno %1</source>
-      <translation type="unfinished">errno %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="131"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="258"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="280"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="293"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="297"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="402"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="411"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="449"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="484"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="530"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="539"/>
-      <source>Download failed</source>
-      <translation type="unfinished">Download failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/FTPManager.cc" line="368"/>
-      <location filename="../src/Vehicle/FTPManager.cc" line="497"/>
-      <source>Download failed: Error saving file</source>
-      <translation type="unfinished">Download failed: Error saving file</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="166"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="191"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="322"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="326"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="201"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="152"/>
-      <source>Distance</source>
-      <translation type="unfinished">Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="239"/>
-      <source>* Approximate glide slope altitudes.</source>
-      <translation type="unfinished">* Approximate glide slope altitudes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="248"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="257"/>
-      <source>* Avoid tailwind on landing.</source>
-      <translation type="unfinished">* Avoid tailwind on landing.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="283"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternEditor.qml" line="290"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-  </context>
-  <context>
-    <name>FWLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="278"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="332"/>
-      <source>Landing Area</source>
-      <translation type="unfinished">Landing Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/FWLandingPatternMapVisual.qml" line="370"/>
-      <source>Glide Slope</source>
-      <translation type="unfinished">Glide Slope</translation>
-    </message>
-  </context>
-  <context>
-    <name>Fact</name>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="247"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>true</source>
-      <translation type="unfinished">true</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="332"/>
-      <source>false</source>
-      <translation type="unfinished">false</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="745"/>
-      <source>Change of parameter %1 requires a Vehicle reboot to take effect.</source>
-      <translation type="unfinished">Change of parameter %1 requires a Vehicle reboot to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/Fact.cc" line="747"/>
-      <source>Change of &apos;%1&apos; value requires restart of %2 to take effect.</source>
-      <translation type="unfinished">Change of &apos;%1&apos; value requires restart of %2 to take effect.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactMetaData</name>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="39"/>
-      <source>Other</source>
-      <translation type="unfinished">Other</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="40"/>
-      <source>Misc</source>
-      <translation type="unfinished">Misc</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="461"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="469"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="479"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="487"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="495"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="504"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="549"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="557"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="567"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="575"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="583"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="592"/>
-      <source>Value must be within %1 and %2</source>
-      <translation type="unfinished">Value must be within %1 and %2</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="523"/>
-      <location filename="../src/FactSystem/FactMetaData.cc" line="611"/>
-      <source>Invalid number</source>
-      <translation type="unfinished">Invalid number</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactTextField</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="36"/>
-      <source>Invalid Value</source>
-      <translation type="unfinished">Invalid Value</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactTextField.qml" line="40"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="39"/>
-      <source>Default</source>
-      <translation type="unfinished">Default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="40"/>
-      <source>Small</source>
-      <translation type="unfinished">Small</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="41"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="42"/>
-      <source>Large</source>
-      <translation type="unfinished">Large</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Settings version %1 for %2 is not supported. Setup will be reset to defaults.</source>
-      <translation type="unfinished">Settings version %1 for %2 is not supported. Setup will be reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/FactValueGrid.cc" line="318"/>
-      <source>Load Settings</source>
-      <translation type="unfinished">Load Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>FactValueSlider</name>
-    <message>
-      <location filename="../src/FactSystem/FactControls/FactValueSlider.qml" line="100"/>
-      <source>Value Details</source>
-      <translation type="unfinished">Value Details</translation>
-    </message>
-  </context>
-  <context>
-    <name>Firmware Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="73"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="75"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="77"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="79"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareImage</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="143"/>
-      <source>Incorrectly formatted line in .ihx file, line too short</source>
-      <translation type="unfinished">Incorrectly formatted line in .ihx file, line too short</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="148"/>
-      <source>Unsupported record type in file: %1</source>
-      <translation type="unfinished">Unsupported record type in file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="218"/>
-      <source>Unable to open firmware file %1, error: %2</source>
-      <translation type="unfinished">Unable to open firmware file %1, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="227"/>
-      <source>Supplied file is not a valid JSON document</source>
-      <translation type="unfinished">Supplied file is not a valid JSON document</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="238"/>
-      <source>Firmware file missing required key: %1</source>
-      <translation type="unfinished">Firmware file missing required key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="248"/>
-      <source>Firmware file has invalid key: %1</source>
-      <translation type="unfinished">Firmware file has invalid key: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="254"/>
-      <source>Downloaded firmware board id does not match hardware board id: %1 != %2</source>
-      <translation type="unfinished">Downloaded firmware board id does not match hardware board id: %1 != %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="276"/>
-      <source>Write failed for parameter meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for parameter meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="283"/>
-      <source>Unable to open parameter meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open parameter meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="305"/>
-      <source>Write failed for airframe meta data file, error: %1</source>
-      <translation type="unfinished">Write failed for airframe meta data file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="312"/>
-      <source>Unable to open airframe meta data file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open airframe meta data file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="338"/>
-      <source>Unable to open decompressed file %1 for writing, error: %2</source>
-      <translation type="unfinished">Unable to open decompressed file %1 for writing, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="344"/>
-      <source>Write failed for decompressed image file, error: %1</source>
-      <translation type="unfinished">Write failed for decompressed image file, error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="368"/>
-      <source>Firmware file has invalid decompressed size for %1</source>
-      <translation type="unfinished">Firmware file has invalid decompressed size for %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="380"/>
-      <source>Could not find compressed bytes for %1 in Firmware file</source>
-      <translation type="unfinished">Could not find compressed bytes for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="385"/>
-      <source>Incorrectly formed compressed bytes section for %1 in Firmware file</source>
-      <translation type="unfinished">Incorrectly formed compressed bytes section for %1 in Firmware file</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="401"/>
-      <source>Firmware file has 0 length %1</source>
-      <translation type="unfinished">Firmware file has 0 length %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="405"/>
-      <source>Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</source>
-      <translation type="unfinished">Size for decompressed %1 does not match stored size: Expected(%1) Actual(%2)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="409"/>
-      <source>Successfully decompressed %1</source>
-      <translation type="unfinished">Successfully decompressed %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareImage.cc" line="437"/>
-      <source>Unabled to open firmware file %1, %2</source>
-      <translation type="unfinished">Unabled to open firmware file %1, %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="347"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="364"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="381"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="398"/>
-      <source>Canon</source>
-      <translation type="unfinished">Canon</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="348"/>
-      <source>S100 PowerShot</source>
-      <translation type="unfinished">S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="357"/>
-      <source>Canon S100 PowerShot</source>
-      <translation type="unfinished">Canon S100 PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="365"/>
-      <source>EOS-M 22mm</source>
-      <translation type="unfinished">EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="374"/>
-      <source>Canon EOS-M 22mm</source>
-      <translation type="unfinished">Canon EOS-M 22mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="382"/>
-      <source>G9 X PowerShot</source>
-      <translation type="unfinished">G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="391"/>
-      <source>Canon G9 X PowerShot</source>
-      <translation type="unfinished">Canon G9 X PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="399"/>
-      <source>SX260 HS PowerShot</source>
-      <translation type="unfinished">SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="408"/>
-      <source>Canon SX260 HS PowerShot</source>
-      <translation type="unfinished">Canon SX260 HS PowerShot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="414"/>
-      <source>GoPro</source>
-      <translation type="unfinished">GoPro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="415"/>
-      <source>Hero 4</source>
-      <translation type="unfinished">Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="424"/>
-      <source>GoPro Hero 4</source>
-      <translation type="unfinished">GoPro Hero 4</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="430"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="446"/>
-      <source>Parrot</source>
-      <translation type="unfinished">Parrot</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="431"/>
-      <source>Sequioa RGB</source>
-      <translation type="unfinished">Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="440"/>
-      <source>Parrot Sequioa RGB</source>
-      <translation type="unfinished">Parrot Sequioa RGB</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="447"/>
-      <source>Sequioa Monochrome</source>
-      <translation type="unfinished">Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="456"/>
-      <source>Parrot Sequioa Monochrome</source>
-      <translation type="unfinished">Parrot Sequioa Monochrome</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="462"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="463"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="472"/>
-      <source>RedEdge</source>
-      <translation type="unfinished">RedEdge</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="479"/>
-      <source>Ricoh</source>
-      <translation type="unfinished">Ricoh</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="480"/>
-      <source>GR II</source>
-      <translation type="unfinished">GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="489"/>
-      <source>Ricoh GR II</source>
-      <translation type="unfinished">Ricoh GR II</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="495"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="511"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="527"/>
-      <source>Sentera</source>
-      <translation type="unfinished">Sentera</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="496"/>
-      <source>Double 4K Sensor</source>
-      <translation type="unfinished">Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="505"/>
-      <source>Sentera Double 4K Sensor</source>
-      <translation type="unfinished">Sentera Double 4K Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="512"/>
-      <source>NDVI Single Sensor</source>
-      <translation type="unfinished">NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="521"/>
-      <source>Sentera NDVI Single Sensor</source>
-      <translation type="unfinished">Sentera NDVI Single Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="528"/>
-      <source>6X Sensor</source>
-      <translation type="unfinished">6X Sensor</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="545"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="561"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="577"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="593"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="609"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="625"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="641"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="657"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="673"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="689"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="705"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="724"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="742"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="759"/>
-      <source>Sony</source>
-      <translation type="unfinished">Sony</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="546"/>
-      <source>a6000 16mm</source>
-      <translation type="unfinished">a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="555"/>
-      <source>Sony a6000 16mm</source>
-      <translation type="unfinished">Sony a6000 16mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="562"/>
-      <source>a6000 35mm</source>
-      <translation type="unfinished">a6000 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="578"/>
-      <source>a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="587"/>
-      <source>Sony a6300 Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a6300 Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="594"/>
-      <source>a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="603"/>
-      <source>Sony a6300 Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a6300 Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="610"/>
-      <source>a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="619"/>
-      <source>Sony a7R II Zeiss 21mm f/2.8</source>
-      <translation type="unfinished">Sony a7R II Zeiss 21mm f/2.8</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="626"/>
-      <source>a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="635"/>
-      <source>Sony a7R II Sony 28mm f/2.0</source>
-      <translation type="unfinished">Sony a7R II Sony 28mm f/2.0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="642"/>
-      <source>a7r III 35mm</source>
-      <translation type="unfinished">a7r III 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="658"/>
-      <source>a7r IV 35mm</source>
-      <translation type="unfinished">a7r IV 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="674"/>
-      <source>DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="683"/>
-      <source>Sony DSC-QX30U @ 4.3mm f/3.5</source>
-      <translation type="unfinished">Sony DSC-QX30U @ 4.3mm f/3.5</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="690"/>
-      <source>DSC-RX0</source>
-      <translation type="unfinished">DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="699"/>
-      <source>Sony DSC-RX0</source>
-      <translation type="unfinished">Sony DSC-RX0</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="706"/>
-      <source>DSC-RX1R II 35mm</source>
-      <translation type="unfinished">DSC-RX1R II 35mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="725"/>
-      <source>ILCE-QX1</source>
-      <translation type="unfinished">ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="734"/>
-      <source>Sony ILCE-QX1</source>
-      <translation type="unfinished">Sony ILCE-QX1</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="743"/>
-      <source>NEX-5R 20mm</source>
-      <translation type="unfinished">NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="752"/>
-      <source>Sony NEX-5R 20mm</source>
-      <translation type="unfinished">Sony NEX-5R 20mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="760"/>
-      <source>RX100 II 28mm</source>
-      <translation type="unfinished">RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="769"/>
-      <source>Sony RX100 II 28mm</source>
-      <translation type="unfinished">Sony RX100 II 28mm</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="775"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="791"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="807"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="823"/>
-      <source>Yuneec</source>
-      <translation type="unfinished">Yuneec</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="776"/>
-      <source>CGOET</source>
-      <translation type="unfinished">CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="785"/>
-      <source>Yuneec CGOET</source>
-      <translation type="unfinished">Yuneec CGOET</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="792"/>
-      <source>E10T</source>
-      <translation type="unfinished">E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="801"/>
-      <source>Yuneec E10T</source>
-      <translation type="unfinished">Yuneec E10T</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="808"/>
-      <source>E50</source>
-      <translation type="unfinished">E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="817"/>
-      <source>Yuneec E50</source>
-      <translation type="unfinished">Yuneec E50</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="824"/>
-      <source>E90</source>
-      <translation type="unfinished">E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="833"/>
-      <source>Yuneec E90</source>
-      <translation type="unfinished">Yuneec E90</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="839"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="855"/>
-      <source>Flir</source>
-      <translation type="unfinished">Flir</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="840"/>
-      <source>Duo R</source>
-      <translation type="unfinished">Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="849"/>
-      <source>Flir Duo R</source>
-      <translation type="unfinished">Flir Duo R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="856"/>
-      <source>Duo Pro R</source>
-      <translation type="unfinished">Duo Pro R</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="871"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="887"/>
-      <source>Workswell</source>
-      <translation type="unfinished">Workswell</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="872"/>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="888"/>
-      <source>Wiris Security</source>
-      <translation type="unfinished">Wiris Security</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="1061"/>
-      <source>Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</source>
-      <translation type="unfinished">Vehicle is not running latest stable firmware! Running %1, latest stable is %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgrade</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="28"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="44"/>
-      <source>Firmware Setup</source>
-      <translation type="unfinished">Firmware Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="47"/>
-      <source>%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</source>
-      <translation type="unfinished">%1 can upgrade the firmware on Pixhawk devices, SiK Radios and PX4 Flow Smart Cameras.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="48"/>
-      <source>Update the autopilot firmware to the latest version</source>
-      <translation type="unfinished">Update the autopilot firmware to the latest version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="52"/>
-      <source>All %1 connections to vehicles must be </source>
-      <translation type="unfinished">All %1 connections to vehicles must be </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="70"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="82"/>
-      <source>Select Firmware File</source>
-      <translation type="unfinished">Select Firmware File</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>Firmware Files (*.px4 *.apj *.bin *.ihx)</source>
-      <translation type="unfinished">Firmware Files (*.px4 *.apj *.bin *.ihx)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="83"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="127"/>
-      <source>Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</source>
-      <translation type="unfinished">Multiple devices detected! Remove all detected devices to perform the firmware upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="128"/>
-      <source>Detected [%1]: </source>
-      <translation type="unfinished">Detected [%1]: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="135"/>
-      <source>Found device</source>
-      <translation type="unfinished">Found device</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="177"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="331"/>
-      <source>PX4 Pro </source>
-      <translation type="unfinished">PX4 Pro </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="242"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="276"/>
-      <source>Standard Version (stable)</source>
-      <translation type="unfinished">Standard Version (stable)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="246"/>
-      <source>Beta Testing (beta)</source>
-      <translation type="unfinished">Beta Testing (beta)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="250"/>
-      <source>Developer Build (master)</source>
-      <translation type="unfinished">Developer Build (master)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="254"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="280"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="293"/>
-      <source>Custom firmware file...</source>
-      <translation type="unfinished">Custom firmware file...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="263"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="267"/>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="344"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="289"/>
-      <source>Standard Version</source>
-      <translation type="unfinished">Standard Version</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="313"/>
-      <source>Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</source>
-      <translation type="unfinished">Detected PX4 Flow board. The firmware you use on the PX4 Flow must match the AutoPilot firmware type you are using on the vehicle:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="314"/>
-      <source>Detected Pixhawk board. You can select from the following flight stacks:</source>
-      <translation type="unfinished">Detected Pixhawk board. You can select from the following flight stacks:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="315"/>
-      <source>Press Ok to upgrade your vehicle.</source>
-      <translation type="unfinished">Press Ok to upgrade your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="318"/>
-      <source>Flight Stack</source>
-      <translation type="unfinished">Flight Stack</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="386"/>
-      <source>Downloading list of available firmwares...</source>
-      <translation type="unfinished">Downloading list of available firmwares...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="394"/>
-      <source>No Firmware Available</source>
-      <translation type="unfinished">No Firmware Available</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="422"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="444"/>
-      <source>Select the standard version or one from the file system (previously downloaded):</source>
-      <translation type="unfinished">Select the standard version or one from the file system (previously downloaded):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="445"/>
-      <source>Select which version of the firmware you would like to install:</source>
-      <translation type="unfinished">Select which version of the firmware you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="446"/>
-      <source>Select which version of the above flight stack you would like to install:</source>
-      <translation type="unfinished">Select which version of the above flight stack you would like to install:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="461"/>
-      <source>WARNING: BETA FIRMWARE. </source>
-      <translation type="unfinished">WARNING: BETA FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="462"/>
-      <source>This firmware version is ONLY intended for beta testers. </source>
-      <translation type="unfinished">This firmware version is ONLY intended for beta testers. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="463"/>
-      <source>Although it has received FLIGHT TESTING, it represents actively changed code. </source>
-      <translation type="unfinished">Although it has received FLIGHT TESTING, it represents actively changed code. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="464"/>
-      <source>Do NOT use for normal operation.</source>
-      <translation type="unfinished">Do NOT use for normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="467"/>
-      <source>WARNING: CONTINUOUS BUILD FIRMWARE. </source>
-      <translation type="unfinished">WARNING: CONTINUOUS BUILD FIRMWARE. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="468"/>
-      <source>This firmware has NOT BEEN FLIGHT TESTED. </source>
-      <translation type="unfinished">This firmware has NOT BEEN FLIGHT TESTED. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="469"/>
-      <source>It is only intended for DEVELOPERS. </source>
-      <translation type="unfinished">It is only intended for DEVELOPERS. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="470"/>
-      <source>Run bench tests without props first. </source>
-      <translation type="unfinished">Run bench tests without props first. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="471"/>
-      <source>Do NOT fly this without additional safety precautions. </source>
-      <translation type="unfinished">Do NOT fly this without additional safety precautions. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="472"/>
-      <source>Follow the forums actively when using it.</source>
-      <translation type="unfinished">Follow the forums actively when using it.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgrade.qml" line="512"/>
-      <source>Flash ChibiOS Bootloader</source>
-      <translation type="unfinished">Flash ChibiOS Bootloader</translation>
-    </message>
-  </context>
-  <context>
-    <name>FirmwareUpgradeController</name>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="162"/>
-      <source>Connect not allowed during Firmware Upgrade.</source>
-      <translation type="unfinished">Connect not allowed during Firmware Upgrade.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="280"/>
-      <source>Connected to bootloader:</source>
-      <translation type="unfinished">Connected to bootloader:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="281"/>
-      <source>  Version: %1</source>
-      <translation type="unfinished">  Version: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="282"/>
-      <source>  Board ID: %1</source>
-      <translation type="unfinished">  Board ID: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="283"/>
-      <source>  Flash size: %1</source>
-      <translation type="unfinished">  Flash size: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="366"/>
-      <source>Custom firmware selected but no filename given.</source>
-      <translation type="unfinished">Custom firmware selected but no filename given.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="371"/>
-      <source>Unable to find specified firmware for board type</source>
-      <translation type="unfinished">Unable to find specified firmware for board type</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="377"/>
-      <source>No firmware file selected</source>
-      <translation type="unfinished">No firmware file selected</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="388"/>
-      <source>Downloading firmware...</source>
-      <translation type="unfinished">Downloading firmware...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="389"/>
-      <source> From: %1</source>
-      <translation type="unfinished"> From: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="410"/>
-      <source>Download complete</source>
-      <translation type="unfinished">Download complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="418"/>
-      <source>Image load failed</source>
-      <translation type="unfinished">Image load failed</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="424"/>
-      <source>Bootloader not found</source>
-      <translation type="unfinished">Bootloader not found</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="429"/>
-      <source>Image size of %1 is too large for board flash size %2</source>
-      <translation type="unfinished">Image size of %1 is too large for board flash size %2</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="461"/>
-      <source>Upgrade complete</source>
-      <translation type="unfinished">Upgrade complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="519"/>
-      <source>Upgrade cancelled</source>
-      <translation type="unfinished">Upgrade cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/FirmwareUpgradeController.cc" line="595"/>
-      <source>Choose board type</source>
-      <translation type="unfinished">Choose board type</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="25"/>
-      <source>Fixed Wing Initial Checks</source>
-      <translation type="unfinished">Fixed Wing Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="81"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FixedWingChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>FixedWingLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="22"/>
-      <source>Fixed Wing Landing</source>
-      <translation type="unfinished">Fixed Wing Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/FixedWingLandingComplexItem.cc" line="98"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightBrief</name>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="32"/>
-      <source>Flight Brief</source>
-      <translation type="unfinished">Flight Brief</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="51"/>
-      <source>Authorizations</source>
-      <translation type="unfinished">Authorizations</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="96"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="128"/>
-      <source>Authorization Pending</source>
-      <translation type="unfinished">Authorization Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="98"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="130"/>
-      <source>Authorization Accepted</source>
-      <translation type="unfinished">Authorization Accepted</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="100"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="132"/>
-      <source>Authorization Rejected</source>
-      <translation type="unfinished">Authorization Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="101"/>
-      <location filename="../src/Airmap/FlightBrief.qml" line="135"/>
-      <source>Authorization Unknown</source>
-      <translation type="unfinished">Authorization Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="134"/>
-      <source>Authorization Not Required</source>
-      <translation type="unfinished">Authorization Not Required</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="144"/>
-      <source>Rules &amp; Compliance</source>
-      <translation type="unfinished">Rules &amp; Compliance</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="149"/>
-      <source>Rules you may be violating</source>
-      <translation type="unfinished">Rules you may be violating</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="159"/>
-      <source>Rules needing more information</source>
-      <translation type="unfinished">Rules needing more information</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="169"/>
-      <source>Rules you should review</source>
-      <translation type="unfinished">Rules you should review</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="179"/>
-      <source>Rules you are following</source>
-      <translation type="unfinished">Rules you are following</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="198"/>
-      <source>Update Plan</source>
-      <translation type="unfinished">Update Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="210"/>
-      <source>Submit Plan</source>
-      <translation type="unfinished">Submit Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightBrief.qml" line="223"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDetails</name>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="32"/>
-      <source>Flight Details</source>
-      <translation type="unfinished">Flight Details</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="51"/>
-      <source>Flight Date &amp; Time</source>
-      <translation type="unfinished">Flight Date &amp; Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="71"/>
-      <location filename="../src/Airmap/FlightDetails.qml" line="141"/>
-      <source>Now</source>
-      <translation type="unfinished">Now</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="82"/>
-      <source>Today</source>
-      <translation type="unfinished">Today</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="96"/>
-      <source>Flight Start Time</source>
-      <translation type="unfinished">Flight Start Time</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="146"/>
-      <source>Duration</source>
-      <translation type="unfinished">Duration</translation>
-    </message>
-    <message>
-      <location filename="../src/Airmap/FlightDetails.qml" line="186"/>
-      <source>Flight Context</source>
-      <translation type="unfinished">Flight Context</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightDisplayViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>WAITING FOR VIDEO</source>
-      <translation type="unfinished">WAITING FOR VIDEO</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlightDisplayViewVideo.qml" line="47"/>
-      <source>VIDEO DISABLED</source>
-      <translation type="unfinished">VIDEO DISABLED</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightMap</name>
-    <message>
-      <location filename="../src/FlightMap/FlightMap.qml" line="69"/>
-      <source>Specify Position</source>
-      <translation type="unfinished">Specify Position</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeDropdown</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeDropdown.qml" line="22"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModeMenu</name>
-    <message>
-      <location filename="../src/QmlControls/FlightModeMenu.qml" line="20"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="24"/>
-      <source>Flight Modes</source>
-      <translation type="unfinished">Flight Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponent.cc" line="35"/>
-      <source>Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</source>
-      <translation type="unfinished">Flight Modes Setup is used to configure the transmitter switches associated with Flight Modes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlightModesComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="49"/>
-      <source>Mode switch</source>
-      <translation type="unfinished">Mode switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="50"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="35"/>
-      <source>Flight Mode %1 </source>
-      <translation type="unfinished">Flight Mode %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="53"/>
-      <source>Position Ctl switch</source>
-      <translation type="unfinished">Position Ctl switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="62"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="57"/>
-      <source>Loiter switch</source>
-      <translation type="unfinished">Loiter switch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml" line="61"/>
-      <source>Return switch</source>
-      <translation type="unfinished">Return switch</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewAirspaceIndicator</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="46"/>
-      <source>Approval Pending</source>
-      <translation type="unfinished">Approval Pending</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="48"/>
-      <source>Flight Approved</source>
-      <translation type="unfinished">Flight Approved</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewAirspaceIndicator.qml" line="50"/>
-      <source>Flight Rejected</source>
-      <translation type="unfinished">Flight Rejected</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMap</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="346"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="371"/>
-      <source>Go here</source>
-      <comment>Go to location waypoint</comment>
-      <translation type="unfinished">Go here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="474"/>
-      <source>ROI here</source>
-      <comment>Make this a Region Of Interest</comment>
-      <translation type="unfinished">ROI here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="510"/>
-      <source>Orbit</source>
-      <comment>Orbit waypoint</comment>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="522"/>
-      <source>Go to location</source>
-      <translation type="unfinished">Go to location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="531"/>
-      <source>Orbit at location</source>
-      <translation type="unfinished">Orbit at location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMap.qml" line="540"/>
-      <source>ROI at location</source>
-      <translation type="unfinished">ROI at location</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewMissionCompleteDialog</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="44"/>
-      <source>Flight Plan complete</source>
-      <translation type="unfinished">Flight Plan complete</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="80"/>
-      <source>%1 Images Taken</source>
-      <translation type="unfinished">%1 Images Taken</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="87"/>
-      <source>Remove plan from vehicle</source>
-      <translation type="unfinished">Remove plan from vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="98"/>
-      <source>Leave plan on vehicle</source>
-      <translation type="unfinished">Leave plan on vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="116"/>
-      <source>Resume Mission From Waypoint %1</source>
-      <translation type="unfinished">Resume Mission From Waypoint %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="127"/>
-      <source>Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</source>
-      <translation type="unfinished">Resume Mission will rebuild the current mission from the last flown waypoint and upload it to the vehicle for the next flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewMissionCompleteDialog.qml" line="135"/>
-      <source>If you are changing batteries for Resume Mission do not disconnect from the vehicle.</source>
-      <translation type="unfinished">If you are changing batteries for Resume Mission do not disconnect from the vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewPreFlightChecklistPopup</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewPreFlightChecklistPopup.qml" line="21"/>
-      <source>Pre-Flight Checklist</source>
-      <translation type="unfinished">Pre-Flight Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStrip</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStrip.qml" line="18"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewToolStripActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewToolStripActionList.qml" line="22"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewVideo</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewVideo.qml" line="68"/>
-      <source>Double-click to exit full screen</source>
-      <translation type="unfinished">Double-click to exit full screen</translation>
-    </message>
-  </context>
-  <context>
-    <name>FlyViewWidgetLayer</name>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="89"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/FlyViewWidgetLayer.qml" line="95"/>
-      <source>Multi-Vehicle</source>
-      <translation type="unfinished">Multi-Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Status</source>
-      <translation type="unfinished">GPS Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="50"/>
-      <source>GPS Data Unavailable</source>
-      <translation type="unfinished">GPS Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="63"/>
-      <source>GPS Count:</source>
-      <translation type="unfinished">GPS Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="64"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="66"/>
-      <source>N/A</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="65"/>
-      <source>GPS Lock:</source>
-      <translation type="unfinished">GPS Lock:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="67"/>
-      <source>HDOP:</source>
-      <translation type="unfinished">HDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="68"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="70"/>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="72"/>
-      <source>--.--</source>
-      <comment>No data to display</comment>
-      <translation type="unfinished">--.--</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="69"/>
-      <source>VDOP:</source>
-      <translation type="unfinished">VDOP:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSIndicator.qml" line="71"/>
-      <source>Course Over Ground:</source>
-      <translation type="unfinished">Course Over Ground:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GPSRTKIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>Survey-in Active</source>
-      <translation type="unfinished">Survey-in Active</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="47"/>
-      <source>RTK Streaming</source>
-      <translation type="unfinished">RTK Streaming</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="61"/>
-      <source>Duration:</source>
-      <translation type="unfinished">Duration:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Accuracy:</source>
-      <translation type="unfinished">Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="70"/>
-      <source>Current Accuracy:</source>
-      <translation type="unfinished">Current Accuracy:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/GPSRTKIndicator.qml" line="77"/>
-      <source>Satellites:</source>
-      <translation type="unfinished">Satellites:</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeneralSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="407"/>
-      <source>Units</source>
-      <translation type="unfinished">Units</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="444"/>
-      <source>Miscellaneous</source>
-      <translation type="unfinished">Miscellaneous</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="468"/>
-      <source>Language</source>
-      <translation type="unfinished">Language</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="479"/>
-      <source>Color Scheme</source>
-      <translation type="unfinished">Color Scheme</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="490"/>
-      <source>Map Provider</source>
-      <translation type="unfinished">Map Provider</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="510"/>
-      <source>Map Type</source>
-      <translation type="unfinished">Map Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="529"/>
-      <source>Stream GCS Position</source>
-      <translation type="unfinished">Stream GCS Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="611"/>
-      <source>Mute all audio output</source>
-      <translation type="unfinished">Mute all audio output</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="626"/>
-      <source>Clear all settings on next start</source>
-      <translation type="unfinished">Clear all settings on next start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="636"/>
-      <source>Clear Settings</source>
-      <translation type="unfinished">Clear Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="637"/>
-      <source>All saved settings will be reset the next time you start %1. Is this really what you want?</source>
-      <translation type="unfinished">All saved settings will be reset the next time you start %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="661"/>
-      <source>Application Load/Save Path</source>
-      <translation type="unfinished">Application Load/Save Path</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="665"/>
-      <source>&lt;not set&gt;</source>
-      <translation type="unfinished">&lt;not set&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="668"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1072"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1094"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="672"/>
-      <source>Choose the location to save/load files</source>
-      <translation type="unfinished">Choose the location to save/load files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="685"/>
-      <source>Telemetry Logs from Vehicle</source>
-      <translation type="unfinished">Telemetry Logs from Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="703"/>
-      <source>Save log after each flight</source>
-      <translation type="unfinished">Save log after each flight</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="711"/>
-      <source>Save logs even if vehicle was not armed</source>
-      <translation type="unfinished">Save logs even if vehicle was not armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="84"/>
-      <source>Fly View</source>
-      <translation type="unfinished">Fly View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="145"/>
-      <source>Auto-Center Throttle</source>
-      <translation type="unfinished">Auto-Center Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="177"/>
-      <source>Show simple camera controls (DIGICAM_CONTROL)</source>
-      <translation type="unfinished">Show simple camera controls (DIGICAM_CONTROL)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="188"/>
-      <source>Guided Command Settings</source>
-      <translation type="unfinished">Guided Command Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="194"/>
-      <source>Minimum Altitude</source>
-      <translation type="unfinished">Minimum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="205"/>
-      <source>Maximum Altitude</source>
-      <translation type="unfinished">Maximum Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="539"/>
-      <source>UI Scaling</source>
-      <translation type="unfinished">UI Scaling</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="604"/>
-      <source>Use Vehicle Pairing</source>
-      <translation type="unfinished">Use Vehicle Pairing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="618"/>
-      <source>Check for Internet connection</source>
-      <translation type="unfinished">Check for Internet connection</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="719"/>
-      <source>Save CSV log of telemetry data</source>
-      <translation type="unfinished">Save CSV log of telemetry data</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="103"/>
-      <source>Use Preflight Checklist</source>
-      <translation type="unfinished">Use Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="111"/>
-      <source>Enforce Preflight Checklist</source>
-      <translation type="unfinished">Enforce Preflight Checklist</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="120"/>
-      <source>Keep Map Centered On Vehicle</source>
-      <translation type="unfinished">Keep Map Centered On Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="128"/>
-      <source>Show Telemetry Log Replay Status Bar</source>
-      <translation type="unfinished">Show Telemetry Log Replay Status Bar</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="139"/>
-      <source>Virtual Joystick</source>
-      <translation type="unfinished">Virtual Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="153"/>
-      <source>Use Vertical Instrument Panel</source>
-      <translation type="unfinished">Use Vertical Instrument Panel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="161"/>
-      <source>Show additional heading indicators on Compass</source>
-      <translation type="unfinished">Show additional heading indicators on Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="169"/>
-      <source>Lock Compass Nose-Up</source>
-      <translation type="unfinished">Lock Compass Nose-Up</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="216"/>
-      <source>Go To Location Max Distance</source>
-      <translation type="unfinished">Go To Location Max Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="233"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="240"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="296"/>
-      <source>File Format</source>
-      <translation type="unfinished">File Format</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="318"/>
-      <source>Video decode priority</source>
-      <translation type="unfinished">Video decode priority</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="345"/>
-      <source>Auto-Delete Saved Recordings</source>
-      <translation type="unfinished">Auto-Delete Saved Recordings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="356"/>
-      <source>Plan View</source>
-      <translation type="unfinished">Plan View</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="378"/>
-      <source>Default Mission Altitude</source>
-      <translation type="unfinished">Default Mission Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="384"/>
-      <source>VTOL TransitionDistance</source>
-      <translation type="unfinished">VTOL TransitionDistance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="392"/>
-      <source>Use MAV_CMD_CONDITION_GATE for pattern generation</source>
-      <translation type="unfinished">Use MAV_CMD_CONDITION_GATE for pattern generation</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="397"/>
-      <source>Missions Do Not Require Takeoff Item</source>
-      <translation type="unfinished">Missions Do Not Require Takeoff Item</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="427"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="731"/>
-      <source>AutoConnect to the following devices</source>
-      <translation type="unfinished">AutoConnect to the following devices</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>LibrePilot</source>
-      <translation type="unfinished">LibrePilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="847"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="762"/>
-      <source>Zero-Conf</source>
-      <translation type="unfinished">Zero-Conf</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="781"/>
-      <source>NMEA GPS Device</source>
-      <translation type="unfinished">NMEA GPS Device</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="812"/>
-      <source>NMEA GPS Baudrate</source>
-      <translation type="unfinished">NMEA GPS Baudrate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="832"/>
-      <source>NMEA stream UDP port</source>
-      <translation type="unfinished">NMEA stream UDP port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="870"/>
-      <source>Perform Survey-In</source>
-      <translation type="unfinished">Perform Survey-In</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="904"/>
-      <source>Use Specified Base Position</source>
-      <translation type="unfinished">Use Specified Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="965"/>
-      <source>Save Current Base Position</source>
-      <translation type="unfinished">Save Current Base Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="981"/>
-      <source>ADSB Server</source>
-      <translation type="unfinished">ADSB Server</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="999"/>
-      <source>Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</source>
-      <translation type="unfinished">Note: These setting are not meant for use with an ADSB transponder which is situated on the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="253"/>
-      <source>UDP Port</source>
-      <translation type="unfinished">UDP Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="264"/>
-      <source>RTSP URL</source>
-      <translation type="unfinished">RTSP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="275"/>
-      <source>TCP URL</source>
-      <translation type="unfinished">TCP URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="285"/>
-      <source>Aspect Ratio</source>
-      <translation type="unfinished">Aspect Ratio</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="331"/>
-      <source>Disable When Disarmed</source>
-      <translation type="unfinished">Disable When Disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="338"/>
-      <source>Low Latency Mode</source>
-      <translation type="unfinished">Low Latency Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="307"/>
-      <source>Max Storage Usage</source>
-      <translation type="unfinished">Max Storage Usage</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1044"/>
-      <source>Brand Image</source>
-      <translation type="unfinished">Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1063"/>
-      <source>Indoor Image</source>
-      <translation type="unfinished">Indoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1076"/>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1098"/>
-      <source>Choose custom brand image file</source>
-      <translation type="unfinished">Choose custom brand image file</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1085"/>
-      <source>Outdoor Image</source>
-      <translation type="unfinished">Outdoor Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1106"/>
-      <source>Reset Default Brand Image</source>
-      <translation type="unfinished">Reset Default Brand Image</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/GeneralSettings.qml" line="1119"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceController</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="151"/>
-      <source>GeoFence supports version %1</source>
-      <translation type="unfinished">GeoFence supports version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="158"/>
-      <source>GeoFence polygon not stored as object</source>
-      <translation type="unfinished">GeoFence polygon not stored as object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceController.cc" line="172"/>
-      <source>GeoFence circle not stored as object</source>
-      <translation type="unfinished">GeoFence circle not stored as object</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceEditor</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="37"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="65"/>
-      <source>GeoFencing allows you to set a virtual fence around the area you want to fly in.</source>
-      <translation type="unfinished">GeoFencing allows you to set a virtual fence around the area you want to fly in.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="66"/>
-      <source>This vehicle does not support GeoFence.</source>
-      <translation type="unfinished">This vehicle does not support GeoFence.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="116"/>
-      <source>Insert GeoFence</source>
-      <translation type="unfinished">Insert GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="121"/>
-      <source>Polygon Fence</source>
-      <translation type="unfinished">Polygon Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="133"/>
-      <source>Circular Fence</source>
-      <translation type="unfinished">Circular Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="147"/>
-      <source>Polygon Fences</source>
-      <translation type="unfinished">Polygon Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="151"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="226"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="162"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="238"/>
-      <source>Inclusion</source>
-      <translation type="unfinished">Inclusion</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="178"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="254"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="202"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="294"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="211"/>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="303"/>
-      <source>Del</source>
-      <translation type="unfinished">Del</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="222"/>
-      <source>Circular Fences</source>
-      <translation type="unfinished">Circular Fences</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="278"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="314"/>
-      <source>Breach Return Point</source>
-      <translation type="unfinished">Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="318"/>
-      <source>Add Breach Return Point</source>
-      <translation type="unfinished">Add Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="327"/>
-      <source>Remove Breach Return Point</source>
-      <translation type="unfinished">Remove Breach Return Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/GeoFenceEditor.qml" line="342"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceManager</name>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="161"/>
-      <source>GeoFence load: Vertex count change mid-polygon - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Vertex count change mid-polygon - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="165"/>
-      <source>GeoFence load: Polygon type changed before last load complete - actual:expected</source>
-      <translation type="unfinished">GeoFence load: Polygon type changed before last load complete - actual:expected</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="178"/>
-      <source>GeoFence load: Incomplete polygon loaded</source>
-      <translation type="unfinished">GeoFence load: Incomplete polygon loaded</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/GeoFenceManager.cc" line="186"/>
-      <source>GeoFence load: Unsupported command %1</source>
-      <translation type="unfinished">GeoFence load: Unsupported command %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoFenceMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/GeoFenceMapVisuals.qml" line="170"/>
-      <source>B</source>
-      <comment>Breach Return Point item indicator</comment>
-      <translation type="unfinished">B</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagController</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="58"/>
-      <source>Images have alreay been tagged. Existing images will be removed.</source>
-      <translation type="unfinished">Images have alreay been tagged. Existing images will be removed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="81"/>
-      <source>The save folder already contains images.</source>
-      <translation type="unfinished">The save folder already contains images.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="95"/>
-      <source>Cannot find the image directory.</source>
-      <translation type="unfinished">Cannot find the image directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="103"/>
-      <source>Couldn&apos;t replace the previously tagged images</source>
-      <translation type="unfinished">Couldn&apos;t replace the previously tagged images</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="110"/>
-      <source>Cannot find the save directory.</source>
-      <translation type="unfinished">Cannot find the save directory.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="26"/>
-      <source>Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</source>
-      <translation type="unfinished">Used to tag a set of images from a survey mission with gps coordinates. You must provide the binary log from the flight as well as the directory which contains the images to tag.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="67"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="75"/>
-      <source>Select log file</source>
-      <translation type="unfinished">Select log file</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>ULog file (*.ulg)</source>
-      <translation type="unfinished">ULog file (*.ulg)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>PX4 log file (*.px4log)</source>
-      <translation type="unfinished">PX4 log file (*.px4log)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="77"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="95"/>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="103"/>
-      <source>Select image directory</source>
-      <translation type="unfinished">Select image directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="122"/>
-      <source>(Optionally) Select save directory</source>
-      <translation type="unfinished">(Optionally) Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="130"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Cancel Tagging</source>
-      <translation type="unfinished">Cancel Tagging</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagPage.qml" line="149"/>
-      <source>Start Tagging</source>
-      <translation type="unfinished">Start Tagging</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeoTagWorker</name>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="158"/>
-      <source>The image directory doesn&apos;t contain images, make sure your images are of the JPG format</source>
-      <translation type="unfinished">The image directory doesn&apos;t contain images, make sure your images are of the JPG format</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="169"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="257"/>
-      <source>Geotagging failed. Couldn&apos;t open an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open an image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="181"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="213"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="228"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="242"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="284"/>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="291"/>
-      <source>Tagging cancelled</source>
-      <translation type="unfinished">Tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="190"/>
-      <source>Geotagging failed. Couldn&apos;t open log file.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t open log file.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>%1 - tagging cancelled</source>
-      <translation type="unfinished">%1 - tagging cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="217"/>
-      <source>Log parsing failed</source>
-      <translation type="unfinished">Log parsing failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="235"/>
-      <source>Geotagging failed in trigger filtering</source>
-      <translation type="unfinished">Geotagging failed in trigger filtering</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="252"/>
-      <source>Geotagging failed. Requesting image #%1, but only %2 images present.</source>
-      <translation type="unfinished">Geotagging failed. Requesting image #%1, but only %2 images present.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="264"/>
-      <source>Geotagging failed. Couldn&apos;t write to image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to image.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/GeoTagController.cc" line="274"/>
-      <source>Geotagging failed. Couldn&apos;t write to an image.</source>
-      <translation type="unfinished">Geotagging failed. Couldn&apos;t write to an image.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionConfirm</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionConfirm.qml" line="104"/>
-      <source>Slide to confirm</source>
-      <translation type="unfinished">Slide to confirm</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionList</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionList.qml" line="81"/>
-      <source>Select Action</source>
-      <translation type="unfinished">Select Action</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedActionsController</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="36"/>
-      <source>EMERGENCY STOP</source>
-      <translation type="unfinished">EMERGENCY STOP</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="37"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="39"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="40"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="41"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="42"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="43"/>
-      <source>Start Mission</source>
-      <translation type="unfinished">Start Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="44"/>
-      <source>Start Mission (MV)</source>
-      <translation type="unfinished">Start Mission (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="45"/>
-      <source>Continue Mission</source>
-      <translation type="unfinished">Continue Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="46"/>
-      <source>Resume FAILED</source>
-      <translation type="unfinished">Resume FAILED</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="47"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="48"/>
-      <source>Pause (MV)</source>
-      <translation type="unfinished">Pause (MV)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="49"/>
-      <source>Change Altitude</source>
-      <translation type="unfinished">Change Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="50"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="51"/>
-      <source>Land Abort</source>
-      <translation type="unfinished">Land Abort</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="52"/>
-      <source>Set Waypoint</source>
-      <translation type="unfinished">Set Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="53"/>
-      <source>Go To Location</source>
-      <translation type="unfinished">Go To Location</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="67"/>
-      <source>Return to the launch position of the vehicle.</source>
-      <translation type="unfinished">Return to the launch position of the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="54"/>
-      <source>VTOL Transition</source>
-      <translation type="unfinished">VTOL Transition</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="38"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="55"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="56"/>
-      <source>Action</source>
-      <translation type="unfinished">Action</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="58"/>
-      <source>Arm the vehicle.</source>
-      <translation type="unfinished">Arm the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="59"/>
-      <source>WARNING: This will force arming of the vehicle bypassing any safety checks.</source>
-      <translation type="unfinished">WARNING: This will force arming of the vehicle bypassing any safety checks.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="60"/>
-      <source>Disarm the vehicle</source>
-      <translation type="unfinished">Disarm the vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="61"/>
-      <source>WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</source>
-      <translation type="unfinished">WARNING: THIS WILL STOP ALL MOTORS. IF VEHICLE IS CURRENTLY IN THE AIR IT WILL CRASH.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="62"/>
-      <source>Takeoff from ground and hold position.</source>
-      <translation type="unfinished">Takeoff from ground and hold position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="63"/>
-      <source>Takeoff from ground and start the current mission.</source>
-      <translation type="unfinished">Takeoff from ground and start the current mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="64"/>
-      <source>Continue the mission from the current waypoint.</source>
-      <translation type="unfinished">Continue the mission from the current waypoint.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="65"/>
-      <source>Upload of resume mission failed. Confirm to retry upload</source>
-      <translation type="unfinished">Upload of resume mission failed. Confirm to retry upload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="66"/>
-      <source>Land the vehicle at the current position.</source>
-      <translation type="unfinished">Land the vehicle at the current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="68"/>
-      <source>Change the altitude of the vehicle up or down.</source>
-      <translation type="unfinished">Change the altitude of the vehicle up or down.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="69"/>
-      <source>Move the vehicle to the specified location.</source>
-      <translation type="unfinished">Move the vehicle to the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="70"/>
-      <source>Adjust current waypoint to %1.</source>
-      <translation type="unfinished">Adjust current waypoint to %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="71"/>
-      <source>Orbit the vehicle around the specified location.</source>
-      <translation type="unfinished">Orbit the vehicle around the specified location.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="72"/>
-      <source>Abort the landing sequence.</source>
-      <translation type="unfinished">Abort the landing sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="73"/>
-      <source>Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</source>
-      <translation type="unfinished">Pause the vehicle at it&apos;s current position, adjusting altitude up or down as needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="74"/>
-      <source>Pause all vehicles at their current position.</source>
-      <translation type="unfinished">Pause all vehicles at their current position.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="75"/>
-      <source>Transition VTOL to fixed wing flight.</source>
-      <translation type="unfinished">Transition VTOL to fixed wing flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="76"/>
-      <source>Transition VTOL to multi-rotor flight.</source>
-      <translation type="unfinished">Transition VTOL to multi-rotor flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="77"/>
-      <source>Make the specified location a Region Of Interest.</source>
-      <translation type="unfinished">Make the specified location a Region Of Interest.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="163"/>
-      <source>_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</source>
-      <translation type="unfinished">_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleWasFlying(%5) _vehicleInRTLMode(%6) pauseVehicleSupported(%7) _vehiclePaused(%8) _flightMode(%9) _missionItemCount(%10) roiSupported(%11) orbitSupported(%12) _missionActive(%13) _hideROI(%14) _hideOrbit(%15)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="392"/>
-      <source>Smart RTL</source>
-      <translation type="unfinished">Smart RTL</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedActionsController.qml" line="536"/>
-      <source>Internal error: unknown actionCode</source>
-      <translation type="unfinished">Internal error: unknown actionCode</translation>
-    </message>
-  </context>
-  <context>
-    <name>GuidedAltitudeSlider</name>
-    <message>
-      <location filename="../src/FlightDisplay/GuidedAltitudeSlider.qml" line="65"/>
-      <source>New Alt(rel)</source>
-      <translation type="unfinished">New Alt(rel)</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="37"/>
-      <source>QGroundControl User Guide</source>
-      <translation type="unfinished">QGroundControl User Guide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="44"/>
-      <source>PX4 Users Discussion Forum</source>
-      <translation type="unfinished">PX4 Users Discussion Forum</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/HelpSettings.qml" line="51"/>
-      <source>ArduPilot Users Discussion Forum</source>
-      <translation type="unfinished">ArduPilot Users Discussion Forum</translation>
-    </message>
-  </context>
-  <context>
-    <name>HorizontalFactValueGrid</name>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="128"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="153"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="136"/>
-      <location filename="../src/QmlControls/HorizontalFactValueGrid.qml" line="160"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="21"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="22"/>
-      <source>Color</source>
-      <translation type="unfinished">Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="23"/>
-      <source>Opacity</source>
-      <translation type="unfinished">Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueData.cc" line="24"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueArea</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="85"/>
-      <location filename="../src/QmlControls/InstrumentValueArea.qml" line="109"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <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/QmlControls/InstrumentValueArea.qml" line="127"/>
-      <source>Reset To Defaults</source>
-      <translation type="unfinished">Reset To Defaults</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueEditDialog</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="25"/>
-      <source>Value Display</source>
-      <translation type="unfinished">Value Display</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="41"/>
-      <source>Valuec requires a connected vehicle for setup.</source>
-      <translation type="unfinished">Valuec requires a connected vehicle for setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="89"/>
-      <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="129"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="133"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="146"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="159"/>
-      <source>Show Units</source>
-      <translation type="unfinished">Show Units</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="164"/>
-      <source>Range</source>
-      <translation type="unfinished">Range</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="246"/>
-      <source>Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</source>
-      <translation type="unfinished">Specify the color you want to apply based on value ranges. The color will be applied to the icon if available, otherwise to the value itself.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="264"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="371"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="470"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="321"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="420"/>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="505"/>
-      <source>Add Row</source>
-      <translation type="unfinished">Add Row</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="353"/>
-      <source>Specify the icon you want to display based on value ranges.</source>
-      <translation type="unfinished">Specify the icon you want to display based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="452"/>
-      <source>Specify the icon opacity you want based on value ranges.</source>
-      <translation type="unfinished">Specify the icon opacity you want based on value ranges.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueEditDialog.qml" line="520"/>
-      <source>Select Icon</source>
-      <translation type="unfinished">Select Icon</translation>
-    </message>
-  </context>
-  <context>
-    <name>InstrumentValueValue</name>
-    <message>
-      <location filename="../src/QmlControls/InstrumentValueValue.qml" line="47"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>Joystick</name>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="44"/>
-      <source>No Action</source>
-      <translation type="unfinished">No Action</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="45"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="46"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="47"/>
-      <source>Toggle Arm</source>
-      <translation type="unfinished">Toggle Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="48"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="49"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="50"/>
-      <source>Continuous Zoom In</source>
-      <translation type="unfinished">Continuous Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="51"/>
-      <source>Continuous Zoom Out</source>
-      <translation type="unfinished">Continuous Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="52"/>
-      <source>Step Zoom In</source>
-      <translation type="unfinished">Step Zoom In</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="53"/>
-      <source>Step Zoom Out</source>
-      <translation type="unfinished">Step Zoom Out</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="58"/>
-      <source>Trigger Camera</source>
-      <translation type="unfinished">Trigger Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="59"/>
-      <source>Start Recording Video</source>
-      <translation type="unfinished">Start Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="60"/>
-      <source>Stop Recording Video</source>
-      <translation type="unfinished">Stop Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="61"/>
-      <source>Toggle Recording Video</source>
-      <translation type="unfinished">Toggle Recording Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="62"/>
-      <source>Gimbal Down</source>
-      <translation type="unfinished">Gimbal Down</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="63"/>
-      <source>Gimbal Up</source>
-      <translation type="unfinished">Gimbal Up</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="64"/>
-      <source>Gimbal Left</source>
-      <translation type="unfinished">Gimbal Left</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="65"/>
-      <source>Gimbal Right</source>
-      <translation type="unfinished">Gimbal Right</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="66"/>
-      <source>Gimbal Center</source>
-      <translation type="unfinished">Gimbal Center</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="67"/>
-      <source>Emergency Stop</source>
-      <translation type="unfinished">Emergency Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="54"/>
-      <source>Next Video Stream</source>
-      <translation type="unfinished">Next Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="55"/>
-      <source>Previous Video Stream</source>
-      <translation type="unfinished">Previous Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="56"/>
-      <source>Next Camera</source>
-      <translation type="unfinished">Next Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/Joystick/Joystick.cc" line="57"/>
-      <source>Previous Camera</source>
-      <translation type="unfinished">Previous Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfig</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="28"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="69"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="72"/>
-      <source>Button Assigment</source>
-      <translation type="unfinished">Button Assigment</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="75"/>
-      <source>Calibration</source>
-      <translation type="unfinished">Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfig.qml" line="78"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigAdvanced</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="36"/>
-      <source>Full down stick is zero throttle</source>
-      <translation type="unfinished">Full down stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="42"/>
-      <source>Center stick is zero throttle</source>
-      <translation type="unfinished">Center stick is zero throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="49"/>
-      <source>Spring loaded throttle smoothing</source>
-      <translation type="unfinished">Spring loaded throttle smoothing</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="61"/>
-      <source>Allow negative Thrust</source>
-      <translation type="unfinished">Allow negative Thrust</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="73"/>
-      <source>Exponential:</source>
-      <translation type="unfinished">Exponential:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="93"/>
-      <source>Enable further advanced settings (careful!)</source>
-      <translation type="unfinished">Enable further advanced settings (careful!)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="109"/>
-      <source>Axis frequency (Hz):</source>
-      <translation type="unfinished">Axis frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="127"/>
-      <source>Button repeat frequency (Hz):</source>
-      <translation type="unfinished">Button repeat frequency (Hz):</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="145"/>
-      <source>Enable circle correction</source>
-      <translation type="unfinished">Enable circle correction</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="163"/>
-      <source>Deadbands</source>
-      <translation type="unfinished">Deadbands</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="180"/>
-      <source>Deadband can be set during the first </source>
-      <translation type="unfinished">Deadband can be set during the first </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="181"/>
-      <source>step of calibration by gently wiggling each axis. </source>
-      <translation type="unfinished">step of calibration by gently wiggling each axis. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="182"/>
-      <source>Deadband can also be adjusted by clicking and </source>
-      <translation type="unfinished">Deadband can also be adjusted by clicking and </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigAdvanced.qml" line="183"/>
-      <source>dragging vertically on the corresponding axis monitor.</source>
-      <translation type="unfinished">dragging vertically on the corresponding axis monitor.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigButtons</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="45"/>
-      <source>Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</source>
-      <translation type="unfinished">Assigning the same action to multiple buttons requires the press of all those buttons for the action to be taken. This is useful to prevent accidental button presses for critical actions like Arm or Emergency Stop.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="94"/>
-      <source>Repeat</source>
-      <translation type="unfinished">Repeat</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="124"/>
-      <source>#</source>
-      <translation type="unfinished">#</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="128"/>
-      <source>Function: </source>
-      <translation type="unfinished">Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="132"/>
-      <source>Shift Function: </source>
-      <translation type="unfinished">Shift Function: </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigButtons.qml" line="185"/>
-      <source>No firmware support</source>
-      <translation type="unfinished">No firmware support</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigCalibration</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="169"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="175"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigCalibration.qml" line="187"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigController</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigController.cc" line="197"/>
-      <source>Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</source>
-      <translation type="unfinished">Detected %1 joystick axes. To operate PX4, you need at least %2 axes.</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickConfigGeneral</name>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable joystick input</source>
-      <translation type="unfinished">Enable joystick input</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="38"/>
-      <source>Enable not allowed (Calibrate First)</source>
-      <translation type="unfinished">Enable not allowed (Calibrate First)</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="67"/>
-      <source>Active joystick:</source>
-      <translation type="unfinished">Active joystick:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="79"/>
-      <source>Active joystick name not in combo</source>
-      <translation type="unfinished">Active joystick name not in combo</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="97"/>
-      <source>RC Mode:</source>
-      <translation type="unfinished">RC Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Lateral</source>
-      <translation type="unfinished">Lateral</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="151"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Forward</source>
-      <translation type="unfinished">Forward</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="165"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="178"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/JoystickConfigGeneral.qml" line="191"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-  </context>
-  <context>
-    <name>JoystickIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="47"/>
-      <source>Joystick Status</source>
-      <translation type="unfinished">Joystick Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="59"/>
-      <source>Connected:</source>
-      <translation type="unfinished">Connected:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/JoystickIndicator.qml" line="64"/>
-      <source>Enabled:</source>
-      <translation type="unfinished">Enabled:</translation>
-    </message>
-  </context>
-  <context>
-    <name>JsonHelper</name>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="181"/>
-      <source>File open failed: file:error %1 %2</source>
-      <translation type="unfinished">File open failed: file:error %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="334"/>
-      <source>Unable to open file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="343"/>
-      <source>Unable to parse json file: %1 error: %2 offset: %3</source>
-      <translation type="unfinished">Unable to parse json file: %1 error: %2 offset: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="348"/>
-      <source>Root of json file is not object: %1</source>
-      <translation type="unfinished">Root of json file is not object: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="355"/>
-      <source>Json file: &apos;%1&apos;. %2</source>
-      <translation type="unfinished">Json file: &apos;%1&apos;. %2</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLHelper</name>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="15"/>
-      <source>KML file load failed. %1</source>
-      <translation type="unfinished">KML file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="24"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="29"/>
-      <source>Unable to open file: %1 error: $%2</source>
-      <translation type="unfinished">Unable to open file: %1 error: $%2</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="37"/>
-      <source>Unable to parse KML file: %1 error: %2 line: %3</source>
-      <translation type="unfinished">Unable to parse KML file: %1 error: %2 line: %3</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="61"/>
-      <source>No supported type found in KML file.</source>
-      <translation type="unfinished">No supported type found in KML file.</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="77"/>
-      <source>Unable to find Polygon node in KML</source>
-      <translation type="unfinished">Unable to find Polygon node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="83"/>
-      <location filename="../src/KMLHelper.cc" line="144"/>
-      <source>Internal error: Unable to find coordinates node in KML</source>
-      <translation type="unfinished">Internal error: Unable to find coordinates node in KML</translation>
-    </message>
-    <message>
-      <location filename="../src/KMLHelper.cc" line="138"/>
-      <source>Unable to find LineString node in KML</source>
-      <translation type="unfinished">Unable to find LineString node in KML</translation>
-    </message>
-  </context>
-  <context>
-    <name>KMLOrSHPFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/KMLOrSHPFileDialog.qml" line="19"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>LandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="635"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/LandingComplexItem.cc" line="655"/>
-      <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 relative altitude. Be sure to adjust/check your plan prior to flight.</source>
-      <translation type="unfinished">Fixed Wing Landing Pattern: Setting the loiter and landing altitudes with different settings for altitude relative is no longer supported. Both have been set to relative altitude. Be sure to adjust/check your plan prior to flight.</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkManager</name>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="235"/>
-      <source>Connect not allowed: %1</source>
-      <translation type="unfinished">Connect not allowed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="607"/>
-      <location filename="../src/comm/LinkManager.cc" line="613"/>
-      <location filename="../src/comm/LinkManager.cc" line="618"/>
-      <location filename="../src/comm/LinkManager.cc" line="623"/>
-      <source>%1 on %2 (AutoConnect)</source>
-      <translation type="unfinished">%1 on %2 (AutoConnect)</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="667"/>
-      <source>Shutdown</source>
-      <translation type="unfinished">Shutdown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="683"/>
-      <source>Serial</source>
-      <translation type="unfinished">Serial</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="685"/>
-      <source>UDP</source>
-      <translation type="unfinished">UDP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="686"/>
-      <source>TCP</source>
-      <translation type="unfinished">TCP</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="691"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LinkManager.cc" line="694"/>
-      <location filename="../src/comm/LinkManager.cc" line="884"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-  </context>
-  <context>
-    <name>LinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="95"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="104"/>
-      <source>Remove Link Configuration</source>
-      <translation type="unfinished">Remove Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="105"/>
-      <source>Remove %1. Is this really what you want?</source>
-      <translation type="unfinished">Remove %1. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="116"/>
-      <source>Edit</source>
-      <translation type="unfinished">Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="121"/>
-      <source>Add</source>
-      <translation type="unfinished">Add</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="125"/>
-      <source>Connect</source>
-      <translation type="unfinished">Connect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="130"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="135"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Edit Link Configuration Settings</source>
-      <translation type="unfinished">Edit Link Configuration Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="173"/>
-      <source>Create New Link Configuration</source>
-      <translation type="unfinished">Create New Link Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="183"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="189"/>
-      <source>Enter name</source>
-      <translation type="unfinished">Enter name</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="194"/>
-      <source>Automatically Connect on Start</source>
-      <translation type="unfinished">Automatically Connect on Start</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="201"/>
-      <source>High Latency</source>
-      <translation type="unfinished">High Latency</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="206"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="240"/>
-      <source>OK</source>
-      <translation type="unfinished">OK</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LinkSettings.qml" line="260"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogCompressor</name>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="50"/>
-      <source>Log Compressor: Cannot start/compress log file, since input file %1 is not readable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since input file %1 is not readable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="67"/>
-      <source>Log Compressor: Cannot start/compress log file, since output file %1 is not writable</source>
-      <translation type="unfinished">Log Compressor: Cannot start/compress log file, since output file %1 is not writable</translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="105"/>
-      <source>Log compressor: Dataset contains dimensions: </source>
-      <translation type="unfinished">Log compressor: Dataset contains dimensions: </translation>
-    </message>
-    <message>
-      <location filename="../src/LogCompressor.cc" line="213"/>
-      <source>Log Compressor</source>
-      <translation type="unfinished">Log Compressor</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadController</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="180"/>
-      <source>Available</source>
-      <translation type="unfinished">Available</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="227"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="705"/>
-      <source>Canceled</source>
-      <translation type="unfinished">Canceled</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="274"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="385"/>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="646"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="366"/>
-      <source>Downloaded</source>
-      <translation type="unfinished">Downloaded</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="436"/>
-      <source>Timed Out</source>
-      <translation type="unfinished">Timed Out</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="556"/>
-      <source>Waiting</source>
-      <translation type="unfinished">Waiting</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="601"/>
-      <source>UnknownDate</source>
-      <translation type="unfinished">UnknownDate</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogDownloadPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="24"/>
-      <source>Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</source>
-      <translation type="unfinished">Log Download allows you to download binary log files from your vehicle. Click Refresh to get list of available logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="59"/>
-      <source>Id</source>
-      <translation type="unfinished">Id</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="72"/>
-      <source>Date</source>
-      <translation type="unfinished">Date</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="83"/>
-      <source>Date Unknown</source>
-      <translation type="unfinished">Date Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="94"/>
-      <source>Size</source>
-      <translation type="unfinished">Size</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="107"/>
-      <source>Status</source>
-      <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="124"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>Log Refresh</source>
-      <translation type="unfinished">Log Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="128"/>
-      <source>You must be connected to a vehicle in order to download logs.</source>
-      <translation type="unfinished">You must be connected to a vehicle in order to download logs.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="136"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="153"/>
-      <source>Select save directory</source>
-      <translation type="unfinished">Select save directory</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="170"/>
-      <source>Erase All</source>
-      <translation type="unfinished">Erase All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="174"/>
-      <source>Delete All Log Files</source>
-      <translation type="unfinished">Delete All Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="180"/>
-      <source>All log files will be erased permanently. Is this really what you want?</source>
-      <translation type="unfinished">All log files will be erased permanently. Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadPage.qml" line="189"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLink</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="83"/>
-      <source>Log Replay Error</source>
-      <translation type="unfinished">Log Replay Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="104"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="269"/>
-      <source>Attempt to load new log while log being played</source>
-      <translation type="unfinished">Attempt to load new log while log being played</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="275"/>
-      <source>Unable to open log file: &apos;%1&apos;, error: %2</source>
-      <translation type="unfinished">Unable to open log file: &apos;%1&apos;, error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="285"/>
-      <source>The log file &apos;%1&apos; is corrupt or empty.</source>
-      <translation type="unfinished">The log file &apos;%1&apos; is corrupt or empty.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="358"/>
-      <source>Connect not allowed during Flight Data replay.</source>
-      <translation type="unfinished">Connect not allowed during Flight Data replay.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="425"/>
-      <location filename="../src/comm/LogReplayLink.cc" line="445"/>
-      <source>Unable to seek to new position</source>
-      <translation type="unfinished">Unable to seek to new position</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkConfiguration</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.h" line="40"/>
-      <source>Log Replay Link Settings</source>
-      <translation type="unfinished">Log Replay Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayLinkController</name>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="593"/>
-      <source>%2m:%3s</source>
-      <translation type="unfinished">%2m:%3s</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/LogReplayLink.cc" line="595"/>
-      <source>%1h:%2m:%3s</source>
-      <translation type="unfinished">%1h:%2m:%3s</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplaySettings</name>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="26"/>
-      <source>Log File</source>
-      <translation type="unfinished">Log File</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="35"/>
-      <source>Browse</source>
-      <translation type="unfinished">Browse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="41"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/LogReplaySettings.qml" line="42"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogReplayStatusBar</name>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>Log Replay</source>
-      <translation type="unfinished">Log Replay</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="19"/>
-      <source>You must close all connections prior to replaying a log.</source>
-      <translation type="unfinished">You must close all connections prior to replaying a log.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="30"/>
-      <source>Select Telemetery Log</source>
-      <translation type="unfinished">Select Telemetery Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>Telemetry Logs (*.%1)</source>
-      <translation type="unfinished">Telemetry Logs (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="31"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Pause</source>
-      <translation type="unfinished">Pause</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="56"/>
-      <source>Play</source>
-      <translation type="unfinished">Play</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="104"/>
-      <source>Load Telemetry Log</source>
-      <translation type="unfinished">Load Telemetry Log</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/LogReplayStatusBar.qml" line="110"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="195"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="196"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="197"/>
-      <source>Magnetometer</source>
-      <translation type="unfinished">Magnetometer</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="198"/>
-      <source>Absolute pressure</source>
-      <translation type="unfinished">Absolute pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="199"/>
-      <source>Differential pressure</source>
-      <translation type="unfinished">Differential pressure</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="200"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="201"/>
-      <source>Optical flow</source>
-      <translation type="unfinished">Optical flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="202"/>
-      <source>Computer vision position</source>
-      <translation type="unfinished">Computer vision position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="203"/>
-      <source>Laser based position</source>
-      <translation type="unfinished">Laser based position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="204"/>
-      <source>External ground truth</source>
-      <translation type="unfinished">External ground truth</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="205"/>
-      <source>Angular rate control</source>
-      <translation type="unfinished">Angular rate control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="206"/>
-      <source>Attitude stabilization</source>
-      <translation type="unfinished">Attitude stabilization</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="207"/>
-      <source>Yaw position</source>
-      <translation type="unfinished">Yaw position</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="208"/>
-      <source>Z/altitude control</source>
-      <translation type="unfinished">Z/altitude control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="209"/>
-      <source>X/Y position control</source>
-      <translation type="unfinished">X/Y position control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="210"/>
-      <source>Motor outputs / control</source>
-      <translation type="unfinished">Motor outputs / control</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="211"/>
-      <source>RC receiver</source>
-      <translation type="unfinished">RC receiver</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="212"/>
-      <source>Gyro 2</source>
-      <translation type="unfinished">Gyro 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="213"/>
-      <source>Accelerometer 2</source>
-      <translation type="unfinished">Accelerometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="214"/>
-      <source>Magnetometer 2</source>
-      <translation type="unfinished">Magnetometer 2</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="215"/>
-      <source>GeoFence</source>
-      <translation type="unfinished">GeoFence</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="216"/>
-      <source>AHRS</source>
-      <translation type="unfinished">AHRS</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="217"/>
-      <source>Terrain</source>
-      <translation type="unfinished">Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="218"/>
-      <source>Motors reversed</source>
-      <translation type="unfinished">Motors reversed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="219"/>
-      <source>Logging</source>
-      <translation type="unfinished">Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="220"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="221"/>
-      <source>Proximity</source>
-      <translation type="unfinished">Proximity</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="222"/>
-      <source>Satellite Communication</source>
-      <translation type="unfinished">Satellite Communication</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="223"/>
-      <source>Pre-Arm Check</source>
-      <translation type="unfinished">Pre-Arm Check</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="224"/>
-      <source>Avoidance/collision prevention</source>
-      <translation type="unfinished">Avoidance/collision prevention</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLink unknown SYS_STATUS_SENSOR value</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="236"/>
-      <source>Unknown sensor</source>
-      <translation type="unfinished">Unknown sensor</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkChart</name>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="91"/>
-      <source>Scale:</source>
-      <translation type="unfinished">Scale:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/MAVLinkChart.qml" line="104"/>
-      <source>Range:</source>
-      <translation type="unfinished">Range:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorController</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="738"/>
-      <source>5 Sec</source>
-      <translation type="unfinished">5 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="739"/>
-      <source>10 Sec</source>
-      <translation type="unfinished">10 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="740"/>
-      <source>30 Sec</source>
-      <translation type="unfinished">30 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="741"/>
-      <source>60 Sec</source>
-      <translation type="unfinished">60 Sec</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="743"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="744"/>
-      <source>10,000</source>
-      <translation type="unfinished">10,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="745"/>
-      <source>1,000</source>
-      <translation type="unfinished">1,000</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="746"/>
-      <source>100</source>
-      <translation type="unfinished">100</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="747"/>
-      <source>10</source>
-      <translation type="unfinished">10</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="748"/>
-      <source>1</source>
-      <translation type="unfinished">1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="749"/>
-      <source>0.1</source>
-      <translation type="unfinished">0.1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="750"/>
-      <source>0.01</source>
-      <translation type="unfinished">0.01</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="751"/>
-      <source>0.001</source>
-      <translation type="unfinished">0.001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="752"/>
-      <source>0.0001</source>
-      <translation type="unfinished">0.0001</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="846"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="859"/>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="874"/>
-      <source>System %1</source>
-      <translation type="unfinished">System %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkInspectorPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="45"/>
-      <source>Inspect real time MAVLink messages.</source>
-      <translation type="unfinished">Inspect real time MAVLink messages.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="142"/>
-      <source>Message:</source>
-      <translation type="unfinished">Message:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="150"/>
-      <source>Component:</source>
-      <translation type="unfinished">Component:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="156"/>
-      <source>Count:</source>
-      <translation type="unfinished">Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="171"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="174"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="177"/>
-      <source>Type</source>
-      <translation type="unfinished">Type</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="180"/>
-      <source>Plot 1</source>
-      <translation type="unfinished">Plot 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorPage.qml" line="183"/>
-      <source>Plot 2</source>
-      <translation type="unfinished">Plot 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>MAVLinkProtocol</name>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>MAVLink Protocol</source>
-      <translation type="unfinished">MAVLink Protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="179"/>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="297"/>
-      <source>MAVLink Logging failed. Could not write to file %1, logging disabled.</source>
-      <translation type="unfinished">MAVLink Logging failed. Could not write to file %1, logging disabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="346"/>
-      <source>Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</source>
-      <translation type="unfinished">Detected radio still using MAVLink v1.0 on a link with MAVLink v2.0 enabled. Please upgrade the radio firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="383"/>
-      <source>MAVLink protocol</source>
-      <translation type="unfinished">MAVLink protocol</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MAVLinkProtocol.cc" line="457"/>
-      <source>Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</source>
-      <translation type="unfinished">Opening Flight Data file for writing failed. Unable to write to %1. Please choose a different file location.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainRootWindow</name>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="270"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="287"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="306"/>
-      <source>%1 close</source>
-      <translation type="unfinished">%1 close</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="307"/>
-      <source>There are still active connections to vehicles. Are you sure you want to exit?</source>
-      <translation type="unfinished">There are still active connections to vehicles. Are you sure you want to exit?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="271"/>
-      <source>You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have a mission edit in progress which has not been saved/sent. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="156"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="385"/>
-      <source>Analyze Tools</source>
-      <translation type="unfinished">Analyze Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="160"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="370"/>
-      <source>Vehicle Setup</source>
-      <translation type="unfinished">Vehicle Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="164"/>
-      <location filename="../src/ui/MainRootWindow.qml" line="401"/>
-      <source>Application Settings</source>
-      <translation type="unfinished">Application Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="288"/>
-      <source>You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</source>
-      <translation type="unfinished">You have pending parameter updates to a vehicle. If you close you will lose changes. Are you sure you want to close?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="351"/>
-      <source>Select Tool</source>
-      <translation type="unfinished">Select Tool</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="419"/>
-      <source>%1 Version</source>
-      <translation type="unfinished">%1 Version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="452"/>
-      <source>Advanced Mode</source>
-      <translation type="unfinished">Advanced Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/MainRootWindow.qml" line="520"/>
-      <source>Back</source>
-      <translation type="unfinished">Back</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainStatusIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="35"/>
-      <source>Communication Lost</source>
-      <translation type="unfinished">Communication Lost</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="36"/>
-      <source>Ready To Fly</source>
-      <translation type="unfinished">Ready To Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="37"/>
-      <source>Not Ready</source>
-      <translation type="unfinished">Not Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="38"/>
-      <source>Disconnected</source>
-      <translation type="unfinished">Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="39"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="40"/>
-      <source>Flying</source>
-      <translation type="unfinished">Flying</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="41"/>
-      <source>Landing</source>
-      <translation type="unfinished">Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>FW(vtol)</source>
-      <translation type="unfinished">FW(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="136"/>
-      <source>MR(vtol)</source>
-      <translation type="unfinished">MR(vtol)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="196"/>
-      <source>Sensor Status</source>
-      <translation type="unfinished">Sensor Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Disarm</source>
-      <translation type="unfinished">Disarm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Force Arm</source>
-      <translation type="unfinished">Force Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="173"/>
-      <source>Arm</source>
-      <translation type="unfinished">Arm</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Multi-Rotor</source>
-      <translation type="unfinished">Transition to Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainStatusIndicator.qml" line="241"/>
-      <source>Transition to Fixed Wing</source>
-      <translation type="unfinished">Transition to Fixed Wing</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainToolBar</name>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="201"/>
-      <source>Downloading</source>
-      <translation type="unfinished">Downloading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="209"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/MainToolBar.qml" line="82"/>
-      <source>Disconnect</source>
-      <translation type="unfinished">Disconnect</translation>
-    </message>
-  </context>
-  <context>
-    <name>MapScale</name>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="46"/>
-      <source> km</source>
-      <translation type="unfinished"> km</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="48"/>
-      <source> m</source>
-      <translation type="unfinished"> m</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="59"/>
-      <source> mile</source>
-      <translation type="unfinished"> mile</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="61"/>
-      <source> miles</source>
-      <translation type="unfinished"> miles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="64"/>
-      <source> ft</source>
-      <translation type="unfinished"> ft</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="193"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="206"/>
-      <source>+</source>
-      <translation type="unfinished">+</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapScale.qml" line="219"/>
-      <source>-</source>
-      <translation type="unfinished">-</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkConsolePage</name>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="27"/>
-      <source>Provides a connection to the vehicle&apos;s system shell.</source>
-      <translation type="unfinished">Provides a connection to the vehicle&apos;s system shell.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="140"/>
-      <source>Copy</source>
-      <translation type="unfinished">Copy</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="146"/>
-      <source>Paste</source>
-      <translation type="unfinished">Paste</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MavlinkConsolePage.qml" line="290"/>
-      <source>Send</source>
-      <translation type="unfinished">Send</translation>
-    </message>
-  </context>
-  <context>
-    <name>MavlinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="82"/>
-      <source>MAVLink Logging</source>
-      <translation type="unfinished">MAVLink Logging</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">Please enter an email address before uploading MAVLink log files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="108"/>
-      <source>Ground Station</source>
-      <translation type="unfinished">Ground Station</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="127"/>
-      <source>MAVLink System ID:</source>
-      <translation type="unfinished">MAVLink System ID:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="142"/>
-      <source>Emit heartbeat</source>
-      <translation type="unfinished">Emit heartbeat</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="150"/>
-      <source>Only accept MAVs with same protocol version</source>
-      <translation type="unfinished">Only accept MAVs with same protocol version</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="159"/>
-      <source>Enable MAVLink forwarding</source>
-      <translation type="unfinished">Enable MAVLink forwarding</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="170"/>
-      <source>Host name:</source>
-      <translation type="unfinished">Host name:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="183"/>
-      <source>&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</source>
-      <translation type="unfinished">&lt;i&gt; Changing the host name requires restart of application. &lt;/i&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="199"/>
-      <source>Telemetry Stream Rates (ArduPilot Only)</source>
-      <translation type="unfinished">Telemetry Stream Rates (ArduPilot Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="219"/>
-      <source>All Streams Controlled By Vehicle Settings</source>
-      <translation type="unfinished">All Streams Controlled By Vehicle Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="228"/>
-      <source>Raw Sensors</source>
-      <translation type="unfinished">Raw Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="235"/>
-      <source>Extended Status</source>
-      <translation type="unfinished">Extended Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="242"/>
-      <source>RC Channel</source>
-      <translation type="unfinished">RC Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="249"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="256"/>
-      <source>Extra 1</source>
-      <translation type="unfinished">Extra 1</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="263"/>
-      <source>Extra 2</source>
-      <translation type="unfinished">Extra 2</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="270"/>
-      <source>Extra 3</source>
-      <translation type="unfinished">Extra 3</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="288"/>
-      <source>MAVLink Link Status (Current Vehicle)</source>
-      <translation type="unfinished">MAVLink Link Status (Current Vehicle)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="309"/>
-      <source>Total messages sent (computed):</source>
-      <translation type="unfinished">Total messages sent (computed):</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="314"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="329"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="344"/>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="359"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="324"/>
-      <source>Total messages received:</source>
-      <translation type="unfinished">Total messages received:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="339"/>
-      <source>Total message loss:</source>
-      <translation type="unfinished">Total message loss:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="354"/>
-      <source>Loss rate:</source>
-      <translation type="unfinished">Loss rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="375"/>
-      <source>MAVLink 2.0 Logging (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Logging (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="398"/>
-      <source>Manual Start/Stop:</source>
-      <translation type="unfinished">Manual Start/Stop:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="402"/>
-      <source>Start Logging</source>
-      <translation type="unfinished">Start Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="409"/>
-      <source>Stop Logging</source>
-      <translation type="unfinished">Stop Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="419"/>
-      <source>Enable automatic logging</source>
-      <translation type="unfinished">Enable automatic logging</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="438"/>
-      <source>MAVLink 2.0 Log Uploads (PX4 Pro Only)</source>
-      <translation type="unfinished">MAVLink 2.0 Log Uploads (PX4 Pro Only)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="460"/>
-      <source>Email address for Log Upload:</source>
-      <translation type="unfinished">Email address for Log Upload:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="481"/>
-      <source>Default Description:</source>
-      <translation type="unfinished">Default Description:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="501"/>
-      <source>Default Upload URL</source>
-      <translation type="unfinished">Default Upload URL</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="522"/>
-      <source>Video URL:</source>
-      <translation type="unfinished">Video URL:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="540"/>
-      <source>Wind Speed:</source>
-      <translation type="unfinished">Wind Speed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="578"/>
-      <source>Flight Rating:</source>
-      <translation type="unfinished">Flight Rating:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="616"/>
-      <source>Additional Feedback:</source>
-      <translation type="unfinished">Additional Feedback:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="635"/>
-      <source>Make this log publicly available</source>
-      <translation type="unfinished">Make this log publicly available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="646"/>
-      <source>Enable automatic log uploads</source>
-      <translation type="unfinished">Enable automatic log uploads</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="658"/>
-      <source>Delete log file after uploading</source>
-      <translation type="unfinished">Delete log file after uploading</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="677"/>
-      <source>Saved Log Files</source>
-      <translation type="unfinished">Saved Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="740"/>
-      <source>Uploaded</source>
-      <translation type="unfinished">Uploaded</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="763"/>
-      <source>Check All</source>
-      <translation type="unfinished">Check All</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="773"/>
-      <source>Check None</source>
-      <translation type="unfinished">Check None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="783"/>
-      <source>Delete Selected</source>
-      <translation type="unfinished">Delete Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="791"/>
-      <source>Delete Selected Log Files</source>
-      <translation type="unfinished">Delete Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="792"/>
-      <source>Confirm deleting selected log files?</source>
-      <translation type="unfinished">Confirm deleting selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="799"/>
-      <source>Upload Selected</source>
-      <translation type="unfinished">Upload Selected</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="814"/>
-      <source>Upload Selected Log Files</source>
-      <translation type="unfinished">Upload Selected Log Files</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="815"/>
-      <source>Confirm uploading selected log files?</source>
-      <translation type="unfinished">Confirm uploading selected log files?</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="822"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="831"/>
-      <source>Cancel Upload</source>
-      <translation type="unfinished">Cancel Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MavlinkSettings.qml" line="832"/>
-      <source>Confirm canceling the upload process?</source>
-      <translation type="unfinished">Confirm canceling the upload process?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MessageIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/MessageIndicator.qml" line="112"/>
-      <source>No Messages</source>
-      <translation type="unfinished">No Messages</translation>
-    </message>
-  </context>
-  <context>
-    <name>MicrohardSettings</name>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="63"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="80"/>
-      <source>Enable Microhard</source>
-      <translation type="unfinished">Enable Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="98"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="120"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="126"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="142"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="128"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="144"/>
-      <source>Login Error</source>
-      <translation type="unfinished">Login Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="130"/>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="137"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="152"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="158"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="176"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="198"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="209"/>
-      <source>Remote IP Address:</source>
-      <translation type="unfinished">Remote IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="219"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="229"/>
-      <source>Configuration User Name:</source>
-      <translation type="unfinished">Configuration User Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="238"/>
-      <source>Configuration Password:</source>
-      <translation type="unfinished">Configuration Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="248"/>
-      <source>Encryption key:</source>
-      <translation type="unfinished">Encryption key:</translation>
-    </message>
-    <message>
-      <location filename="../src/Microhard/MicrohardSettings.qml" line="282"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandDialog</name>
-    <message>
-      <location filename="../src/QmlControls/MissionCommandDialog.qml" line="32"/>
-      <source>Category:</source>
-      <translation type="unfinished">Category:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionCommandTree</name>
-    <message>
-      <location filename="../src/MissionManager/MissionCommandTree.cc" line="23"/>
-      <source>All commands</source>
-      <translation type="unfinished">All commands</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionController</name>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="788"/>
-      <source>Mission item %1 is not an object</source>
-      <translation type="unfinished">Mission item %1 is not an object</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="874"/>
-      <source>Unsupported complex item type: %1</source>
-      <translation type="unfinished">Unsupported complex item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="877"/>
-      <source>Unknown item type: %1</source>
-      <translation type="unfinished">Unknown item type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="900"/>
-      <source>Could not find doJumpId: %1</source>
-      <translation type="unfinished">Could not find doJumpId: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="973"/>
-      <source>The mission file is corrupted.</source>
-      <translation type="unfinished">The mission file is corrupted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="978"/>
-      <source>The mission file is not compatible with this version of %1.</source>
-      <translation type="unfinished">The mission file is not compatible with this version of %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionController.cc" line="1026"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1041"/>
-      <location filename="../src/MissionManager/MissionController.cc" line="1065"/>
-      <source>Mission: %1</source>
-      <translation type="unfinished">Mission: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="285"/>
-      <source>Type found: %1 must be: %2</source>
-      <translation type="unfinished">Type found: %1 must be: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="291"/>
-      <source>%1 key must contains 7 values</source>
-      <translation type="unfinished">%1 key must contains 7 values</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionItem.cc" line="297"/>
-      <source>Param %1 incorrect type %2, must be double or null</source>
-      <translation type="unfinished">Param %1 incorrect type %2, must be double or null</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="101"/>
-      <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="206"/>
-      <source>Move to vehicle position</source>
-      <translation type="unfinished">Move to vehicle position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="215"/>
-      <source>Move to previous item position</source>
-      <translation type="unfinished">Move to previous item position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="221"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="223"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="231"/>
-      <source>Show all values</source>
-      <translation type="unfinished">Show all values</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>Mission Edit</source>
-      <translation type="unfinished">Mission Edit</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="241"/>
-      <source>You have made changes to the mission item which cannot be shown in Simple Mode</source>
-      <translation type="unfinished">You have made changes to the mission item which cannot be shown in Simple Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="251"/>
-      <source>Item #%1</source>
-      <translation type="unfinished">Item #%1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionItemEditor.qml" line="155"/>
-      <source>Select Mission Command</source>
-      <translation type="unfinished">Select Mission Command</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionItemStatus</name>
-    <message>
-      <location filename="../src/PlanView/MissionItemStatus.qml" line="46"/>
-      <source>Terrain Altitude</source>
-      <translation type="unfinished">Terrain Altitude</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionManager</name>
-    <message>
-      <location filename="../src/MissionManager/MissionManager.cc" line="92"/>
-      <source>Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</source>
-      <translation type="unfinished">Unable to generate resume mission due to MAV_CMD_DO_JUMP command.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsEditor</name>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="42"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="43"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="119"/>
-      <source>Flight speed</source>
-      <translation type="unfinished">Flight speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="146"/>
-      <source>Above camera commands will take affect immediately upon mission start.</source>
-      <translation type="unfinished">Above camera commands will take affect immediately upon mission start.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="239"/>
-      <source>Launch Position</source>
-      <translation type="unfinished">Launch Position</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="275"/>
-      <source>Set To Map Center</source>
-      <translation type="unfinished">Set To Map Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="157"/>
-      <source>Vehicle Info</source>
-      <translation type="unfinished">Vehicle Info</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="68"/>
-      <source>All Altitudes</source>
-      <translation type="unfinished">All Altitudes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="103"/>
-      <source>Initial Waypoint Alt</source>
-      <translation type="unfinished">Initial Waypoint Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="208"/>
-      <source>The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</source>
-      <translation type="unfinished">The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="213"/>
-      <source>Cruise speed</source>
-      <translation type="unfinished">Cruise speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="224"/>
-      <source>Hover speed</source>
-      <translation type="unfinished">Hover speed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="258"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/MissionSettingsEditor.qml" line="270"/>
-      <source>Actual position set by vehicle at flight time.</source>
-      <translation type="unfinished">Actual position set by vehicle at flight time.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MissionSettingsItem</name>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/MissionSettingsItem.cc" line="292"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockConfiguration</name>
-    <message>
-      <location filename="../src/comm/MockLink.h" line="78"/>
-      <source>Mock Link Settings</source>
-      <translation type="unfinished">Mock Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLink</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="46"/>
-      <source>PX4 Vehicle</source>
-      <translation type="unfinished">PX4 Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="51"/>
-      <source>APM ArduCopter Vehicle</source>
-      <translation type="unfinished">APM ArduCopter Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="57"/>
-      <source>APM ArduPlane Vehicle</source>
-      <translation type="unfinished">APM ArduPlane Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="63"/>
-      <source>APM ArduSub Vehicle</source>
-      <translation type="unfinished">APM ArduSub Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="69"/>
-      <source>APM ArduRover Vehicle</source>
-      <translation type="unfinished">APM ArduRover Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="75"/>
-      <source>Generic Vehicle</source>
-      <translation type="unfinished">Generic Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="43"/>
-      <source>Send status text + voice</source>
-      <translation type="unfinished">Send status text + voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLink.qml" line="80"/>
-      <source>Stop One MockLink</source>
-      <translation type="unfinished">Stop One MockLink</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkOptionsDlg</name>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="23"/>
-      <source>MockLink Options</source>
-      <translation type="unfinished">MockLink Options</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="33"/>
-      <source>Stop Heartbeats</source>
-      <translation type="unfinished">Stop Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="42"/>
-      <source>Start Heartbeats</source>
-      <translation type="unfinished">Start Heartbeats</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/MockLinkOptionsDlg.qml" line="51"/>
-      <source>Connection Removed</source>
-      <translation type="unfinished">Connection Removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MockLinkSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="73"/>
-      <source>Send Status Text and Voice</source>
-      <translation type="unfinished">Send Status Text and Voice</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="80"/>
-      <source>Increment Vehicle Id</source>
-      <translation type="unfinished">Increment Vehicle Id</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="84"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>PX4 Pro</source>
-      <translation type="unfinished">PX4 Pro</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>ArduPilot</source>
-      <translation type="unfinished">ArduPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="88"/>
-      <source>Generic MAVLink</source>
-      <translation type="unfinished">Generic MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="94"/>
-      <source>Vehicle Type</source>
-      <translation type="unfinished">Vehicle Type</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduCopter</source>
-      <translation type="unfinished">ArduCopter</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/MockLinkSettings.qml" line="100"/>
-      <source>ArduPlane</source>
-      <translation type="unfinished">ArduPlane</translation>
-    </message>
-  </context>
-  <context>
-    <name>ModeSwitchDisplay</name>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="95"/>
-      <source>Monitor:</source>
-      <translation type="unfinished">Monitor:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ModeSwitchDisplay.qml" line="135"/>
-      <source>Threshold:</source>
-      <translation type="unfinished">Threshold:</translation>
-    </message>
-  </context>
-  <context>
-    <name>MotorComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="39"/>
-      <source>Warning: Unable to determine motor count</source>
-      <translation type="unfinished">Warning: Unable to determine motor count</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="96"/>
-      <source>All</source>
-      <translation type="unfinished">All</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="122"/>
-      <source>Moving the sliders will causes the motors to spin. Make sure you remove all props.</source>
-      <translation type="unfinished">Moving the sliders will causes the motors to spin. Make sure you remove all props.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Propellers are removed - Enable motor sliders</source>
-      <translation type="unfinished">Propellers are removed - Enable motor sliders</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.qml" line="142"/>
-      <source>Careful: Motor sliders are enabled</source>
-      <translation type="unfinished">Careful: Motor sliders are enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="14"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/MotorComponent.cc" line="26"/>
-      <source>Motors Setup is used to manually test motor control and direction.</source>
-      <translation type="unfinished">Motors Setup is used to manually test motor control and direction.</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiRotorChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="25"/>
-      <source>Multirotor Initial Checks</source>
-      <translation type="unfinished">Multirotor Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="29"/>
-      <source>Props mounted and secured?</source>
-      <translation type="unfinished">Props mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="53"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="54"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="58"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="59"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="67"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="71"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="72"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="76"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="77"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="81"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiRotorChecklist.qml" line="82"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleList</name>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="54"/>
-      <source>The following commands will be applied to all vehicles</source>
-      <translation type="unfinished">The following commands will be applied to all vehicles</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Armed</source>
-      <translation type="unfinished">Armed</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/MultiVehicleList.qml" line="130"/>
-      <source>Disarmed</source>
-      <translation type="unfinished">Disarmed</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleManager</name>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="121"/>
-      <source>Warning: A vehicle is using the same system id as %1: %2</source>
-      <translation type="unfinished">Warning: A vehicle is using the same system id as %1: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/MultiVehicleManager.cc" line="139"/>
-      <source>Connected to Vehicle %1</source>
-      <translation type="unfinished">Connected to Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MultiVehicleSelector</name>
-    <message>
-      <location filename="../src/ui/toolbar/MultiVehicleSelector.qml" line="49"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineMap</name>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="241"/>
-      <source>Error Message</source>
-      <translation type="unfinished">Error Message</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="271"/>
-      <source>Max Cache Disk Size (MB):</source>
-      <translation type="unfinished">Max Cache Disk Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="287"/>
-      <source>Max Cache Memory Size (MB):</source>
-      <translation type="unfinished">Max Cache Memory Size (MB):</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="303"/>
-      <source>Memory cache changes require a restart to take effect.</source>
-      <translation type="unfinished">Memory cache changes require a restart to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="307"/>
-      <source>Mapbox Access Token</source>
-      <translation type="unfinished">Mapbox Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="318"/>
-      <source>To enable Mapbox maps, enter your access token.</source>
-      <translation type="unfinished">To enable Mapbox maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="324"/>
-      <source>Mapbox User Name</source>
-      <translation type="unfinished">Mapbox User Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="335"/>
-      <source>To enable custom Mapbox styles, enter your account name.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your account name.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="341"/>
-      <source>Mapbox Style ID</source>
-      <translation type="unfinished">Mapbox Style ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="352"/>
-      <source>To enable custom Mapbox styles, enter your style ID.</source>
-      <translation type="unfinished">To enable custom Mapbox styles, enter your style ID.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="358"/>
-      <source>Esri Access Token</source>
-      <translation type="unfinished">Esri Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="369"/>
-      <source>To enable Esri maps, enter your access token.</source>
-      <translation type="unfinished">To enable Esri maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="375"/>
-      <source>VWorld Access Token</source>
-      <translation type="unfinished">VWorld Access Token</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="386"/>
-      <source>To enable VWorld maps, enter your access token.</source>
-      <translation type="unfinished">To enable VWorld maps, enter your access token.</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="392"/>
-      <source>Custom Map URL</source>
-      <translation type="unfinished">Custom Map URL</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="403"/>
-      <source>URL with {x} {y} {z} or {zoom} substitutions</source>
-      <translation type="unfinished">URL with {x} {y} {z} or {zoom} substitutions</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="418"/>
-      <source>This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</source>
-      <translation type="unfinished">This will delete all tiles INCLUDING the tile sets you have created yourself.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="420"/>
-      <source>Delete %1 and all its tiles.
-
-Is this really what you want?</source>
-      <translation type="unfinished">Delete %1 and all its tiles.
-
-Is this really what you want?</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="525"/>
-      <source>System Wide Tile Cache</source>
-      <translation type="unfinished">System Wide Tile Cache</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="538"/>
-      <source>Zoom Levels:</source>
-      <translation type="unfinished">Zoom Levels:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="545"/>
-      <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="552"/>
-      <source>Unique:</source>
-      <translation type="unfinished">Unique:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="560"/>
-      <source>Downloaded:</source>
-      <translation type="unfinished">Downloaded:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="567"/>
-      <source>Error Count:</source>
-      <translation type="unfinished">Error Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="575"/>
-      <source>Size:</source>
-      <translation type="unfinished">Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="582"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="957"/>
-      <source>Tile Count:</source>
-      <translation type="unfinished">Tile Count:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="589"/>
-      <source>Resume Download</source>
-      <translation type="unfinished">Resume Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="598"/>
-      <source>Cancel Download</source>
-      <translation type="unfinished">Cancel Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="607"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="609"/>
-      <source>Confirm Delete</source>
-      <translation type="unfinished">Confirm Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="612"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1209"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1289"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="625"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1002"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1159"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1313"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="686"/>
-      <source>Min Zoom: %1</source>
-      <translation type="unfinished">Min Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="726"/>
-      <source>Max Zoom: %1</source>
-      <translation type="unfinished">Max Zoom: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="772"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1034"/>
-      <source>Add New Set</source>
-      <translation type="unfinished">Add New Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="800"/>
-      <source>Name:</source>
-      <translation type="unfinished">Name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="813"/>
-      <source>Map type:</source>
-      <translation type="unfinished">Map type:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="836"/>
-      <source>Fetch elevation data</source>
-      <translation type="unfinished">Fetch elevation data</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="862"/>
-      <source>Min/Max Zoom Levels</source>
-      <translation type="unfinished">Min/Max Zoom Levels</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="966"/>
-      <source>Est Size:</source>
-      <translation type="unfinished">Est Size:</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="978"/>
-      <source>Too many tiles</source>
-      <translation type="unfinished">Too many tiles</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="989"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1072"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1303"/>
-      <source>Import</source>
-      <translation type="unfinished">Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1081"/>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1149"/>
-      <source>Export</source>
-      <translation type="unfinished">Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1087"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1089"/>
-      <source>Offline Maps Options</source>
-      <translation type="unfinished">Offline Maps Options</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1110"/>
-      <source>Select Tile Sets to Export</source>
-      <translation type="unfinished">Select Tile Sets to Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1139"/>
-      <source>Select All</source>
-      <translation type="unfinished">Select All</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1144"/>
-      <source>Select None</source>
-      <translation type="unfinished">Select None</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1153"/>
-      <source>Export Tile Set</source>
-      <translation type="unfinished">Export Tile Set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Progress</source>
-      <translation type="unfinished">Tile Set Export Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1188"/>
-      <source>Tile Set Export Completed</source>
-      <translation type="unfinished">Tile Set Export Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1244"/>
-      <source>Map Tile Set Import</source>
-      <translation type="unfinished">Map Tile Set Import</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1246"/>
-      <source>Map Tile Set Import Progress</source>
-      <translation type="unfinished">Map Tile Set Import Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1248"/>
-      <source>Map Tile Set Import Completed</source>
-      <translation type="unfinished">Map Tile Set Import Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1276"/>
-      <source>Append to existing set</source>
-      <translation type="unfinished">Append to existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1282"/>
-      <source>Replace existing set</source>
-      <translation type="unfinished">Replace existing set</translation>
-    </message>
-    <message>
-      <location filename="../src/QtLocationPlugin/QMLControl/OfflineMap.qml" line="1307"/>
-      <source>Import Tile Set</source>
-      <translation type="unfinished">Import Tile Set</translation>
-    </message>
-  </context>
-  <context>
-    <name>OfflineVehicleFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="21"/>
-      <source>Vehicle Information</source>
-      <translation type="unfinished">Vehicle Information</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="36"/>
-      <source>Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</source>
-      <translation type="unfinished">Specify information about the vehicle you plan to fly. If you are unsure of the correct values leave them as is.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="56"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml" line="68"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>PIDTuning</name>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune enabled</source>
-      <translation type="unfinished">Autotune enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="200"/>
-      <source>Autotune disabled</source>
-      <translation type="unfinished">Autotune disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="227"/>
-      <source>Select Tuning:</source>
-      <translation type="unfinished">Select Tuning:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="253"/>
-      <source>Clipboard Values:</source>
-      <translation type="unfinished">Clipboard Values:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="279"/>
-      <source>Save To Clipboard</source>
-      <translation type="unfinished">Save To Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="284"/>
-      <source>Restore From Clipboard</source>
-      <translation type="unfinished">Restore From Clipboard</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="343"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Stop</source>
-      <translation type="unfinished">Stop</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="348"/>
-      <source>Start</source>
-      <translation type="unfinished">Start</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="371"/>
-      <source>Automatic Flight Mode Switching</source>
-      <translation type="unfinished">Automatic Flight Mode Switching</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="381"/>
-      <source>Switches to &apos;Stabilized&apos; when you click Start.</source>
-      <translation type="unfinished">Switches to &apos;Stabilized&apos; when you click Start.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PIDTuning.qml" line="386"/>
-      <source>Switches to &apos;%1&apos; when you click Stop.</source>
-      <translation type="unfinished">Switches to &apos;%1&apos; when you click Stop.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="32"/>
-      <source>FLIGHT MODES</source>
-      <translation type="unfinished">FLIGHT MODES</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="35"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="36"/>
-      <source>Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </source>
-      <translation type="unfinished">Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="37"/>
-      <source>You can assign multiple flight modes to a single channel. </source>
-      <translation type="unfinished">You can assign multiple flight modes to a single channel. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="38"/>
-      <source>Turn your radio control on to test switch settings. </source>
-      <translation type="unfinished">Turn your radio control on to test switch settings. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="39"/>
-      <source>The following channels: </source>
-      <translation type="unfinished">The following channels: </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="40"/>
-      <source> are not available for Flight Modes since they are already in use for other functions.</source>
-      <translation type="unfinished"> are not available for Flight Modes since they are already in use for other functions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="42"/>
-      <source>Manual/Main</source>
-      <translation type="unfinished">Manual/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="43"/>
-      <source>Stabilized/Main</source>
-      <translation type="unfinished">Stabilized/Main</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="44"/>
-      <source>The pilot has full control of the aircraft, no assistance is provided. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, no assistance is provided. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="47"/>
-      <source>The Main mode switch must always be assigned to a channel in order to fly</source>
-      <translation type="unfinished">The Main mode switch must always be assigned to a channel in order to fly</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="46"/>
-      <source>The pilot has full control of the aircraft, only attitude is stabilized. </source>
-      <translation type="unfinished">The pilot has full control of the aircraft, only attitude is stabilized. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="49"/>
-      <source>Assist</source>
-      <translation type="unfinished">Assist</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="50"/>
-      <source>If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Position Control is placed on a separate channel from the Main mode channel, an additional &apos;Assist&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="51"/>
-      <source>In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</source>
-      <translation type="unfinished">In order for the Attitude Control/Position Control switch to be active, the Main switch must be in Assist mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="53"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="54"/>
-      <source>If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </source>
-      <translation type="unfinished">If Loiter is placed on a separate channel from the Main mode channel, an additional &apos;Auto&apos; mode is added to the Main switch. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="55"/>
-      <source>In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</source>
-      <translation type="unfinished">In order for the Mission/Loiter switch to be active, the Main switch must be in Auto mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="57"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="58"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="59"/>
-      <source>Roll/pitch angles and rudder deflection are controlled. </source>
-      <translation type="unfinished">Roll/pitch angles and rudder deflection are controlled. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="60"/>
-      <source>The angular rates are controlled, but not the attitude. </source>
-      <translation type="unfinished">The angular rates are controlled, but not the attitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="62"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="63"/>
-      <source>Roll stick controls banking, pitch stick altitude </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick altitude </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="64"/>
-      <source>Throttle stick controls speed. </source>
-      <translation type="unfinished">Throttle stick controls speed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="65"/>
-      <source>With no stick inputs the plane holds heading, but drifts off in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane holds heading, but drifts off in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="66"/>
-      <source>Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </source>
-      <translation type="unfinished">Same as Stablized mode except that Throttle controls climb/sink rate. Centered Throttle holds altitude steady. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="68"/>
-      <source>Position Control</source>
-      <translation type="unfinished">Position Control</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="69"/>
-      <source>Roll stick controls banking, pitch stick controls altitude. </source>
-      <translation type="unfinished">Roll stick controls banking, pitch stick controls altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="70"/>
-      <source>Throttle stick controls speed.</source>
-      <translation type="unfinished">Throttle stick controls speed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="71"/>
-      <source>With no stick inputs the plane flies a straight line, even in wind. </source>
-      <translation type="unfinished">With no stick inputs the plane flies a straight line, even in wind. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="72"/>
-      <source>Roll and Pitch sticks control sideways and forward speed </source>
-      <translation type="unfinished">Roll and Pitch sticks control sideways and forward speed </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="73"/>
-      <source>Throttle stick controls climb / sink rade. </source>
-      <translation type="unfinished">Throttle stick controls climb / sink rade. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="75"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="76"/>
-      <source>The aircraft obeys the programmed mission sent by QGroundControl. </source>
-      <translation type="unfinished">The aircraft obeys the programmed mission sent by QGroundControl. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="78"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="79"/>
-      <source>The aircraft flies in a circle around the current position at the current altitude. </source>
-      <translation type="unfinished">The aircraft flies in a circle around the current position at the current altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="80"/>
-      <source>The multirotor hovers at the current position and altitude. </source>
-      <translation type="unfinished">The multirotor hovers at the current position and altitude. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="82"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <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 launch position, loiters and then lands. </source>
-      <translation type="unfinished">The vehicle returns to the launch position, loiters and then lands. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="85"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="86"/>
-      <source>All flight control aspects are controlled by an offboard system.</source>
-      <translation type="unfinished">All flight control aspects are controlled by an offboard system.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="159"/>
-      <source>Flight Mode Config is disabled since you have a Joystick enabled.</source>
-      <translation type="unfinished">Flight Mode Config is disabled since you have a Joystick enabled.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="194"/>
-      <source>Use Single Channel Mode Selection</source>
-      <translation type="unfinished">Use Single Channel Mode Selection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModes.qml" line="204"/>
-      <source>Generate Thresholds</source>
-      <translation type="unfinished">Generate Thresholds</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AdvancedFlightModesController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="151"/>
-      <source>%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Mapping must between 0 and %3 (inclusive).
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="167"/>
-      <source>%1 is set to same channel as %2.
-</source>
-      <translation type="unfinished">%1 is set to same channel as %2.
-</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AdvancedFlightModesController.cc" line="177"/>
-      <source>%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</source>
-      <translation type="unfinished">%1 is set to %2. Threshold must between 0.0 and 1.0 (inclusive).
-</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4AutoPilotPlugin</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc" line="144"/>
-      <source>Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</source>
-      <translation type="unfinished">Warning: Hardware In The Loop (HITL) simulation is enabled for this vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwarePlugin</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="37"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="38"/>
-      <source>Acro</source>
-      <translation type="unfinished">Acro</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="39"/>
-      <source>Stabilized</source>
-      <translation type="unfinished">Stabilized</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="40"/>
-      <source>Rattitude</source>
-      <translation type="unfinished">Rattitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="41"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="42"/>
-      <source>Position</source>
-      <translation type="unfinished">Position</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="43"/>
-      <source>Offboard</source>
-      <translation type="unfinished">Offboard</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="44"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="45"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="46"/>
-      <source>Hold</source>
-      <translation type="unfinished">Hold</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="47"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="48"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="49"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="50"/>
-      <source>Precision Land</source>
-      <translation type="unfinished">Precision Land</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="51"/>
-      <source>Return to Groundstation</source>
-      <translation type="unfinished">Return to Groundstation</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="52"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="53"/>
-      <source>Simple</source>
-      <translation type="unfinished">Simple</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="54"/>
-      <source>Orbit</source>
-      <translation type="unfinished">Orbit</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="187"/>
-      <source>Unknown %1:%2</source>
-      <translation type="unfinished">Unknown %1:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="396"/>
-      <source>Unable to takeoff, vehicle position not known.</source>
-      <translation type="unfinished">Unable to takeoff, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="416"/>
-      <source>Unable to go to location, vehicle position not known.</source>
-      <translation type="unfinished">Unable to go to location, vehicle position not known.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="489"/>
-      <source>Unable to pause vehicle.</source>
-      <translation type="unfinished">Unable to pause vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="498"/>
-      <source>Unable to change altitude, home position unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="502"/>
-      <source>Unable to change altitude, home position altitude unknown.</source>
-      <translation type="unfinished">Unable to change altitude, home position altitude unknown.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="533"/>
-      <source>Unable to start mission: Vehicle rejected arming.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle rejected arming.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="537"/>
-      <source>Unable to start mission: Vehicle not changing to %1 flight mode.</source>
-      <translation type="unfinished">Unable to start mission: Vehicle not changing to %1 flight mode.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc" line="609"/>
-      <source>QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</source>
-      <translation type="unfinished">QGroundControl supports PX4 Pro firmware Version %1.%2.%3 and above. You are using a version prior to that which will lead to unpredictable results. Please upgrade your firmware.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FirmwareUpgradeThreadWorker</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="153"/>
-      <source>Programming new version...</source>
-      <translation type="unfinished">Programming new version...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="163"/>
-      <source>Verifying program...</source>
-      <translation type="unfinished">Verifying program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="167"/>
-      <source>Verify complete</source>
-      <translation type="unfinished">Verify complete</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="174"/>
-      <source>Rebooting board</source>
-      <translation type="unfinished">Rebooting board</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="198"/>
-      <source>Erasing previous program...</source>
-      <translation type="unfinished">Erasing previous program...</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FirmwareUpgradeThread.cc" line="202"/>
-      <source>Erase complete</source>
-      <translation type="unfinished">Erase complete</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehavior</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="17"/>
-      <source>Flight Behavior</source>
-      <translation type="unfinished">Flight Behavior</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehavior.cc" line="28"/>
-      <source>Flight Behavior is used to configure flight characteristics.</source>
-      <translation type="unfinished">Flight Behavior is used to configure flight characteristics.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlightBehaviorCopter</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="49"/>
-      <source>Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</source>
-      <translation type="unfinished">Enable responsiveness slider (if enabled, acceleration limit parameters and others are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="68"/>
-      <source>Responsiveness</source>
-      <translation type="unfinished">Responsiveness</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="69"/>
-      <source>A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</source>
-      <translation type="unfinished">A higher value makes the vehicle react faster. Be aware that this affects braking as well, and a combination of slow responsiveness with high maximum velocity will lead to long braking distances.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="89"/>
-      <source>Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable horizontal velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="108"/>
-      <source>Horizontal velocity (m/s)</source>
-      <translation type="unfinished">Horizontal velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="109"/>
-      <source>Limit the horizonal velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the horizonal velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="124"/>
-      <source>Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</source>
-      <translation type="unfinished">Enable vertical velocity slider (if enabled, individual velocity limit parameters are automatically set)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="143"/>
-      <source>Vertial velocity (m/s)</source>
-      <translation type="unfinished">Vertial velocity (m/s)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="144"/>
-      <source>Limit the vertical velocity (applies to all modes).</source>
-      <translation type="unfinished">Limit the vertical velocity (applies to all modes).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="159"/>
-      <source>Mission Turning Radius</source>
-      <translation type="unfinished">Mission Turning Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml" line="160"/>
-      <source>Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</source>
-      <translation type="unfinished">Increasing this leads to rounder turns in missions (corner cutting). Use the minimum value for accurate corner tracking.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4FlowSensor</name>
-    <message>
-      <location filename="../src/VehicleSetup/PX4FlowSensor.qml" line="23"/>
-      <source>PX4Flow Camera</source>
-      <translation type="unfinished">PX4Flow Camera</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4ParameterMetaData</name>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="340"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/PX4/PX4ParameterMetaData.cc" line="342"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="16"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponent.cc" line="27"/>
-      <source>Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</source>
-      <translation type="unfinished">Radio Setup is used to calibrate your transmitter. It also assign channels for Roll, Pitch, Yaw and Throttle vehicle control as well as determining whether they are reversed.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4RadioComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="26"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="27"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="42"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="31"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="36"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="41"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="46"/>
-      <source>Flaps</source>
-      <translation type="unfinished">Flaps</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="58"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="52"/>
-      <source>Aux1</source>
-      <translation type="unfinished">Aux1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml" line="57"/>
-      <source>Aux2</source>
-      <translation type="unfinished">Aux2</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4SimpleFlightModes</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="67"/>
-      <source>Flight Mode Settings</source>
-      <translation type="unfinished">Flight Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="89"/>
-      <source>Mode Channel</source>
-      <translation type="unfinished">Mode Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="97"/>
-      <source>Flight Mode %1</source>
-      <translation type="unfinished">Flight Mode %1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml" line="128"/>
-      <source>Switch Settings</source>
-      <translation type="unfinished">Switch Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="17"/>
-      <source>PID Tuning</source>
-      <translation type="unfinished">PID Tuning</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponent.cc" line="28"/>
-      <source>Tuning Setup is used to tune the flight controllers.</source>
-      <translation type="unfinished">Tuning Setup is used to tune the flight controllers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="31"/>
-      <source>Rate Controller</source>
-      <translation type="unfinished">Rate Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="34"/>
-      <source>Attitude Controller</source>
-      <translation type="unfinished">Attitude Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="37"/>
-      <source>Velocity Controller</source>
-      <translation type="unfinished">Velocity Controller</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml" line="40"/>
-      <source>Position Controller</source>
-      <translation type="unfinished">Position Controller</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterAttitude</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="29"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="36"/>
-      <source>Proportional Gain (MC_ROLL_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_ROLL_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="54"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots.</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="46"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="53"/>
-      <source>Proportional Gain (MC_PITCH_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_PITCH_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="63"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="70"/>
-      <source>Proportional Gain (MC_YAW_P)</source>
-      <translation type="unfinished">Proportional Gain (MC_YAW_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml" line="71"/>
-      <source>Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the attitude overshoots (there is only a setpoint when yaw is fixed, i.e. when centering the stick).</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterPosition</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_P)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="69"/>
-      <source>Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the position overshoots (there is only a setpoint when hovering, i.e. when centering the stick).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="61"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml" line="68"/>
-      <source>Proportional gain (MPC_Z_P)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_P)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterRate</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="32"/>
-      <source>Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Airmode (disable during tuning) &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#airmode-mixer-saturation&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="44"/>
-      <source>Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</source>
-      <translation type="unfinished">Thrust curve &lt;b&gt;&lt;a href=&quot;https://docs.px4.io/master/en/config_mc/pid_tuning_guide_multicopter.html#thrust-curve&quot;&gt;?&lt;/a&gt;&lt;/b&gt;:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="57"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="64"/>
-      <source>Overall Multiplier (MC_ROLLRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_ROLLRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="65"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="98"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="131"/>
-      <source>Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</source>
-      <translation type="unfinished">Multiplier for P, I and D gains: increase for more responsiveness, reduce if the rates overshoot (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="72"/>
-      <source>Differential Gain (MC_ROLLRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_ROLLRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="73"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="106"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="80"/>
-      <source>Integral Gain (MC_ROLLRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_ROLLRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="81"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="114"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="139"/>
-      <source>Generally does not need much adjustment, reduce this when seeing slow oscillations.</source>
-      <translation type="unfinished">Generally does not need much adjustment, reduce this when seeing slow oscillations.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="90"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="97"/>
-      <source>Overall Multiplier (MC_PITCHRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_PITCHRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="105"/>
-      <source>Differential Gain (MC_PITCHRATE_D)</source>
-      <translation type="unfinished">Differential Gain (MC_PITCHRATE_D)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="113"/>
-      <source>Integral Gain (MC_PITCHRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_PITCHRATE_I)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="123"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="130"/>
-      <source>Overall Multiplier (MC_YAWRATE_K)</source>
-      <translation type="unfinished">Overall Multiplier (MC_YAWRATE_K)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml" line="138"/>
-      <source>Integral Gain (MC_YAWRATE_I)</source>
-      <translation type="unfinished">Integral Gain (MC_YAWRATE_I)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentCopterVelocity</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="30"/>
-      <source>Position control mode (set this to &apos;simple&apos; during tuning):</source>
-      <translation type="unfinished">Position control mode (set this to &apos;simple&apos; during tuning):</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="43"/>
-      <source>Horizontal</source>
-      <translation type="unfinished">Horizontal</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="44"/>
-      <source>Horizontal (Y direction, sidewards)</source>
-      <translation type="unfinished">Horizontal (Y direction, sidewards)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="51"/>
-      <source>Proportional gain (MPC_XY_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_XY_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="85"/>
-      <source>Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</source>
-      <translation type="unfinished">Increase for more responsiveness, reduce if the velocity overshoots (and increasing D does not help).</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="59"/>
-      <source>Integral gain (MPC_XY_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_XY_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="60"/>
-      <source>Increase to reduce steady-state error (e.g. wind)</source>
-      <translation type="unfinished">Increase to reduce steady-state error (e.g. wind)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="67"/>
-      <source>Differential gain (MPC_XY_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_XY_VEL_D_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="68"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="101"/>
-      <source>Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</source>
-      <translation type="unfinished">Damping: increase to reduce overshoots and oscillations, but not higher than really needed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="77"/>
-      <source>Vertical</source>
-      <translation type="unfinished">Vertical</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="84"/>
-      <source>Proportional gain (MPC_Z_VEL_P_ACC)</source>
-      <translation type="unfinished">Proportional gain (MPC_Z_VEL_P_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="92"/>
-      <source>Integral gain (MPC_Z_VEL_I_ACC)</source>
-      <translation type="unfinished">Integral gain (MPC_Z_VEL_I_ACC)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="93"/>
-      <source>Increase to reduce steady-state error</source>
-      <translation type="unfinished">Increase to reduce steady-state error</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml" line="100"/>
-      <source>Differential gain (MPC_Z_VEL_D_ACC)</source>
-      <translation type="unfinished">Differential gain (MPC_Z_VEL_D_ACC)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneAll</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml" line="31"/>
-      <source>TECS</source>
-      <translation type="unfinished">TECS</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentPlaneTECS</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="28"/>
-      <source>Altitude &amp; Airspeed</source>
-      <translation type="unfinished">Altitude &amp; Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="37"/>
-      <source>Height rate feed forward (FW_T_HRATE_FF)</source>
-      <translation type="unfinished">Height rate feed forward (FW_T_HRATE_FF)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml" line="38"/>
-      <source>TODO</source>
-      <translation type="unfinished">TODO</translation>
-    </message>
-  </context>
-  <context>
-    <name>PX4TuningComponentVTOL</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml" line="39"/>
-      <source>Multirotor</source>
-      <translation type="unfinished">Multirotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingManager</name>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="80"/>
-      <source>Pairing Successfull</source>
-      <translation type="unfinished">Pairing Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="90"/>
-      <source>Connection Successfull</source>
-      <translation type="unfinished">Connection Successfull</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="151"/>
-      <source>Connection Rejected</source>
-      <translation type="unfinished">Connection Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="154"/>
-      <source>Pairing Rejected</source>
-      <translation type="unfinished">Pairing Rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="162"/>
-      <source>No Response From Vehicle</source>
-      <translation type="unfinished">No Response From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="191"/>
-      <source>Connecting to %1</source>
-      <translation type="unfinished">Connecting to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="252"/>
-      <source>Invalid Pairing File</source>
-      <translation type="unfinished">Invalid Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="257"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="265"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="278"/>
-      <source>Error Parsing Pairing File</source>
-      <translation type="unfinished">Error Parsing Pairing File</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="461"/>
-      <source>NFC</source>
-      <translation type="unfinished">NFC</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="465"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/PairingManager.cc" line="495"/>
-      <location filename="../src/PairingManager/PairingManager.cc" line="517"/>
-      <source>Pairing...</source>
-      <translation type="unfinished">Pairing...</translation>
-    </message>
-  </context>
-  <context>
-    <name>PairingNFC</name>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="30"/>
-      <source>Waiting for NFC connection</source>
-      <translation type="unfinished">Waiting for NFC connection</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="78"/>
-      <source>Device detected</source>
-      <translation type="unfinished">Device detected</translation>
-    </message>
-    <message>
-      <location filename="../src/PairingManager/QtNFC.cc" line="114"/>
-      <source>Device removed</source>
-      <translation type="unfinished">Device removed</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterDiffDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="23"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="42"/>
-      <source>The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</source>
-      <translation type="unfinished">The following parameters from the loaded file differ from what is currently set on the Vehicle. Click &apos;Ok&apos; to update them on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="43"/>
-      <source>There are no differences between the file loaded and the current settings on the Vehicle.</source>
-      <translation type="unfinished">There are no differences between the file loaded and the current settings on the Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="71"/>
-      <source>Comp ID</source>
-      <translation type="unfinished">Comp ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="78"/>
-      <source>Name</source>
-      <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="84"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="90"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterDiffDialog.qml" line="93"/>
-      <source>N/A</source>
-      <translation type="unfinished">N/A</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditor</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="63"/>
-      <source>Search:</source>
-      <translation type="unfinished">Search:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="74"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="85"/>
-      <source>Show modified only</source>
-      <translation type="unfinished">Show modified only</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="97"/>
-      <source>Tools</source>
-      <translation type="unfinished">Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="105"/>
-      <source>Refresh</source>
-      <translation type="unfinished">Refresh</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="109"/>
-      <source>Reset all to firmware&apos;s defaults</source>
-      <translation type="unfinished">Reset all to firmware&apos;s defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="110"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="115"/>
-      <source>Reset All</source>
-      <translation type="unfinished">Reset All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="113"/>
-      <source>Reset to vehicle&apos;s configuration defaults</source>
-      <translation type="unfinished">Reset to vehicle&apos;s configuration defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="119"/>
-      <source>Load from file...</source>
-      <translation type="unfinished">Load from file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="121"/>
-      <source>Load Parameters</source>
-      <translation type="unfinished">Load Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="127"/>
-      <source>Save to file...</source>
-      <translation type="unfinished">Save to file...</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="129"/>
-      <source>Save Parameters</source>
-      <translation type="unfinished">Save Parameters</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="136"/>
-      <source>Clear all RC to Param</source>
-      <translation type="unfinished">Clear all RC to Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="318"/>
-      <source>Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to their defaults.
-
-Note that this will also completely reset everything, including UAVCAN nodes, all vehicle settings, setup and calibrations.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="142"/>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="143"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="275"/>
-      <source>Parameter Editor</source>
-      <translation type="unfinished">Parameter Editor</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="284"/>
-      <source>Parameter Files (*.%1)</source>
-      <translation type="unfinished">Parameter Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="333"/>
-      <source>Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</source>
-      <translation type="unfinished">Select Reset to reset all parameters to the vehicle&apos;s configuration defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditor.qml" line="350"/>
-      <source>Select Ok to reboot vehicle.</source>
-      <translation type="unfinished">Select Ok to reboot vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorController</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="217"/>
-      <source>Unable to create file: %1</source>
-      <translation type="unfinished">Unable to create file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorController.cc" line="258"/>
-      <source>Unable to open file: %1</source>
-      <translation type="unfinished">Unable to open file: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterEditorDialog</name>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="135"/>
-      <source>Reset to default</source>
-      <translation type="unfinished">Reset to default</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="209"/>
-      <source>Min: </source>
-      <translation type="unfinished">Min: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="214"/>
-      <source>Max: </source>
-      <translation type="unfinished">Max: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="219"/>
-      <source>Default: </source>
-      <translation type="unfinished">Default: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="225"/>
-      <source>Parameter name: </source>
-      <translation type="unfinished">Parameter name: </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="242"/>
-      <source>Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </source>
-      <translation type="unfinished">Warning: Modifying values while vehicle is in flight can lead to vehicle instability and possible vehicle loss. </translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="243"/>
-      <source>Make sure you know what you are doing and double-check your values before Save!</source>
-      <translation type="unfinished">Make sure you know what you are doing and double-check your values before Save!</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="250"/>
-      <source>Force save (dangerous!)</source>
-      <translation type="unfinished">Force save (dangerous!)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="267"/>
-      <source>Advanced settings</source>
-      <translation type="unfinished">Advanced settings</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="282"/>
-      <source>Manual Entry</source>
-      <translation type="unfinished">Manual Entry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/ParameterEditorDialog.qml" line="290"/>
-      <source>Set RC to Param</source>
-      <translation type="unfinished">Set RC to Param</translation>
-    </message>
-  </context>
-  <context>
-    <name>ParameterManager</name>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="678"/>
-      <source>Parameter write failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter write failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="700"/>
-      <source>Parameter read failed: veh:%1 comp:%2 param:%3</source>
-      <translation type="unfinished">Parameter read failed: veh:%1 comp:%2 param:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="926"/>
-      <source>Parameter cache CRC match failed</source>
-      <translation type="unfinished">Parameter cache CRC match failed</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="977"/>
-      <source>Parameters not loaded since they are not currently on the vehicle: %1
-</source>
-      <translation type="unfinished">Parameters not loaded since they are not currently on the vehicle: %1
-</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="981"/>
-      <source>Parameters not loaded due to type mismatch: %1</source>
-      <translation type="unfinished">Parameters not loaded due to type mismatch: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1149"/>
-      <source>%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</source>
-      <translation type="unfinished">%1 was unable to retrieve the full set of parameters from vehicle %2. This will cause %1 to be unable to display its full user interface. If you are using modified firmware, you may need to resolve any vehicle startup errors to resolve the issue. If you are using standard firmware, you may need to upgrade to a newer version to resolve the issue.</translation>
-    </message>
-    <message>
-      <location filename="../src/FactSystem/ParameterManager.cc" line="1175"/>
-      <source>Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</source>
-      <translation type="unfinished">Vehicle %1 did not respond to request for parameters. This will cause %2 to be unable to display its full user interface.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PhotoVideoControl</name>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="239"/>
-      <source>Video Grab</source>
-      <translation type="unfinished">Video Grab</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="243"/>
-      <source>Camera Trigger</source>
-      <translation type="unfinished">Camera Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="299"/>
-      <source>Free Space: </source>
-      <translation type="unfinished">Free Space: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="305"/>
-      <source>Battery: </source>
-      <translation type="unfinished">Battery: </translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="316"/>
-      <source>Settings</source>
-      <translation type="unfinished">Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="331"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="337"/>
-      <source>Video Stream</source>
-      <translation type="unfinished">Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="343"/>
-      <source>Thermal View Mode</source>
-      <translation type="unfinished">Thermal View Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="349"/>
-      <source>Blend Opacity</source>
-      <translation type="unfinished">Blend Opacity</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="364"/>
-      <source>Photo Mode</source>
-      <translation type="unfinished">Photo Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="370"/>
-      <source>Photo Interval (seconds)</source>
-      <translation type="unfinished">Photo Interval (seconds)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="376"/>
-      <source>Video Grid Lines</source>
-      <translation type="unfinished">Video Grid Lines</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="382"/>
-      <source>Video Screen Fit</source>
-      <translation type="unfinished">Video Screen Fit</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="388"/>
-      <source>Reset Camera Defaults</source>
-      <translation type="unfinished">Reset Camera Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="394"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Off</source>
-      <translation type="unfinished">Off</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Blend</source>
-      <translation type="unfinished">Blend</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Full</source>
-      <translation type="unfinished">Full</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="421"/>
-      <source>Picture In Picture</source>
-      <translation type="unfinished">Picture In Picture</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Single</source>
-      <translation type="unfinished">Single</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="495"/>
-      <source>Time Lapse</source>
-      <translation type="unfinished">Time Lapse</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="533"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="538"/>
-      <source>Reset Camera to Factory Settings</source>
-      <translation type="unfinished">Reset Camera to Factory Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="539"/>
-      <source>Confirm resetting all settings?</source>
-      <translation type="unfinished">Confirm resetting all settings?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="551"/>
-      <source>Format</source>
-      <translation type="unfinished">Format</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="556"/>
-      <source>Format Camera Storage</source>
-      <translation type="unfinished">Format Camera Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/Widgets/PhotoVideoControl.qml" line="557"/>
-      <source>Confirm erasing all files?</source>
-      <translation type="unfinished">Confirm erasing all files?</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanManager</name>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="178"/>
-      <source>Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</source>
-      <translation type="unfinished">Internal error occurred during Mission Item communication: _ackTimeOut:_expectedAck == AckNone</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="183"/>
-      <source>Mission request list failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission request list failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="187"/>
-      <source>Retrying %1 REQUEST_LIST retry Count</source>
-      <translation type="unfinished">Retrying %1 REQUEST_LIST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="194"/>
-      <source>Mission read failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission read failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="198"/>
-      <source>Retrying %1 MISSION_REQUEST retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_REQUEST retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="206"/>
-      <source>Mission write failed, vehicle failed to send final ack.</source>
-      <translation type="unfinished">Mission write failed, vehicle failed to send final ack.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="211"/>
-      <source>Mission write mission count failed, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission write mission count failed, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="220"/>
-      <source>Vehicle did not request all items from ground station: %1</source>
-      <translation type="unfinished">Vehicle did not request all items from ground station: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="228"/>
-      <source>Mission remove all, maximum retries exceeded.</source>
-      <translation type="unfinished">Mission remove all, maximum retries exceeded.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="232"/>
-      <source>Retrying %1 MISSION_CLEAR_ALL retry Count</source>
-      <translation type="unfinished">Retrying %1 MISSION_CLEAR_ALL retry Count</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="239"/>
-      <source>Vehicle did not respond to mission item communication: %1</source>
-      <translation type="unfinished">Vehicle did not respond to mission item communication: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="350"/>
-      <source>Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</source>
-      <translation type="unfinished">Internal Error: Call to Vehicle _requestNextMissionItem with no more indices to read</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="500"/>
-      <source>Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</source>
-      <translation type="unfinished">Vehicle requested item outside range, count:request %1:%2. Send to Vehicle failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="615"/>
-      <source>Vehicle remove all failed. Error: %1</source>
-      <translation type="unfinished">Vehicle remove all failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="690"/>
-      <source>Item #%1 Command: %2</source>
-      <translation type="unfinished">Item #%1 Command: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="694"/>
-      <source>Frame: %1</source>
-      <translation type="unfinished">Frame: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="700"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="703"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="706"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="709"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="712"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="715"/>
-      <location filename="../src/MissionManager/PlanManager.cc" line="718"/>
-      <source>Value: %1</source>
-      <translation type="unfinished">Value: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="737"/>
-      <source>Mission accepted.</source>
-      <translation type="unfinished">Mission accepted.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="740"/>
-      <source>Unspecified error.</source>
-      <translation type="unfinished">Unspecified error.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="743"/>
-      <source>Coordinate frame is not supported.</source>
-      <translation type="unfinished">Coordinate frame is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="746"/>
-      <source>Command is not supported.</source>
-      <translation type="unfinished">Command is not supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="749"/>
-      <source>Mission item exceeds storage space.</source>
-      <translation type="unfinished">Mission item exceeds storage space.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="752"/>
-      <source>One of the parameters has an invalid value.</source>
-      <translation type="unfinished">One of the parameters has an invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="755"/>
-      <source>Param 1 invalid value.</source>
-      <translation type="unfinished">Param 1 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="758"/>
-      <source>Param 2 invalid value.</source>
-      <translation type="unfinished">Param 2 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="761"/>
-      <source>Param 3 invalid value.</source>
-      <translation type="unfinished">Param 3 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="764"/>
-      <source>Param 4 invalid value.</source>
-      <translation type="unfinished">Param 4 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="767"/>
-      <source>Param 5 invalid value.</source>
-      <translation type="unfinished">Param 5 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="770"/>
-      <source>Param 6 invalid value.</source>
-      <translation type="unfinished">Param 6 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="773"/>
-      <source>Param 7 invalid value.</source>
-      <translation type="unfinished">Param 7 invalid value.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="776"/>
-      <source>Received mission item out of sequence.</source>
-      <translation type="unfinished">Received mission item out of sequence.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="779"/>
-      <source>Not accepting any mission commands.</source>
-      <translation type="unfinished">Not accepting any mission commands.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="783"/>
-      <source>Unknown error: %1.</source>
-      <translation type="unfinished">Unknown error: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanManager.cc" line="626"/>
-      <source>Vehicle returned error: %1. %2Vehicle did not accept guided item.</source>
-      <translation type="unfinished">Vehicle returned error: %1. %2Vehicle did not accept guided item.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanMasterController</name>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="223"/>
-      <source>Download not supported on high latency links.</source>
-      <translation type="unfinished">Download not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="337"/>
-      <source>Upload not supported on high latency links.</source>
-      <translation type="unfinished">Upload not supported on high latency links.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="357"/>
-      <source>Error loading Plan file (%1). %2</source>
-      <translation type="unfinished">Error loading Plan file (%1). %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="481"/>
-      <source>Plan save error %1 : %2</source>
-      <translation type="unfinished">Plan save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="513"/>
-      <source>KML save error %1 : %2</source>
-      <translation type="unfinished">KML save error %1 : %2</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="584"/>
-      <source>Supported types (*.%1 *.%2 *.%3 *.%4)</source>
-      <translation type="unfinished">Supported types (*.%1 *.%2 *.%3 *.%4)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="585"/>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>All Files (*)</source>
-      <translation type="unfinished">All Files (*)</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/PlanMasterController.cc" line="594"/>
-      <source>Plan Files (*.%1)</source>
-      <translation type="unfinished">Plan Files (*.%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanToolBarIndicators</name>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="138"/>
-      <source>Selected Waypoint</source>
-      <translation type="unfinished">Selected Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="143"/>
-      <source>Alt diff:</source>
-      <translation type="unfinished">Alt diff:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="152"/>
-      <source>Azimuth:</source>
-      <translation type="unfinished">Azimuth:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="161"/>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="197"/>
-      <source>Distance:</source>
-      <translation type="unfinished">Distance:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="168"/>
-      <source>Gradient:</source>
-      <translation type="unfinished">Gradient:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="177"/>
-      <source>Heading:</source>
-      <translation type="unfinished">Heading:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="192"/>
-      <source>Total Mission</source>
-      <translation type="unfinished">Total Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="206"/>
-      <source>Max telem dist:</source>
-      <translation type="unfinished">Max telem dist:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="213"/>
-      <source>Time:</source>
-      <translation type="unfinished">Time:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="229"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="234"/>
-      <source>Batteries required:</source>
-      <translation type="unfinished">Batteries required:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload Required</source>
-      <translation type="unfinished">Upload Required</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="246"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="308"/>
-      <source>Syncing Mission</source>
-      <translation type="unfinished">Syncing Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanToolBarIndicators.qml" line="316"/>
-      <source>Click anywhere to hide</source>
-      <translation type="unfinished">Click anywhere to hide</translation>
-    </message>
-  </context>
-  <context>
-    <name>PlanView</name>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="62"/>
-      <source>Vehicle is currently armed. Do you want to upload the mission to the vehicle?</source>
-      <translation type="unfinished">Vehicle is currently armed. Do you want to upload the mission to the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="129"/>
-      <source>You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</source>
-      <translation type="unfinished">You have changed the default altitude for mission items. Would you like to apply that altitude to all the items in the current mission?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="209"/>
-      <source>You need at least one item to create a KML.</source>
-      <translation type="unfinished">You need at least one item to create a KML.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Plan is waiting on terrain data from server for correct altitude values.</source>
-      <translation type="unfinished">Plan is waiting on terrain data from server for correct altitude values.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="263"/>
-      <source>Plan Upload</source>
-      <translation type="unfinished">Plan Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="269"/>
-      <source>Select Plan File</source>
-      <translation type="unfinished">Select Plan File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="280"/>
-      <source>Save Plan</source>
-      <translation type="unfinished">Save Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="295"/>
-      <source>Save KML</source>
-      <translation type="unfinished">Save KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="401"/>
-      <source>Move the selected mission item to the be after following mission item:</source>
-      <translation type="unfinished">Move the selected mission item to the be after following mission item:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="642"/>
-      <source>File</source>
-      <translation type="unfinished">File</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Waypoint</source>
-      <translation type="unfinished">Waypoint</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="685"/>
-      <source>Pattern</source>
-      <translation type="unfinished">Pattern</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="708"/>
-      <source>Center</source>
-      <translation type="unfinished">Center</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="619"/>
-      <location filename="../src/PlanView/PlanView.qml" line="785"/>
-      <source>Plan</source>
-      <translation type="unfinished">Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="121"/>
-      <source>Apply new altitude</source>
-      <translation type="unfinished">Apply new altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Disconnected</source>
-      <translation type="unfinished">Plan View - Vehicle Disconnected</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="140"/>
-      <source>Plan View - Vehicle Changed</source>
-      <translation type="unfinished">Plan View - Vehicle Changed</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="148"/>
-      <source>The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</source>
-      <translation type="unfinished">The vehicle associated with the plan in the Plan View is no longer available. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="149"/>
-      <source>The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</source>
-      <translation type="unfinished">The plan being worked on in the Plan View is not from the current vehicle. What would you like to do with that plan?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="156"/>
-      <source>Discard Unsaved Changes</source>
-      <translation type="unfinished">Discard Unsaved Changes</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="157"/>
-      <source>Discard Unsaved Changes, Load New Plan From Vehicle</source>
-      <translation type="unfinished">Discard Unsaved Changes, Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="158"/>
-      <source>Load New Plan From Vehicle</source>
-      <translation type="unfinished">Load New Plan From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="169"/>
-      <source>Keep Current Plan</source>
-      <translation type="unfinished">Keep Current Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="170"/>
-      <source>Keep Current Plan, Don&apos;t Update From Vehicle</source>
-      <translation type="unfinished">Keep Current Plan, Don&apos;t Update From Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="187"/>
-      <source>This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</source>
-      <translation type="unfinished">This Plan was created for a different firmware or vehicle type than the firmware/vehicle type of vehicle you are uploading to. This can lead to errors or incorrect behavior. It is recommended to recreate the Plan for the correct firmware/vehicle type.
-
-Click &apos;Ok&apos; to upload the Plan anyway.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Send To Vehicle</source>
-      <translation type="unfinished">Send To Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="260"/>
-      <source>Current mission must be paused prior to uploading a new Plan</source>
-      <translation type="unfinished">Current mission must be paused prior to uploading a new Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="637"/>
-      <source>Fly</source>
-      <translation type="unfinished">Fly</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="651"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="662"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="669"/>
-      <source>Cancel ROI</source>
-      <translation type="unfinished">Cancel ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Return</source>
-      <translation type="unfinished">Return</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="698"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="817"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="820"/>
-      <source>Fence</source>
-      <translation type="unfinished">Fence</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="824"/>
-      <source>Rally</source>
-      <translation type="unfinished">Rally</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="942"/>
-      <source>You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from the Vehicle will lose these changes. Are you sure you want to load from the Vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="954"/>
-      <source>You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</source>
-      <translation type="unfinished">You have unsaved/unsent changes. Loading from a file will lose these changes. Are you sure you want to load from a file?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1228"/>
-      <source>Clear</source>
-      <translation type="unfinished">Clear</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="978"/>
-      <source>Are you sure you want to remove all mission items and clear the mission from the vehicle?</source>
-      <translation type="unfinished">Are you sure you want to remove all mission items and clear the mission from the vehicle?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1004"/>
-      <source>Create complex pattern:</source>
-      <translation type="unfinished">Create complex pattern:</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Mission overwrite</source>
-      <translation type="unfinished">Mission overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>GeoFence overwrite</source>
-      <translation type="unfinished">GeoFence overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1029"/>
-      <source>Rally Points overwrite</source>
-      <translation type="unfinished">Rally Points overwrite</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1037"/>
-      <source>You have unsaved changes.</source>
-      <translation type="unfinished">You have unsaved changes.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1136"/>
-      <source>Open...</source>
-      <translation type="unfinished">Open...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1150"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <location filename="../src/PlanView/PlanView.qml" line="237"/>
-      <source>Unable to %1</source>
-      <translation type="unfinished">Unable to %1</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="232"/>
-      <source>Plan has incomplete items. Complete all items and %1 again.</source>
-      <translation type="unfinished">Plan has incomplete items. Complete all items and %1 again.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="967"/>
-      <source>Are you sure you want to remove current plan and create a new plan? </source>
-      <translation type="unfinished">Are you sure you want to remove current plan and create a new plan? </translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1036"/>
-      <source>You have unsaved changes. You should upload to your vehicle, or save to a file.</source>
-      <translation type="unfinished">You have unsaved changes. You should upload to your vehicle, or save to a file.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1044"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1096"/>
-      <source>Create Plan</source>
-      <translation type="unfinished">Create Plan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1115"/>
-      <source>Storage</source>
-      <translation type="unfinished">Storage</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1164"/>
-      <source>Save As...</source>
-      <translation type="unfinished">Save As...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1176"/>
-      <source>Save Mission Waypoints As KML...</source>
-      <translation type="unfinished">Save Mission Waypoints As KML...</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1181"/>
-      <source>KML</source>
-      <translation type="unfinished">KML</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="231"/>
-      <location filename="../src/PlanView/PlanView.qml" line="236"/>
-      <location filename="../src/PlanView/PlanView.qml" line="1202"/>
-      <source>Upload</source>
-      <translation type="unfinished">Upload</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1193"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/PlanView.qml" line="1213"/>
-      <source>Download</source>
-      <translation type="unfinished">Download</translation>
-    </message>
-  </context>
-  <context>
-    <name>PolygonEditor</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>Click to add point %1</source>
-      <translation type="unfinished">Click to add point %1</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="178"/>
-      <source>- Right Click to end polygon</source>
-      <translation type="unfinished">- Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="185"/>
-      <source>Click to add point</source>
-      <translation type="unfinished">Click to add point</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="192"/>
-      <source>Click to add point - Right Click to end polygon</source>
-      <translation type="unfinished">Click to add point - Right Click to end polygon</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightMap/MapItems/PolygonEditor.qml" line="198"/>
-      <source>Adjust polygon by dragging corners</source>
-      <translation type="unfinished">Adjust polygon by dragging corners</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="530"/>
-      <source>ESC Calibration</source>
-      <translation type="unfinished">ESC Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="58"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade to a newer firmware.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="59"/>
-      <source>%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</source>
-      <translation type="unfinished">%1 cannot perform ESC Calibration with this version of firmware. You will need to upgrade %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="536"/>
-      <source>Performing calibration. This will take a few seconds..</source>
-      <translation type="unfinished">Performing calibration. This will take a few seconds..</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>ESC Calibration failed</source>
-      <translation type="unfinished">ESC Calibration failed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="537"/>
-      <source>ESC Calibration failed. </source>
-      <translation type="unfinished">ESC Calibration failed. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="538"/>
-      <source>Calibration complete. You can disconnect your battery now if you like.</source>
-      <translation type="unfinished">Calibration complete. You can disconnect your battery now if you like.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source>WARNING: Props must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Props must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="545"/>
-      <source> Connect the battery now and calibration will begin.</source>
-      <translation type="unfinished"> Connect the battery now and calibration will begin.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="60"/>
-      <source>You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</source>
-      <translation type="unfinished">You must disconnect the battery prior to performing ESC Calibration. Disconnect your battery and try again.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="215"/>
-      <source>Battery </source>
-      <translation type="unfinished">Battery </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="255"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="270"/>
-      <source>Source</source>
-      <translation type="unfinished">Source</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="433"/>
-      <source>Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</source>
-      <translation type="unfinished">Measure battery voltage using an external voltmeter and enter the value below. Click Calculate to set the new voltage multiplier.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="440"/>
-      <source>Measured voltage:</source>
-      <translation type="unfinished">Measured voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="443"/>
-      <source>Vehicle voltage:</source>
-      <translation type="unfinished">Vehicle voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="446"/>
-      <source>Voltage divider:</source>
-      <translation type="unfinished">Voltage divider:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="490"/>
-      <source>Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</source>
-      <translation type="unfinished">Measure current draw using an external current meter and enter the value below. Click Calculate to set the new amps per volt value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="497"/>
-      <source>Measured current:</source>
-      <translation type="unfinished">Measured current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="500"/>
-      <source>Vehicle current:</source>
-      <translation type="unfinished">Vehicle current:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="503"/>
-      <source>Amps per volt:</source>
-      <translation type="unfinished">Amps per volt:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="328"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="352"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="508"/>
-      <source>Calculate</source>
-      <translation type="unfinished">Calculate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="292"/>
-      <source>Number of Cells (in Series)</source>
-      <translation type="unfinished">Number of Cells (in Series)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="311"/>
-      <source>Full Voltage (per cell)</source>
-      <translation type="unfinished">Full Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="298"/>
-      <source>Battery Max:</source>
-      <translation type="unfinished">Battery Max:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="301"/>
-      <source>Empty Voltage (per cell)</source>
-      <translation type="unfinished">Empty Voltage (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="307"/>
-      <source>Battery Min:</source>
-      <translation type="unfinished">Battery Min:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="320"/>
-      <source>Voltage divider</source>
-      <translation type="unfinished">Voltage divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="415"/>
-      <source>Calculate Voltage Divider</source>
-      <translation type="unfinished">Calculate Voltage Divider</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="339"/>
-      <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. </source>
-      <translation type="unfinished">If the battery voltage reported by the vehicle is largely different than the voltage read externally using a voltmeter you can adjust the voltage multiplier value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="340"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="364"/>
-      <source>Click the Calculate button for help with calculating a new value.</source>
-      <translation type="unfinished">Click the Calculate button for help with calculating a new value.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="344"/>
-      <source>Amps per volt</source>
-      <translation type="unfinished">Amps per volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="472"/>
-      <source>Calculate Amps per Volt</source>
-      <translation type="unfinished">Calculate Amps per Volt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="363"/>
-      <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. </source>
-      <translation type="unfinished">If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="110"/>
-      <source>ESC PWM Minimum and Maximum Calibration</source>
-      <translation type="unfinished">ESC PWM Minimum and Maximum Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="120"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="125"/>
-      <source>You must use USB connection for this operation.</source>
-      <translation type="unfinished">You must use USB connection for this operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="129"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="138"/>
-      <source>Show UAVCAN Settings</source>
-      <translation type="unfinished">Show UAVCAN Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="144"/>
-      <source>UAVCAN Bus Configuration</source>
-      <translation type="unfinished">UAVCAN Bus Configuration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="160"/>
-      <source>Change required restart</source>
-      <translation type="unfinished">Change required restart</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="167"/>
-      <source>UAVCAN Motor Index and Direction Assignment</source>
-      <translation type="unfinished">UAVCAN Motor Index and Direction Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="178"/>
-      <source>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</source>
-      <translation type="unfinished">WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="184"/>
-      <source>ESC parameters will only be accessible in the editor after assignment.</source>
-      <translation type="unfinished">ESC parameters will only be accessible in the editor after assignment.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="190"/>
-      <source>Start the process, then turn each motor into its turn direction, in the order of their motor indices.</source>
-      <translation type="unfinished">Start the process, then turn each motor into its turn direction, in the order of their motor indices.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="195"/>
-      <source>Start Assignment</source>
-      <translation type="unfinished">Start Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="201"/>
-      <source>Stop Assignment</source>
-      <translation type="unfinished">Stop Assignment</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="371"/>
-      <source>Show Advanced Settings</source>
-      <translation type="unfinished">Show Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="375"/>
-      <source>Voltage Drop on Full Load (per cell)</source>
-      <translation type="unfinished">Voltage Drop on Full Load (per cell)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="391"/>
-      <source>Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </source>
-      <translation type="unfinished">Batteries show less voltage at high throttle. Enter the difference in Volts between idle throttle and full </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="392"/>
-      <source>throttle, divided by the number of battery cells. Leave at the default if unsure. </source>
-      <translation type="unfinished">throttle, divided by the number of battery cells. Leave at the default if unsure. </translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="393"/>
-      <source>If this value is set too high, the battery might be deep discharged and damaged.</source>
-      <translation type="unfinished">If this value is set too high, the battery might be deep discharged and damaged.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="398"/>
-      <source>Compensated Minimum Voltage:</source>
-      <translation type="unfinished">Compensated Minimum Voltage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.qml" line="402"/>
-      <source> V</source>
-      <translation type="unfinished"> V</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="19"/>
-      <source>Power</source>
-      <translation type="unfinished">Power</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponent.cc" line="30"/>
-      <source>Power Setup is used to setup battery parameters as well as advanced settings for propellers.</source>
-      <translation type="unfinished">Power Setup is used to setup battery parameters as well as advanced settings for propellers.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PowerComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="37"/>
-      <source>Battery Full</source>
-      <translation type="unfinished">Battery Full</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="42"/>
-      <source>Battery Empty</source>
-      <translation type="unfinished">Battery Empty</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/PowerComponentSummary.qml" line="47"/>
-      <source>Number of Cells</source>
-      <translation type="unfinished">Number of Cells</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightBatteryCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="18"/>
-      <source>Battery</source>
-      <translation type="unfinished">Battery</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="19"/>
-      <source>Battery connector firmly plugged?</source>
-      <translation type="unfinished">Battery connector firmly plugged?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="22"/>
-      <source>Warning - Battery charge below %1%.</source>
-      <translation type="unfinished">Warning - Battery charge below %1%.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightBatteryCheck.qml" line="23"/>
-      <source>Battery charge below %1%. Please recharge.</source>
-      <translation type="unfinished">Battery charge below %1%. Please recharge.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckButton</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckButton.qml" line="54"/>
-      <source>Passed</source>
-      <translation type="unfinished">Passed</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckGroup</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckGroup.qml" line="50"/>
-      <source> (passed)</source>
-      <translation type="unfinished"> (passed)</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckList</name>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>Pre-Flight Checklist %1</source>
-      <translation type="unfinished">Pre-Flight Checklist %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="81"/>
-      <source>(passed)</source>
-      <translation type="unfinished">(passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/PreFlightCheckList.qml" line="93"/>
-      <source>Reset the checklist (e.g. after a vehicle reboot)</source>
-      <translation type="unfinished">Reset the checklist (e.g. after a vehicle reboot)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>(Passed)</source>
-      <translation type="unfinished">(Passed)</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckList.qml" line="134"/>
-      <source>In Progress</source>
-      <translation type="unfinished">In Progress</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightCheckListShowAction</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightCheckListShowAction.qml" line="14"/>
-      <source>Checklist</source>
-      <translation type="unfinished">Checklist</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightGPSCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="17"/>
-      <source>GPS</source>
-      <translation type="unfinished">GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="20"/>
-      <source>Waiting for 3D lock.</source>
-      <translation type="unfinished">Waiting for 3D lock.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Warning - Sat count below %1.</source>
-      <translation type="unfinished">Warning - Sat count below %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightGPSCheck.qml" line="31"/>
-      <source>Waiting for sat count above %1.</source>
-      <translation type="unfinished">Waiting for sat count above %1.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightRCCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="17"/>
-      <source>Radio Control</source>
-      <translation type="unfinished">Radio Control</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="18"/>
-      <source>Receiving signal. Perform range test &amp; confirm.</source>
-      <translation type="unfinished">Receiving signal. Perform range test &amp; confirm.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightRCCheck.qml" line="19"/>
-      <source>No signal or invalid autopilot-RC config. Check RC and console.</source>
-      <translation type="unfinished">No signal or invalid autopilot-RC config. Check RC and console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSensorsHealthCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="17"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="35"/>
-      <source>Failure. Magnetometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Magnetometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="36"/>
-      <source>Failure. Accelerometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Accelerometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="37"/>
-      <source>Failure. Gyroscope issues. Check console.</source>
-      <translation type="unfinished">Failure. Gyroscope issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="38"/>
-      <source>Failure. Barometer issues. Check console.</source>
-      <translation type="unfinished">Failure. Barometer issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="39"/>
-      <source>Failure. Airspeed sensor issues. Check console.</source>
-      <translation type="unfinished">Failure. Airspeed sensor issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="40"/>
-      <source>Failure. AHRS issues. Check console.</source>
-      <translation type="unfinished">Failure. AHRS issues. Check console.</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSensorsHealthCheck.qml" line="41"/>
-      <source>Failure. GPS issues. Check console.</source>
-      <translation type="unfinished">Failure. GPS issues. Check console.</translation>
-    </message>
-  </context>
-  <context>
-    <name>PreFlightSoundCheck</name>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="16"/>
-      <source>Sound output</source>
-      <translation type="unfinished">Sound output</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="17"/>
-      <source>QGC audio output enabled. System audio output enabled, too?</source>
-      <translation type="unfinished">QGC audio output enabled. System audio output enabled, too?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/PreFlightSoundCheck.qml" line="18"/>
-      <source>QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</source>
-      <translation type="unfinished">QGC audio output is disabled. Please enable it under application settings-&gt;general to hear audio warnings!</translation>
-    </message>
-  </context>
-  <context>
-    <name>ProximityRadarValues</name>
-    <message>
-      <location filename="../src/FlightDisplay/ProximityRadarValues.qml" line="43"/>
-      <source>--.--</source>
-      <translation type="unfinished">--.--</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCApplication</name>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="198"/>
-      <source>You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">You are running %1 as root. You should not do this since it will cause other issues with %1.%1 will now exit.&lt;br/&gt;&lt;br/&gt;If you are having serial port issues on Ubuntu, execute the following commands to fix most issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="214"/>
-      <source>The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</source>
-      <translation type="unfinished">The current user does not have the correct permissions to access serial devices. You should also remove modemmanager since it also interferes.&lt;br/&gt;&lt;br/&gt;If you are using Ubuntu, execute the following commands to fix these issues:&lt;br/&gt;&lt;pre&gt;sudo usermod -a -G dialout $USER&lt;br/&gt;sudo apt-get remove modemmanager&lt;/pre&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="580"/>
-      <source>The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</source>
-      <translation type="unfinished">The format for %1 saved settings has been modified. Your saved settings have been reset to defaults.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="588"/>
-      <source>The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</source>
-      <translation type="unfinished">The Offline Map Cache database has been upgraded. Your old map cache sets have been reset.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="656"/>
-      <source>Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</source>
-      <translation type="unfinished">Unable to save telemetry log. Error copying telemetry to &apos;%1&apos;: &apos;%2&apos;.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="714"/>
-      <source>Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</source>
-      <translation type="unfinished">Parameters are missing from firmware. You may be running a version of firmware which is not fully supported or your firmware has a bug in it. Missing params: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>There is a newer version of %1 available. You can download it from %2.</source>
-      <translation type="unfinished">There is a newer version of %1 available. You can download it from %2.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="855"/>
-      <source>New Version Available</source>
-      <translation type="unfinished">New Version Available</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="673"/>
-      <source>Unable to save telemetry log. Application save directory is not set.</source>
-      <translation type="unfinished">Unable to save telemetry log. Application save directory is not set.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCApplication.cc" line="680"/>
-      <source>Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</source>
-      <translation type="unfinished">Unable to save telemetry log. Telemetry save directory &quot;%1&quot; does not exist.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCControlDebug</name>
-    <message>
-      <location filename="../src/QmlControls/QGCControlDebug.qml" line="22"/>
-      <source>%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</source>
-      <comment>Do not translate</comment>
-      <translation type="unfinished">%1 x:%2 y:%3 width:%4 height:%5 visible:%6 enabled:%7 z:%8 parent:%9 implicitWidth/Height:%10:%11</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCCorePlugin</name>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="134"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="138"/>
-      <source>Comm Links</source>
-      <translation type="unfinished">Comm Links</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="142"/>
-      <source>Offline Maps</source>
-      <translation type="unfinished">Offline Maps</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="147"/>
-      <source>Taisync</source>
-      <translation type="unfinished">Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="153"/>
-      <source>Microhard</source>
-      <translation type="unfinished">Microhard</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="159"/>
-      <source>AirMap</source>
-      <translation type="unfinished">AirMap</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="164"/>
-      <source>MAVLink</source>
-      <translation type="unfinished">MAVLink</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="168"/>
-      <source>Console</source>
-      <translation type="unfinished">Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="171"/>
-      <source>Help</source>
-      <translation type="unfinished">Help</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="176"/>
-      <source>Mock Link</source>
-      <translation type="unfinished">Mock Link</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="179"/>
-      <source>Debug</source>
-      <translation type="unfinished">Debug</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="182"/>
-      <source>Palette Test</source>
-      <translation type="unfinished">Palette Test</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="201"/>
-      <source>Vibration</source>
-      <translation type="unfinished">Vibration</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="193"/>
-      <source>Log Download</source>
-      <translation type="unfinished">Log Download</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="195"/>
-      <source>GeoTag Images</source>
-      <translation type="unfinished">GeoTag Images</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="197"/>
-      <source>MAVLink Console</source>
-      <translation type="unfinished">MAVLink Console</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="199"/>
-      <source>MAVLink Inspector</source>
-      <translation type="unfinished">MAVLink Inspector</translation>
-    </message>
-    <message>
-      <location filename="../src/api/QGCCorePlugin.cc" line="286"/>
-      <source>WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</source>
-      <translation type="unfinished">WARNING: You are about to enter Advanced Mode. If used incorrectly, this may cause your vehicle to malfunction thus voiding your warranty. You should do so only if instructed by customer support. Are you sure you want to enable Advanced Mode?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFenceCircle</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFenceCircle.cc" line="75"/>
-      <source>GeoFence Circle only supports version %1</source>
-      <translation type="unfinished">GeoFence Circle only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFencePolygon</name>
-    <message>
-      <location filename="../src/MissionManager/QGCFencePolygon.cc" line="68"/>
-      <source>GeoFence Polygon only supports version %1</source>
-      <translation type="unfinished">GeoFence Polygon only supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDialog</name>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="123"/>
-      <source>Path: %1</source>
-      <translation type="unfinished">Path: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="154"/>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="267"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="165"/>
-      <source>No files</source>
-      <translation type="unfinished">No files</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="206"/>
-      <source>New file name:</source>
-      <translation type="unfinished">New file name:</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="219"/>
-      <source>File names must end with .%1 file extension. If missing it will be added.</source>
-      <translation type="unfinished">File names must end with .%1 file extension. If missing it will be added.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="227"/>
-      <source>The file %1 exists. Click Save again to replace it.</source>
-      <translation type="unfinished">The file %1 exists. Click Save again to replace it.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCFileDialog.qml" line="235"/>
-      <source>Save to existing file:</source>
-      <translation type="unfinished">Save to existing file:</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCFileDownload</name>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="102"/>
-      <source>Unabled to find writable download location. Tried downloads and temp directory.</source>
-      <translation type="unfinished">Unabled to find writable download location. Tried downloads and temp directory.</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="112"/>
-      <source>Could not save downloaded file to %1. Error: %2</source>
-      <translation type="unfinished">Could not save downloaded file to %1. Error: %2</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="135"/>
-      <source>Download cancelled</source>
-      <translation type="unfinished">Download cancelled</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="138"/>
-      <source>Error: File Not Found</source>
-      <translation type="unfinished">Error: File Not Found</translation>
-    </message>
-    <message>
-      <location filename="../src/QGCFileDownload.cc" line="141"/>
-      <source>Error during download. Error: %1</source>
-      <translation type="unfinished">Error during download. Error: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCLogEntry</name>
-    <message>
-      <location filename="../src/AnalyzeView/LogDownloadController.cc" line="95"/>
-      <source>Pending</source>
-      <translation type="unfinished">Pending</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMAVLinkSystem</name>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="587"/>
-      <source>Comp All</source>
-      <translation type="unfinished">Comp All</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/MAVLinkInspectorController.cc" line="592"/>
-      <source>Comp %1</source>
-      <translation type="unfinished">Comp %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolygonVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="220"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="248"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="50"/>
-      <source>Polygon Tools</source>
-      <translation type="unfinished">Polygon Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="51"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="261"/>
-      <source>Set radius...</source>
-      <translation type="unfinished">Set radius...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="267"/>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="273"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="269"/>
-      <source>Edit Center Position</source>
-      <translation type="unfinished">Edit Center Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="275"/>
-      <source>Edit Vertex Position</source>
-      <translation type="unfinished">Edit Vertex Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="528"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="535"/>
-      <source>Circular</source>
-      <translation type="unfinished">Circular</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="542"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolygonVisuals.qml" line="560"/>
-      <source>Load KML/SHP...</source>
-      <translation type="unfinished">Load KML/SHP...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCMapPolylineVisuals</name>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="40"/>
-      <source>Polyline Tools</source>
-      <translation type="unfinished">Polyline Tools</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="41"/>
-      <source>Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</source>
-      <translation type="unfinished">Click in the map to add vertices. Click &apos;Done Tracing&apos; when finished.</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="128"/>
-      <source>Select KML File</source>
-      <translation type="unfinished">Select KML File</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="150"/>
-      <source>Remove vertex</source>
-      <translation type="unfinished">Remove vertex</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="155"/>
-      <source>Edit position...</source>
-      <translation type="unfinished">Edit position...</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="156"/>
-      <source>Edit Position</source>
-      <translation type="unfinished">Edit Position</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="335"/>
-      <source>Basic</source>
-      <translation type="unfinished">Basic</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Done Tracing</source>
-      <translation type="unfinished">Done Tracing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="342"/>
-      <source>Trace</source>
-      <translation type="unfinished">Trace</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/QGCMapPolylineVisuals.qml" line="359"/>
-      <source>Load KML...</source>
-      <translation type="unfinished">Load KML...</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCOptionsComboBox</name>
-    <message>
-      <location filename="../src/QmlControls/QGCOptionsComboBox.qml" line="24"/>
-      <source>Options</source>
-      <translation type="unfinished">Options</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPluginHost</name>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="49"/>
-      <source>Loaded Plugins</source>
-      <translation type="unfinished">Loaded Plugins</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QGCPluginHost.ui" line="62"/>
-      <source>Plugin Log</source>
-      <translation type="unfinished">Plugin Log</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCPopupDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="97"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="100"/>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="109"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="103"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="106"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="112"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="115"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="118"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="121"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="124"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="127"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="130"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="136"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="139"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="142"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="145"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCPopupDialogContainer.qml" line="148"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCTextField</name>
-    <message>
-      <location filename="../src/QmlControls/QGCTextField.qml" line="119"/>
-      <source>?</source>
-      <translation type="unfinished">?</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGCViewDialogContainer</name>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="34"/>
-      <source>Ok</source>
-      <translation type="unfinished">Ok</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="37"/>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="46"/>
-      <source>Open</source>
-      <translation type="unfinished">Open</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="40"/>
-      <source>Save</source>
-      <translation type="unfinished">Save</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="43"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="49"/>
-      <source>Save All</source>
-      <translation type="unfinished">Save All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="52"/>
-      <source>Yes</source>
-      <translation type="unfinished">Yes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="55"/>
-      <source>Yes to All</source>
-      <translation type="unfinished">Yes to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="58"/>
-      <source>Retry</source>
-      <translation type="unfinished">Retry</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="61"/>
-      <source>Reset</source>
-      <translation type="unfinished">Reset</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="64"/>
-      <source>Restore to Defaults</source>
-      <translation type="unfinished">Restore to Defaults</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="67"/>
-      <source>Ignore</source>
-      <translation type="unfinished">Ignore</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="73"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="76"/>
-      <source>Close</source>
-      <translation type="unfinished">Close</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="79"/>
-      <source>No</source>
-      <translation type="unfinished">No</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="82"/>
-      <source>No to All</source>
-      <translation type="unfinished">No to All</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGCViewDialogContainer.qml" line="85"/>
-      <source>Abort</source>
-      <translation type="unfinished">Abort</translation>
-    </message>
-  </context>
-  <context>
-    <name>QGroundControlQmlGlobal</name>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="254"/>
-      <source>32 bit</source>
-      <translation type="unfinished">32 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="256"/>
-      <source>64 bit</source>
-      <translation type="unfinished">64 bit</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="270"/>
-      <source>(AMSL)</source>
-      <translation type="unfinished">(AMSL)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="272"/>
-      <source>(CalcT)</source>
-      <translation type="unfinished">(CalcT)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="292"/>
-      <source>AMSL</source>
-      <translation type="unfinished">AMSL</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="294"/>
-      <source>Calc Above Terrain</source>
-      <translation type="unfinished">Calc Above Terrain</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="298"/>
-      <source>Mixed Modes</source>
-      <translation type="unfinished">Mixed Modes</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="274"/>
-      <source>(TerrF)</source>
-      <translation type="unfinished">(TerrF)</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="290"/>
-      <source>Relative To Launch</source>
-      <translation type="unfinished">Relative To Launch</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QGroundControlQmlGlobal.cc" line="296"/>
-      <source>Terrain Frame</source>
-      <translation type="unfinished">Terrain Frame</translation>
-    </message>
-  </context>
-  <context>
-    <name>QMap3D</name>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="14"/>
-      <source>Form</source>
-      <translation type="unfinished">Form</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="20"/>
-      <source>Map</source>
-      <translation type="unfinished">Map</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/QMap3D.ui" line="30"/>
-      <source>Vehicle</source>
-      <translation type="unfinished">Vehicle</translation>
-    </message>
-  </context>
-  <context>
-    <name>QObject</name>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="274"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="278"/>
-      <source>Pixhawk</source>
-      <translation type="unfinished">Pixhawk</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="280"/>
-      <source>SiK Radio</source>
-      <translation type="unfinished">SiK Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="282"/>
-      <source>PX4 Flow</source>
-      <translation type="unfinished">PX4 Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="284"/>
-      <source>OpenPilot</source>
-      <translation type="unfinished">OpenPilot</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCSerialPortInfo.cc" line="286"/>
-      <source>RTK GPS</source>
-      <translation type="unfinished">RTK GPS</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="28"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="68"/>
-      <source>Guided mode not supported by Vehicle.</source>
-      <translation type="unfinished">Guided mode not supported by Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirmwarePlugin/FirmwarePlugin.cc" line="32"/>
-      <source>Follow Me</source>
-      <translation type="unfinished">Follow Me</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="46"/>
-      <source>The following required keys are missing: %1</source>
-      <translation type="unfinished">The following required keys are missing: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="60"/>
-      <source>value for coordinate is not array</source>
-      <translation type="unfinished">value for coordinate is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="67"/>
-      <source>Coordinate array must contain %1 values</source>
-      <translation type="unfinished">Coordinate array must contain %1 values</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="73"/>
-      <source>Coordinate array may only contain double values, found: %1</source>
-      <translation type="unfinished">Coordinate array may only contain double values, found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="151"/>
-      <source>Incorrect value type - key:type:expected %1:%2:%3</source>
-      <translation type="unfinished">Incorrect value type - key:type:expected %1:%2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="209"/>
-      <source>Incorrect file type key expected:%1 actual:%2</source>
-      <translation type="unfinished">Incorrect file type key expected:%1 actual:%2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="216"/>
-      <source>File version %1 is no longer supported</source>
-      <translation type="unfinished">File version %1 is no longer supported</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="220"/>
-      <source>File version %1 is newer than current supported version %2</source>
-      <translation type="unfinished">File version %1 is newer than current supported version %2</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="379"/>
-      <source>value for coordinate array is not array</source>
-      <translation type="unfinished">value for coordinate array is not array</translation>
-    </message>
-    <message>
-      <location filename="../src/JsonHelper.cc" line="488"/>
-      <source>Unknown type: %1</source>
-      <translation type="unfinished">Unknown type: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="252"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/main.cc" line="253"/>
-      <source>A second instance of %1 is already running. Please close the other instance and try again.</source>
-      <translation type="unfinished">A second instance of %1 is already running. Please close the other instance and try again.</translation>
-    </message>
-  </context>
-  <context>
-    <name>QmlTest</name>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="228"/>
-      <source>Window Color</source>
-      <translation type="unfinished">Window Color</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="232"/>
-      <source>Import/Export</source>
-      <translation type="unfinished">Import/Export</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="240"/>
-      <source>Light</source>
-      <translation type="unfinished">Light</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="247"/>
-      <source>Dark</source>
-      <translation type="unfinished">Dark</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="288"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="393"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="294"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="306"/>
-      <source>Value</source>
-      <translation type="unfinished">Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="300"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="400"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="386"/>
-      <source>QGC name</source>
-      <translation type="unfinished">QGC name</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="415"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="425"/>
-      <source>Label</source>
-      <translation type="unfinished">Label</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>
-      <translation type="unfinished">Button</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="474"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="481"/>
-      <source>Hover Button</source>
-      <translation type="unfinished">Hover Button</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>
-      <translation type="unfinished">Item 1</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>
-      <translation type="unfinished">Item 2</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>
-      <translation type="unfinished">Item 3</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="530"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="540"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="557"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="567"/>
-      <source>Check Box</source>
-      <translation type="unfinished">Check Box</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/QmlTest.qml" line="614"/>
-      <location filename="../src/QmlControls/QmlTest.qml" line="619"/>
-      <source>SUB MENU</source>
-      <translation type="unfinished">SUB MENU</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Status</source>
-      <translation type="unfinished">RC RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>RC RSSI Data Unavailable</source>
-      <translation type="unfinished">RC RSSI Data Unavailable</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="51"/>
-      <source>N/A</source>
-      <comment>No data available</comment>
-      <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/RCRSSIIndicator.qml" line="64"/>
-      <source>RSSI:</source>
-      <translation type="unfinished">RSSI:</translation>
-    </message>
-  </context>
-  <context>
-    <name>RCToParamDialog</name>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="25"/>
-      <source>RC To Param</source>
-      <translation type="unfinished">RC To Param</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="44"/>
-      <source>Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</source>
-      <translation type="unfinished">Bind an RC Channel to a parameter value. Tuning IDs can be mapped to an RC Channel from Radio Setup page.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="50"/>
-      <source>Waiting on parameter update from Vehicle.</source>
-      <translation type="unfinished">Waiting on parameter update from Vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="61"/>
-      <source>Parameter</source>
-      <translation type="unfinished">Parameter</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="64"/>
-      <source>Tuning ID</source>
-      <translation type="unfinished">Tuning ID</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="72"/>
-      <source>Scale</source>
-      <translation type="unfinished">Scale</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="78"/>
-      <source>Center Value</source>
-      <translation type="unfinished">Center Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="84"/>
-      <source>Min Value</source>
-      <translation type="unfinished">Min Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="90"/>
-      <source>Max Value</source>
-      <translation type="unfinished">Max Value</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/RCToParamDialog.qml" line="101"/>
-      <source>Double check that all values are correct prior to confirming dialog.</source>
-      <translation type="unfinished">Double check that all values are correct prior to confirming dialog.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ROIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="53"/>
-      <source>ROI Disabled</source>
-      <translation type="unfinished">ROI Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/ROIIndicator.qml" line="62"/>
-      <source>Disable ROI</source>
-      <translation type="unfinished">Disable ROI</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="34"/>
-      <source>Radio</source>
-      <translation type="unfinished">Radio</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="54"/>
-      <source>Reboot required</source>
-      <translation type="unfinished">Reboot required</translation>
-    </message>
-    <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>
-      <translation type="unfinished">Your stick mappings have changed, you must reboot the vehicle for correct operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="55"/>
-      <source>Throttle channel reversed</source>
-      <translation type="unfinished">Throttle channel reversed</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>
-      <translation type="unfinished">Calibration failed. The throttle channel on your transmitter is reversed. You must correct this on your transmitter in order to complete calibration.</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>
-      <translation type="unfinished">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.</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>
-      <translation type="unfinished">Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.
-
-%1</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>
-      <translation type="unfinished">Please ensure all motor power is disconnected AND all props are removed from the vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>Please turn on transmitter.</source>
-      <translation type="unfinished">Please turn on transmitter.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="84"/>
-      <source>%1 channels or more are needed to fly.</source>
-      <translation type="unfinished">%1 channels or more are needed to fly.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="110"/>
-      <source>Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</source>
-      <translation type="unfinished">Click Ok to place your Spektrum receiver in the bind mode. Select the specific receiver type below:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="114"/>
-      <source>DSM2 Mode</source>
-      <translation type="unfinished">DSM2 Mode</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="120"/>
-      <source>DSMX (7 channels or less)</source>
-      <translation type="unfinished">DSMX (7 channels or less)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="127"/>
-      <source>DSMX (8 channels or more)</source>
-      <translation type="unfinished">DSMX (8 channels or more)</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="183"/>
-      <source>Not Mapped</source>
-      <translation type="unfinished">Not Mapped</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="209"/>
-      <source>Attitude Controls</source>
-      <translation type="unfinished">Attitude Controls</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="217"/>
-      <source>Roll</source>
-      <translation type="unfinished">Roll</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="246"/>
-      <source>Pitch</source>
-      <translation type="unfinished">Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="275"/>
-      <source>Yaw</source>
-      <translation type="unfinished">Yaw</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="304"/>
-      <source>Throttle</source>
-      <translation type="unfinished">Throttle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="332"/>
-      <source>Skip</source>
-      <translation type="unfinished">Skip</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="338"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="345"/>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="348"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="371"/>
-      <source>Additional Radio setup:</source>
-      <translation type="unfinished">Additional Radio setup:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="408"/>
-      <source>Spektrum Bind</source>
-      <translation type="unfinished">Spektrum Bind</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="413"/>
-      <source>Copy Trims</source>
-      <translation type="unfinished">Copy Trims</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="437"/>
-      <source>Mode 1</source>
-      <translation type="unfinished">Mode 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponent.qml" line="443"/>
-      <source>Mode 2</source>
-      <translation type="unfinished">Mode 2</translation>
-    </message>
-  </context>
-  <context>
-    <name>RadioComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="118"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="121"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="124"/>
-      <source>Move the Throttle stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="125"/>
-      <source>Move the Throttle stick all the way down and leave it there...</source>
-      <translation type="unfinished">Move the Throttle stick all the way down and leave it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="126"/>
-      <source>Move the Yaw stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="127"/>
-      <source>Move the Yaw stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Yaw stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="128"/>
-      <source>Move the Roll stick all the way to the left and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the left and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="129"/>
-      <source>Move the Roll stick all the way to the right and hold it there...</source>
-      <translation type="unfinished">Move the Roll stick all the way to the right and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="130"/>
-      <source>Move the Pitch stick all the way down and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way down and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="131"/>
-      <source>Move the Pitch stick all the way up and hold it there...</source>
-      <translation type="unfinished">Move the Pitch stick all the way up and hold it there...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="132"/>
-      <source>Allow the Pitch stick to move back to center...</source>
-      <translation type="unfinished">Allow the Pitch stick to move back to center...</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="133"/>
-      <source>Move all the transmitter switches and/or dials back and forth to their extreme positions.</source>
-      <translation type="unfinished">Move all the transmitter switches and/or dials back and forth to their extreme positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="134"/>
-      <source>All settings have been captured. Click Next to write the new parameters to your board.</source>
-      <translation type="unfinished">All settings have been captured. Click Next to write the new parameters to your board.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="201"/>
-      <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">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</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="804"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="826"/>
-      <source>Calibrate</source>
-      <translation type="unfinished">Calibrate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/RadioComponentController.cc" line="850"/>
-      <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">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.</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointController</name>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="102"/>
-      <source>Rally: %1</source>
-      <translation type="unfinished">Rally: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/RallyPointController.cc" line="105"/>
-      <source>Rally Points supports version %1</source>
-      <translation type="unfinished">Rally Points supports version %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointEditorHeader</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointEditorHeader.qml" line="30"/>
-      <source>Rally Points</source>
-      <translation type="unfinished">Rally Points</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">Rally Points provide alternate landing points when performing a Return to Launch (RTL).</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="51"/>
-      <source>Rally Point</source>
-      <translation type="unfinished">Rally Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/RallyPointItemEditor.qml" line="74"/>
-      <source>Delete</source>
-      <translation type="unfinished">Delete</translation>
-    </message>
-  </context>
-  <context>
-    <name>RallyPointMapVisuals</name>
-    <message>
-      <location filename="../src/PlanView/RallyPointMapVisuals.qml" line="72"/>
-      <source>R</source>
-      <comment>rally point map item label</comment>
-      <translation type="unfinished">R</translation>
-    </message>
-  </context>
-  <context>
-    <name>RoverChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="25"/>
-      <source>Rover Initial Checks</source>
-      <translation type="unfinished">Rover Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="29"/>
-      <source>Battery mounted and secured?</source>
-      <translation type="unfinished">Battery mounted and secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="53"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="54"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="62"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="66"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="67"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="71"/>
-      <source>Wind &amp; weather</source>
-      <translation type="unfinished">Wind &amp; weather</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="72"/>
-      <source>OK for your platform?</source>
-      <translation type="unfinished">OK for your platform?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="76"/>
-      <source>Mission area</source>
-      <translation type="unfinished">Mission area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/RoverChecklist.qml" line="77"/>
-      <source>Mission area and path free of obstacles/people?</source>
-      <translation type="unfinished">Mission area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SHPFileHelper</name>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="18"/>
-      <source>SHP file load failed. %1</source>
-      <translation type="unfinished">SHP file load failed. %1</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">UTM projection is not in supported format. Must be PROJCS[&quot;WGS_1984_UTM_Zone_##N/S</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="54"/>
-      <source>Only WGS84 or UTM projections are supported.</source>
-      <translation type="unfinished">Only WGS84 or UTM projections are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="57"/>
-      <source>PRJ file open failed: %1</source>
-      <translation type="unfinished">PRJ file open failed: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="60"/>
-      <source>File not found: %1</source>
-      <translation type="unfinished">File not found: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="63"/>
-      <source>File is not a .shp file: %1</source>
-      <translation type="unfinished">File is not a .shp file: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="79"/>
-      <source>SHPOpen failed.</source>
-      <translation type="unfinished">SHPOpen failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="101"/>
-      <source>More than one entity found.</source>
-      <translation type="unfinished">More than one entity found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="105"/>
-      <source>No supported types found.</source>
-      <translation type="unfinished">No supported types found.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="133"/>
-      <source>File does not contain a polygon.</source>
-      <translation type="unfinished">File does not contain a polygon.</translation>
-    </message>
-    <message>
-      <location filename="../src/SHPFileHelper.cc" line="139"/>
-      <source>Only single part polygons are supported.</source>
-      <translation type="unfinished">Only single part polygons are supported.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="67"/>
-      <source>Low Battery Failsafe Trigger</source>
-      <translation type="unfinished">Low Battery Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="95"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="277"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="329"/>
-      <source>Failsafe Action:</source>
-      <translation type="unfinished">Failsafe Action:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="107"/>
-      <source>Battery Warn Level:</source>
-      <translation type="unfinished">Battery Warn Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="116"/>
-      <source>Battery Failsafe Level:</source>
-      <translation type="unfinished">Battery Failsafe Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="125"/>
-      <source>Battery Emergency Level:</source>
-      <translation type="unfinished">Battery Emergency Level:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="137"/>
-      <source>Object Detection</source>
-      <translation type="unfinished">Object Detection</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="165"/>
-      <source>Collision Prevention:</source>
-      <translation type="unfinished">Collision Prevention:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="170"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="189"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="610"/>
-      <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="185"/>
-      <source>Obstacle Avoidance:</source>
-      <translation type="unfinished">Obstacle Avoidance:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="202"/>
-      <source>Minimum Distance: (</source>
-      <translation type="unfinished">Minimum Distance: (</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="238"/>
-      <source>Show obstacle distance overlay</source>
-      <translation type="unfinished">Show obstacle distance overlay</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="249"/>
-      <source>RC Loss Failsafe Trigger</source>
-      <translation type="unfinished">RC Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="289"/>
-      <source>RC Loss Timeout:</source>
-      <translation type="unfinished">RC Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="301"/>
-      <source>Data Link Loss Failsafe Trigger</source>
-      <translation type="unfinished">Data Link Loss Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="341"/>
-      <source>Data Link Loss Timeout:</source>
-      <translation type="unfinished">Data Link Loss Timeout:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="353"/>
-      <source>Geofence Failsafe Trigger</source>
-      <translation type="unfinished">Geofence Failsafe Trigger</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="382"/>
-      <source>Action on breach:</source>
-      <translation type="unfinished">Action on breach:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="395"/>
-      <source>Max Radius:</source>
-      <translation type="unfinished">Max Radius:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="408"/>
-      <source>Max Altitude:</source>
-      <translation type="unfinished">Max Altitude:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="423"/>
-      <source>Return To Launch Settings</source>
-      <translation type="unfinished">Return To Launch Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="462"/>
-      <source>Return to launch, then:</source>
-      <translation type="unfinished">Return to launch, then:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="605"/>
-      <source>Telemetry logging to vehicle storage:</source>
-      <translation type="unfinished">Telemetry logging to vehicle storage:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="451"/>
-      <source>Climb to altitude of:</source>
-      <translation type="unfinished">Climb to altitude of:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="471"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="481"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="491"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="497"/>
-      <source>Loiter Time</source>
-      <translation type="unfinished">Loiter Time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="507"/>
-      <source>Loiter Altitude</source>
-      <translation type="unfinished">Loiter Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="520"/>
-      <source>Land Mode Settings</source>
-      <translation type="unfinished">Land Mode Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="549"/>
-      <source>Landing Descent Rate:</source>
-      <translation type="unfinished">Landing Descent Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="563"/>
-      <source>Disarm After:</source>
-      <translation type="unfinished">Disarm After:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="578"/>
-      <source>Vehicle Telemetry Logging</source>
-      <translation type="unfinished">Vehicle Telemetry Logging</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="628"/>
-      <source>Hardware in the Loop Simulation</source>
-      <translation type="unfinished">Hardware in the Loop Simulation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.qml" line="657"/>
-      <source>HITL Enabled:</source>
-      <translation type="unfinished">HITL Enabled:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponent.cc" line="19"/>
-      <source>Safety</source>
-      <translation type="unfinished">Safety</translation>
-    </message>
-  </context>
-  <context>
-    <name>SafetyComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="28"/>
-      <source>Low Battery Failsafe</source>
-      <translation type="unfinished">Low Battery Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="33"/>
-      <source>RC Loss Failsafe</source>
-      <translation type="unfinished">RC Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="38"/>
-      <source>RC Loss Timeout</source>
-      <translation type="unfinished">RC Loss Timeout</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="43"/>
-      <source>Data Link Loss Failsafe</source>
-      <translation type="unfinished">Data Link Loss Failsafe</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="48"/>
-      <source>RTL Climb To</source>
-      <translation type="unfinished">RTL Climb To</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="53"/>
-      <source>RTL, Then</source>
-      <translation type="unfinished">RTL, Then</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="55"/>
-      <source>Land immediately</source>
-      <translation type="unfinished">Land immediately</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="57"/>
-      <source>Loiter and do not land</source>
-      <translation type="unfinished">Loiter and do not land</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="58"/>
-      <source>Loiter and land after specified time</source>
-      <translation type="unfinished">Loiter and land after specified time</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="63"/>
-      <source>Loiter Alt</source>
-      <translation type="unfinished">Loiter Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml" line="69"/>
-      <source>Land Delay</source>
-      <translation type="unfinished">Land Delay</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="27"/>
-      <source>Sensors</source>
-      <translation type="unfinished">Sensors</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponent.cc" line="39"/>
-      <source>Sensors Setup is used to calibrate the sensors within your vehicle.</source>
-      <translation type="unfinished">Sensors Setup is used to calibrate the sensors within your vehicle.</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentController</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="173"/>
-      <source>Calibration complete</source>
-      <translation type="unfinished">Calibration complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="190"/>
-      <source>Calibration failed. Calibration log will be displayed.</source>
-      <translation type="unfinished">Calibration failed. Calibration log will be displayed.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="276"/>
-      <source>Unsupported calibration firmware version, using log</source>
-      <translation type="unfinished">Unsupported calibration firmware version, using log</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="308"/>
-      <source>Place your vehicle into one of the Incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Place your vehicle into one of the Incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="393"/>
-      <source>Rotate the vehicle continuously as shown in the diagram until marked as Completed</source>
-      <translation type="unfinished">Rotate the vehicle continuously as shown in the diagram until marked as Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="395"/>
-      <source>Hold still in the current orientation</source>
-      <translation type="unfinished">Hold still in the current orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="433"/>
-      <source>Place you vehicle into one of the orientations shown below and hold it still</source>
-      <translation type="unfinished">Place you vehicle into one of the orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="442"/>
-      <source>Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</source>
-      <translation type="unfinished">Orientation already completed, place you vehicle into one of the incomplete orientations shown below and hold it still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="502"/>
-      <source>Reset successful</source>
-      <translation type="unfinished">Reset successful</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentController.cc" line="509"/>
-      <source>Reset failed</source>
-      <translation type="unfinished">Reset failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummary</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="29"/>
-      <source>Compass 0</source>
-      <translation type="unfinished">Compass 0</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="30"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="36"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="52"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="34"/>
-      <source>Compass 1</source>
-      <translation type="unfinished">Compass 1</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="40"/>
-      <source>Compass 2</source>
-      <translation type="unfinished">Compass 2</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="46"/>
-      <source>Gyro</source>
-      <translation type="unfinished">Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml" line="51"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsComponentSummaryFixedWing</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="32"/>
-      <source>Compass:</source>
-      <translation type="unfinished">Compass:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Setup required</source>
-      <translation type="unfinished">Setup required</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="33"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="38"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="43"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="49"/>
-      <source>Ready</source>
-      <translation type="unfinished">Ready</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="37"/>
-      <source>Gyro:</source>
-      <translation type="unfinished">Gyro:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="42"/>
-      <source>Accelerometer:</source>
-      <translation type="unfinished">Accelerometer:</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsComponentSummaryFixedWing.qml" line="47"/>
-      <source>Airspeed:</source>
-      <translation type="unfinished">Airspeed:</translation>
-    </message>
-  </context>
-  <context>
-    <name>SensorsSetup</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="41"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="42"/>
-      <source>If the orientation is in the direction of flight, select ROTATION_NONE.</source>
-      <translation type="unfinished">If the orientation is in the direction of flight, select ROTATION_NONE.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="48"/>
-      <source>For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</source>
-      <translation type="unfinished">For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor. Do not touch the sensor or obstruct any holes during the calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="50"/>
-      <source>Start the individual calibration steps by clicking one of the buttons to the left.</source>
-      <translation type="unfinished">Start the individual calibration steps by clicking one of the buttons to the left.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="201"/>
-      <source>Compass Calibration Complete</source>
-      <translation type="unfinished">Compass Calibration Complete</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="206"/>
-      <source>Calibration Cancel</source>
-      <translation type="unfinished">Calibration Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Sensor Calibration</source>
-      <translation type="unfinished">Sensor Calibration</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="214"/>
-      <source>Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</source>
-      <translation type="unfinished">Performing sensor calibration over a WiFi connection is known to be unreliable. You should disconnect and perform calibration using a direct USB connection instead.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="222"/>
-      <source>Waiting for Vehicle to response to Cancel. This may take a few seconds.</source>
-      <translation type="unfinished">Waiting for Vehicle to response to Cancel. This may take a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="272"/>
-      <source>Set autopilot orientation before calibrating.</source>
-      <translation type="unfinished">Set autopilot orientation before calibrating.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="332"/>
-      <source>Reboot Vehicle</source>
-      <translation type="unfinished">Reboot Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="44"/>
-      <source>For Compass calibration you will need to rotate your vehicle through a number of positions.</source>
-      <translation type="unfinished">For Compass calibration you will need to rotate your vehicle through a number of positions.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="45"/>
-      <source>For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</source>
-      <translation type="unfinished">For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="46"/>
-      <source>For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</source>
-      <translation type="unfinished">For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="47"/>
-      <source>To level the horizon you need to place the vehicle in its level flight position and leave still.</source>
-      <translation type="unfinished">To level the horizon you need to place the vehicle in its level flight position and leave still.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="278"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="353"/>
-      <source>Autopilot Orientation</source>
-      <translation type="unfinished">Autopilot Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="289"/>
-      <source>ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="296"/>
-      <source>Click Ok to start calibration.</source>
-      <translation type="unfinished">Click Ok to start calibration.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="327"/>
-      <source>Reboot the vehicle prior to flight.</source>
-      <translation type="unfinished">Reboot the vehicle prior to flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="343"/>
-      <source>Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</source>
-      <translation type="unfinished">Adjust orientations as needed.
-
-ROTATION_NONE indicates component points in direction of flight.</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="374"/>
-      <source>Mag %1 Orientation</source>
-      <translation type="unfinished">Mag %1 Orientation</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="403"/>
-      <source>Compass</source>
-      <translation type="unfinished">Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="410"/>
-      <source>Calibrate Compass</source>
-      <translation type="unfinished">Calibrate Compass</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="417"/>
-      <source>Gyroscope</source>
-      <translation type="unfinished">Gyroscope</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="424"/>
-      <source>Calibrate Gyro</source>
-      <translation type="unfinished">Calibrate Gyro</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="431"/>
-      <source>Accelerometer</source>
-      <translation type="unfinished">Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="438"/>
-      <source>Calibrate Accelerometer</source>
-      <translation type="unfinished">Calibrate Accelerometer</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="445"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="453"/>
-      <source>Level Horizon</source>
-      <translation type="unfinished">Level Horizon</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="460"/>
-      <source>Airspeed</source>
-      <translation type="unfinished">Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="471"/>
-      <source>Calibrate Airspeed</source>
-      <translation type="unfinished">Calibrate Airspeed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="478"/>
-      <source>Cancel</source>
-      <translation type="unfinished">Cancel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="487"/>
-      <source>Next</source>
-      <translation type="unfinished">Next</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="495"/>
-      <source>Orientations</source>
-      <translation type="unfinished">Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="501"/>
-      <source>Set Orientations</source>
-      <translation type="unfinished">Set Orientations</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Rotate</source>
-      <translation type="unfinished">Rotate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="576"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="585"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="594"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="603"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="612"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="621"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <location filename="../src/AutoPilotPlugins/PX4/SensorsSetup.qml" line="628"/>
-      <source>Factory reset</source>
-      <translation type="unfinished">Factory reset</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialConfiguration</name>
-    <message>
-      <location filename="../src/comm/SerialLink.h" line="83"/>
-      <source>Serial Link Settings</source>
-      <translation type="unfinished">Serial Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialLink</name>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="75"/>
-      <source>Could not send data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not send data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="121"/>
-      <source>Error connecting: Could not create port. %1</source>
-      <translation type="unfinished">Error connecting: Could not create port. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="244"/>
-      <source>Could not read data - link %1 is disconnected!</source>
-      <translation type="unfinished">Could not read data - link %1 is disconnected!</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/SerialLink.cc" line="282"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-  </context>
-  <context>
-    <name>SerialSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="92"/>
-      <source>Baud rate name not in combo box</source>
-      <translation type="unfinished">Baud rate name not in combo box</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="114"/>
-      <source>Enable Flow Control</source>
-      <translation type="unfinished">Enable Flow Control</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="31"/>
-      <source>Serial Port</source>
-      <translation type="unfinished">Serial Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="65"/>
-      <source>None Available</source>
-      <translation type="unfinished">None Available</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="73"/>
-      <source>Baud Rate</source>
-      <translation type="unfinished">Baud Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="102"/>
-      <source>Advanced Settings</source>
-      <translation type="unfinished">Advanced Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="119"/>
-      <source>Parity</source>
-      <translation type="unfinished">Parity</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>None</source>
-      <translation type="unfinished">None</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Even</source>
-      <translation type="unfinished">Even</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="122"/>
-      <source>Odd</source>
-      <translation type="unfinished">Odd</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="157"/>
-      <source>Data Bits</source>
-      <translation type="unfinished">Data Bits</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/SerialSettings.qml" line="165"/>
-      <source>Stop Bits</source>
-      <translation type="unfinished">Stop Bits</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupPage</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="42"/>
-      <source>flying</source>
-      <translation type="unfinished">flying</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="44"/>
-      <source>%1 Setup</source>
-      <translation type="unfinished">%1 Setup</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="66"/>
-      <source>Advanced</source>
-      <translation type="unfinished">Advanced</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SetupPage.qml" line="77"/>
-      <source> (Disabled while the vehicle is %1)</source>
-      <translation type="unfinished"> (Disabled while the vehicle is %1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SetupView</name>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="35"/>
-      <source>This operation cannot be performed while the vehicle is armed.</source>
-      <translation type="unfinished">This operation cannot be performed while the vehicle is armed.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="38"/>
-      <source>missing message panel text</source>
-      <translation type="unfinished">missing message panel text</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="80"/>
-      <source>%1 setup must be completed prior to %2 setup.</source>
-      <translation type="unfinished">%1 setup must be completed prior to %2 setup.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="132"/>
-      <source>%1 does not currently support setup of your vehicle type. </source>
-      <translation type="unfinished">%1 does not currently support setup of your vehicle type. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="150"/>
-      <source>Vehicle settings and info will display after connecting your vehicle.</source>
-      <translation type="unfinished">Vehicle settings and info will display after connecting your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="171"/>
-      <source>You are currently connected to a vehicle but it did not return the full parameter list. </source>
-      <translation type="unfinished">You are currently connected to a vehicle but it did not return the full parameter list. </translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="172"/>
-      <source>As a result, the full set of vehicle setup options are not available.</source>
-      <translation type="unfinished">As a result, the full set of vehicle setup options are not available.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="231"/>
-      <source>Summary</source>
-      <translation type="unfinished">Summary</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="243"/>
-      <source>Firmware</source>
-      <translation type="unfinished">Firmware</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="254"/>
-      <source>PX4Flow</source>
-      <translation type="unfinished">PX4Flow</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="266"/>
-      <source>Joystick</source>
-      <translation type="unfinished">Joystick</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/SetupView.qml" line="293"/>
-      <source>Parameters</source>
-      <translation type="unfinished">Parameters</translation>
-    </message>
-  </context>
-  <context>
-    <name>ShapeFileHelper</name>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="17"/>
-      <source>Shape file load failed. %1</source>
-      <translation type="unfinished">Shape file load failed. %1</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="40"/>
-      <source>Unsupported file type. Only .%1 and .%2 are supported.</source>
-      <translation type="unfinished">Unsupported file type. Only .%1 and .%2 are supported.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="93"/>
-      <source>Polyline not support from SHP files.</source>
-      <translation type="unfinished">Polyline not support from SHP files.</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="102"/>
-      <source>KML Files (*.%1)</source>
-      <translation type="unfinished">KML Files (*.%1)</translation>
-    </message>
-    <message>
-      <location filename="../src/ShapeFileHelper.cc" line="107"/>
-      <source>KML/SHP Files (*.%1 *.%2)</source>
-      <translation type="unfinished">KML/SHP Files (*.%1 *.%2)</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="76"/>
-      <source>Move &apos;%1&apos; %2 to the %3 location. %4</source>
-      <translation type="unfinished">Move &apos;%1&apos; %2 to the %3 location. %4</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="157"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="38"/>
-      <source>Internal Error</source>
-      <translation type="unfinished">Internal Error</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="65"/>
-      <source>Provides advanced access to all commands/parameters. Be very careful!</source>
-      <translation type="unfinished">Provides advanced access to all commands/parameters. Be very careful!</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="77"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="78"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>desired</source>
-      <translation type="unfinished">desired</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="79"/>
-      <source>climbout</source>
-      <translation type="unfinished">climbout</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="80"/>
-      <source>Ensure distance from launch to transition direction is far enough to complete transition.</source>
-      <translation type="unfinished">Ensure distance from launch to transition direction is far enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="87"/>
-      <source>Ensure clear of obstacles and into the wind.</source>
-      <translation type="unfinished">Ensure clear of obstacles and into the wind.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="94"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="105"/>
-      <source>Click in map to set planned Takeoff location.</source>
-      <translation type="unfinished">Click in map to set planned Takeoff location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="106"/>
-      <source>Click in map to set planned Launch location.</source>
-      <translation type="unfinished">Click in map to set planned Launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="129"/>
-      <source>Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</source>
-      <translation type="unfinished">Altitude below specifies the approximate altitude of the ground. Normally 0 for landing back at original launch location.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="183"/>
-      <source>Actual AMSL alt sent: %1 %2</source>
-      <translation type="unfinished">Actual AMSL alt sent: %1 %2</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SimpleItemEditor.qml" line="243"/>
-      <source>Flight Speed</source>
-      <translation type="unfinished">Flight Speed</translation>
-    </message>
-  </context>
-  <context>
-    <name>SimpleMissionItem</name>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="399"/>
-      <source>Unknown: %1</source>
-      <translation type="unfinished">Unknown: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="406"/>
-      <source>L</source>
-      <translation type="unfinished">L</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="410"/>
-      <source>Takeoff</source>
-      <translation type="unfinished">Takeoff</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="412"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="414"/>
-      <source>Transition Direction</source>
-      <translation type="unfinished">Transition Direction</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="416"/>
-      <source>VTOL Land</source>
-      <translation type="unfinished">VTOL Land</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="419"/>
-      <source>ROI</source>
-      <translation type="unfinished">ROI</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SimpleMissionItem.cc" line="424"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-  </context>
-  <context>
-    <name>StructureScanComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="235"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="241"/>
-      <source>%1 version %2 not supported</source>
-      <translation type="unfinished">%1 version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/StructureScanComplexItem.cc" line="26"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="79"/>
-      <location filename="../src/MissionManager/StructureScanComplexItem.h" line="80"/>
-      <source>Structure Scan</source>
-      <translation type="unfinished">Structure Scan</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">Use the Polygon Tools to create the polygon which outlines the structure.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="100"/>
-      <source>Grid</source>
-      <translation type="unfinished">Grid</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="101"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="113"/>
-      <source>Note: Polygon respresents structure surface not vehicle flight path.</source>
-      <translation type="unfinished">Note: Polygon respresents structure surface not vehicle flight path.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="121"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="130"/>
-      <source>Scan Distance</source>
-      <translation type="unfinished">Scan Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="131"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="222"/>
-      <source>Layer Height</source>
-      <translation type="unfinished">Layer Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="132"/>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="237"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="139"/>
-      <source>Scan</source>
-      <translation type="unfinished">Scan</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Bottom</source>
-      <translation type="unfinished">Start Scan From Bottom</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="158"/>
-      <source>Start Scan From Top</source>
-      <translation type="unfinished">Start Scan From Top</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="164"/>
-      <source>Structure Height</source>
-      <translation type="unfinished">Structure Height</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="171"/>
-      <source>Scan Bottom Alt</source>
-      <translation type="unfinished">Scan Bottom Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="178"/>
-      <source>Entrance/Exit Alt</source>
-      <translation type="unfinished">Entrance/Exit Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="186"/>
-      <source>Gimbal Pitch</source>
-      <translation type="unfinished">Gimbal Pitch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="202"/>
-      <source>Rotate entry point</source>
-      <translation type="unfinished">Rotate entry point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="211"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="219"/>
-      <source>Layers</source>
-      <translation type="unfinished">Layers</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="225"/>
-      <source>Top Layer Alt</source>
-      <translation type="unfinished">Top Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="228"/>
-      <source>Bottom Layer Alt</source>
-      <translation type="unfinished">Bottom Layer Alt</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="231"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="234"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/StructureScanEditor.qml" line="235"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-  </context>
-  <context>
-    <name>SubChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="25"/>
-      <source>Submarine Initial checks</source>
-      <translation type="unfinished">Submarine Initial checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="29"/>
-      <source>All seals in place?</source>
-      <translation type="unfinished">All seals in place?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/SubChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="169"/>
-      <source>Survey items do not support version %1</source>
-      <translation type="unfinished">Survey items do not support version %1</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="226"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="282"/>
-      <source>%1 does not support loading this complex mission item type: %2:%3</source>
-      <translation type="unfinished">%1 does not support loading this complex mission item type: %2:%3</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="330"/>
-      <source>%1 but %2 object is missing</source>
-      <translation type="unfinished">%1 but %2 object is missing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.cc" line="25"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="58"/>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="59"/>
-      <source>Survey</source>
-      <translation type="unfinished">Survey</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/SurveyComplexItem.h" line="60"/>
-      <source>S</source>
-      <translation type="unfinished">S</translation>
-    </message>
-  </context>
-  <context>
-    <name>SurveyItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="18"/>
-      <source>Use the Polygon Tools to create the polygon which outlines your survey area.</source>
-      <translation type="unfinished">Use the Polygon Tools to create the polygon which outlines your survey area.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="19"/>
-      <source>Transects</source>
-      <translation type="unfinished">Transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="39"/>
-      <source>Angle</source>
-      <translation type="unfinished">Angle</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="61"/>
-      <source>Turnaround dist</source>
-      <translation type="unfinished">Turnaround dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="77"/>
-      <source>Hover and capture image</source>
-      <translation type="unfinished">Hover and capture image</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="83"/>
-      <source>Refly at 90 deg offset</source>
-      <translation type="unfinished">Refly at 90 deg offset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="89"/>
-      <source>Images in turnarounds</source>
-      <translation type="unfinished">Images in turnarounds</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="95"/>
-      <source>Fly alternate transects</source>
-      <translation type="unfinished">Fly alternate transects</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/SurveyItemEditor.qml" line="107"/>
-      <source>Select Polygon File</source>
-      <translation type="unfinished">Select Polygon File</translation>
-    </message>
-  </context>
-  <context>
-    <name>SysStatusSensorInfo</name>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="103"/>
-      <source>Error</source>
-      <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="111"/>
-      <source>Normal</source>
-      <translation type="unfinished">Normal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/SysStatusSensorInfo.cc" line="119"/>
-      <source>Disabled</source>
-      <translation type="unfinished">Disabled</translation>
-    </message>
-  </context>
-  <context>
-    <name>SyslinkComponent</name>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="43"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="61"/>
-      <source>Channel</source>
-      <translation type="unfinished">Channel</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="86"/>
-      <source>Address</source>
-      <translation type="unfinished">Address</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.qml" line="112"/>
-      <source>Data Rate</source>
-      <translation type="unfinished">Data Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="16"/>
-      <source>Syslink</source>
-      <translation type="unfinished">Syslink</translation>
-    </message>
-    <message>
-      <location filename="../src/AutoPilotPlugins/Common/SyslinkComponent.cc" line="28"/>
-      <source>The Syslink Component is used to setup the radio connection on Crazyflies.</source>
-      <translation type="unfinished">The Syslink Component is used to setup the radio connection on Crazyflies.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPConfiguration</name>
-    <message>
-      <location filename="../src/comm/TCPLink.h" line="58"/>
-      <source>TCP Link Settings</source>
-      <translation type="unfinished">TCP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>TCPLink</name>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Link Error</source>
-      <translation type="unfinished">Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="128"/>
-      <source>Error on link %1. Connection failed</source>
-      <translation type="unfinished">Error on link %1. Connection failed</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/TCPLink.cc" line="142"/>
-      <source>Error on link %1. Error on socket: %2.</source>
-      <translation type="unfinished">Error on link %1. Error on socket: %2.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncManager</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="127"/>
-      <source>Auto</source>
-      <translation type="unfinished">Auto</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="128"/>
-      <source>Manual</source>
-      <translation type="unfinished">Manual</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="150"/>
-      <source>Stream</source>
-      <translation type="unfinished">Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="151"/>
-      <source>HDMI Port</source>
-      <translation type="unfinished">HDMI Port</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="172"/>
-      <source>Low</source>
-      <translation type="unfinished">Low</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="173"/>
-      <source>Medium</source>
-      <translation type="unfinished">Medium</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncManager.cc" line="174"/>
-      <source>High</source>
-      <translation type="unfinished">High</translation>
-    </message>
-  </context>
-  <context>
-    <name>TaisyncSettings</name>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="56"/>
-      <source>Reboot ground unit for changes to take effect.</source>
-      <translation type="unfinished">Reboot ground unit for changes to take effect.</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="71"/>
-      <source>General</source>
-      <translation type="unfinished">General</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="88"/>
-      <source>Enable Taisync</source>
-      <translation type="unfinished">Enable Taisync</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="94"/>
-      <source>Enable Taisync Video</source>
-      <translation type="unfinished">Enable Taisync Video</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="112"/>
-      <source>Connection Status</source>
-      <translation type="unfinished">Connection Status</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="134"/>
-      <source>Ground Unit:</source>
-      <translation type="unfinished">Ground Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Connected</source>
-      <translation type="unfinished">Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="138"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="146"/>
-      <source>Not Connected</source>
-      <translation type="unfinished">Not Connected</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="143"/>
-      <source>Air Unit:</source>
-      <translation type="unfinished">Air Unit:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="150"/>
-      <source>Uplink RSSI:</source>
-      <translation type="unfinished">Uplink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="156"/>
-      <source>Downlink RSSI:</source>
-      <translation type="unfinished">Downlink RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="174"/>
-      <source>Device Info</source>
-      <translation type="unfinished">Device Info</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="196"/>
-      <source>Serial Number:</source>
-      <translation type="unfinished">Serial Number:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="200"/>
-      <source/>
-      <translation type="unfinished"/>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="204"/>
-      <source>Firmware Version:</source>
-      <translation type="unfinished">Firmware Version:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="222"/>
-      <source>Radio Settings</source>
-      <translation type="unfinished">Radio Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="244"/>
-      <source>Radio Mode:</source>
-      <translation type="unfinished">Radio Mode:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="254"/>
-      <source>Radio Frequency:</source>
-      <translation type="unfinished">Radio Frequency:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="275"/>
-      <source>Video Settings</source>
-      <translation type="unfinished">Video Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="297"/>
-      <source>Video Output:</source>
-      <translation type="unfinished">Video Output:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="307"/>
-      <source>Encoder:</source>
-      <translation type="unfinished">Encoder:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="316"/>
-      <source>Bit Rate:</source>
-      <translation type="unfinished">Bit Rate:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="337"/>
-      <source>Streaming Settings</source>
-      <translation type="unfinished">Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="359"/>
-      <source>RTSP URI:</source>
-      <translation type="unfinished">RTSP URI:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="370"/>
-      <source>Account:</source>
-      <translation type="unfinished">Account:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="379"/>
-      <source>Password:</source>
-      <translation type="unfinished">Password:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="406"/>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="512"/>
-      <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="415"/>
-      <source>Set Streaming Settings</source>
-      <translation type="unfinished">Set Streaming Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="416"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect.
-
-Confirm change?</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="438"/>
-      <source>Network Settings</source>
-      <translation type="unfinished">Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="460"/>
-      <source>Local IP Address:</source>
-      <translation type="unfinished">Local IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="471"/>
-      <source>Ground Unit IP Address:</source>
-      <translation type="unfinished">Ground Unit IP Address:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="481"/>
-      <source>Network Mask:</source>
-      <translation type="unfinished">Network Mask:</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="521"/>
-      <source>Set Network Settings</source>
-      <translation type="unfinished">Set Network Settings</translation>
-    </message>
-    <message>
-      <location filename="../src/Taisync/TaisyncSettings.qml" line="522"/>
-      <source>Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</source>
-      <translation type="unfinished">Once changed, you will need to reboot the ground unit for the changes to take effect. The local IP address must match the one entered (%1).
-
-Confirm change?</translation>
-    </message>
-  </context>
-  <context>
-    <name>TakeoffItemMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/TakeoffItemMapVisual.qml" line="132"/>
-      <source>Launch</source>
-      <translation type="unfinished">Launch</translation>
-    </message>
-  </context>
-  <context>
-    <name>TcpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="29"/>
-      <source>Server Address</source>
-      <translation type="unfinished">Server Address</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/TcpSettings.qml" line="36"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-  </context>
-  <context>
-    <name>TelemetryRSSIIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="48"/>
-      <source>Telemetry RSSI Status</source>
-      <translation type="unfinished">Telemetry RSSI Status</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="58"/>
-      <source>Local RSSI:</source>
-      <translation type="unfinished">Local RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="60"/>
-      <source>Remote RSSI:</source>
-      <translation type="unfinished">Remote RSSI:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="62"/>
-      <source>RX Errors:</source>
-      <translation type="unfinished">RX Errors:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="64"/>
-      <source>Errors Fixed:</source>
-      <translation type="unfinished">Errors Fixed:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="66"/>
-      <source>TX Buffer:</source>
-      <translation type="unfinished">TX Buffer:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="68"/>
-      <source>Local Noise:</source>
-      <translation type="unfinished">Local Noise:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/TelemetryRSSIIndicator.qml" line="70"/>
-      <source>Remote Noise:</source>
-      <translation type="unfinished">Remote Noise:</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainProgress</name>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="69"/>
-      <source>Terrain Load Progress</source>
-      <translation type="unfinished">Terrain Load Progress</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/TerrainProgress.qml" line="87"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>TerrainStatus</name>
-    <message>
-      <location filename="../src/PlanView/TerrainStatus.qml" line="45"/>
-      <source>Height AMSL (%1)</source>
-      <translation type="unfinished">Height AMSL (%1)</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.cc" line="233"/>
-      <source>TransectStyleComplexItem version %2 not supported</source>
-      <translation type="unfinished">TransectStyleComplexItem version %2 not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="101"/>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="102"/>
-      <source>Transect</source>
-      <translation type="unfinished">Transect</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/TransectStyleComplexItem.h" line="103"/>
-      <source>T</source>
-      <translation type="unfinished">T</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemEditor</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="36"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="92"/>
-      <source>WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</source>
-      <translation type="unfinished">WARNING: Photo interval is below minimum interval (%1 secs) supported by camera.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="102"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="103"/>
-      <source>Trigger Dist</source>
-      <translation type="unfinished">Trigger Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="104"/>
-      <source>Spacing</source>
-      <translation type="unfinished">Spacing</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="123"/>
-      <source>Rotate Entry Point</source>
-      <translation type="unfinished">Rotate Entry Point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="131"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="234"/>
-      <source>Statistics</source>
-      <translation type="unfinished">Statistics</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="163"/>
-      <source>Presets</source>
-      <translation type="unfinished">Presets</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="178"/>
-      <source>Apply Preset</source>
-      <translation type="unfinished">Apply Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="185"/>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="193"/>
-      <source>Delete Preset</source>
-      <translation type="unfinished">Delete Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="196"/>
-      <source>Are you sure you want to delete &apos;%1&apos; preset?</source>
-      <translation type="unfinished">Are you sure you want to delete &apos;%1&apos; preset?</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="212"/>
-      <source>Save Settings As New Preset</source>
-      <translation type="unfinished">Save Settings As New Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="249"/>
-      <source>Save Preset</source>
-      <translation type="unfinished">Save Preset</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="265"/>
-      <source>Save the current settings as a named preset.</source>
-      <translation type="unfinished">Save the current settings as a named preset.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="270"/>
-      <source>Preset Name</source>
-      <translation type="unfinished">Preset Name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="276"/>
-      <source>Enter preset name</source>
-      <translation type="unfinished">Enter preset name</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="283"/>
-      <source>Preset name cannot be blank.</source>
-      <translation type="unfinished">Preset name cannot be blank.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemEditor.qml" line="286"/>
-      <source>Preset name cannot include the &quot;/&quot; character.</source>
-      <translation type="unfinished">Preset name cannot include the &quot;/&quot; character.</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemStats</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="16"/>
-      <source>Survey Area</source>
-      <translation type="unfinished">Survey Area</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="19"/>
-      <source>Photo Count</source>
-      <translation type="unfinished">Photo Count</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="22"/>
-      <source>Photo Interval</source>
-      <translation type="unfinished">Photo Interval</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="23"/>
-      <source>secs</source>
-      <translation type="unfinished">secs</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemStats.qml" line="25"/>
-      <source>Trigger Distance</source>
-      <translation type="unfinished">Trigger Distance</translation>
-    </message>
-  </context>
-  <context>
-    <name>TransectStyleComplexItemTerrainFollow</name>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="56"/>
-      <source>Tolerance</source>
-      <translation type="unfinished">Tolerance</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="62"/>
-      <source>Max Climb Rate</source>
-      <translation type="unfinished">Max Climb Rate</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/TransectStyleComplexItemTerrainFollow.qml" line="68"/>
-      <source>Max Descent Rate</source>
-      <translation type="unfinished">Max Descent Rate</translation>
-    </message>
-  </context>
-  <context>
-    <name>UAS</name>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="318"/>
-      <source>UNINIT</source>
-      <translation type="unfinished">UNINIT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="319"/>
-      <source>Unitialized, booting up.</source>
-      <translation type="unfinished">Unitialized, booting up.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="322"/>
-      <source>BOOT</source>
-      <translation type="unfinished">BOOT</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="323"/>
-      <source>Booting system, please wait.</source>
-      <translation type="unfinished">Booting system, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="326"/>
-      <source>CALIBRATING</source>
-      <translation type="unfinished">CALIBRATING</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="327"/>
-      <source>Calibrating sensors, please wait.</source>
-      <translation type="unfinished">Calibrating sensors, please wait.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="330"/>
-      <source>ACTIVE</source>
-      <translation type="unfinished">ACTIVE</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="331"/>
-      <source>Active, normal operation.</source>
-      <translation type="unfinished">Active, normal operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="334"/>
-      <source>STANDBY</source>
-      <translation type="unfinished">STANDBY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="335"/>
-      <source>Standby mode, ready for launch.</source>
-      <translation type="unfinished">Standby mode, ready for launch.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="338"/>
-      <source>CRITICAL</source>
-      <translation type="unfinished">CRITICAL</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="339"/>
-      <source>FAILURE: Continuing operation.</source>
-      <translation type="unfinished">FAILURE: Continuing operation.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="342"/>
-      <source>EMERGENCY</source>
-      <translation type="unfinished">EMERGENCY</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="343"/>
-      <source>EMERGENCY: Land Immediately!</source>
-      <translation type="unfinished">EMERGENCY: Land Immediately!</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="351"/>
-      <source>SHUTDOWN</source>
-      <translation type="unfinished">SHUTDOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="352"/>
-      <source>Powering off system.</source>
-      <translation type="unfinished">Powering off system.</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="356"/>
-      <source>UNKNOWN</source>
-      <translation type="unfinished">UNKNOWN</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UAS.cc" line="357"/>
-      <source>Unknown system state</source>
-      <translation type="unfinished">Unknown system state</translation>
-    </message>
-  </context>
-  <context>
-    <name>UASMessageHandler</name>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="156"/>
-      <source> EMERGENCY:</source>
-      <translation type="unfinished"> EMERGENCY:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="159"/>
-      <source> ALERT:</source>
-      <translation type="unfinished"> ALERT:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="162"/>
-      <source> Critical:</source>
-      <translation type="unfinished"> Critical:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="165"/>
-      <source> Error:</source>
-      <translation type="unfinished"> Error:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="168"/>
-      <source> Warning:</source>
-      <translation type="unfinished"> Warning:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="171"/>
-      <source> Notice:</source>
-      <translation type="unfinished"> Notice:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="174"/>
-      <source> Info:</source>
-      <translation type="unfinished"> Info:</translation>
-    </message>
-    <message>
-      <location filename="../src/uas/UASMessageHandler.cc" line="177"/>
-      <source> Debug:</source>
-      <translation type="unfinished"> Debug:</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPConfiguration</name>
-    <message>
-      <location filename="../src/comm/UDPLink.h" line="79"/>
-      <source>UDP Link Settings</source>
-      <translation type="unfinished">UDP Link Settings</translation>
-    </message>
-  </context>
-  <context>
-    <name>UDPLink</name>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>UDP Link Error</source>
-      <translation type="unfinished">UDP Link Error</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="269"/>
-      <source>Error binding UDP port: %1</source>
-      <translation type="unfinished">Error binding UDP port: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/UDPLink.cc" line="293"/>
-      <source>Error registering Zeroconf</source>
-      <translation type="unfinished">Error registering Zeroconf</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>
-      <translation type="unfinished">Could not detect ULog file header magic</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/ULogParser.cc" line="180"/>
-      <source>Could not detect camera_capture packets in ULog</source>
-      <translation type="unfinished">Could not detect camera_capture packets in ULog</translation>
-    </message>
-  </context>
-  <context>
-    <name>UdpSettings</name>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="31"/>
-      <source>Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</source>
-      <translation type="unfinished">Note: For best perfomance, please disable AutoConnect to UDP devices on the General page.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="37"/>
-      <source>Port</source>
-      <translation type="unfinished">Port</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="48"/>
-      <source>Server Addresses (optional)</source>
-      <translation type="unfinished">Server Addresses (optional)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="62"/>
-      <source>Remove</source>
-      <translation type="unfinished">Remove</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="74"/>
-      <source>Example: 127.0.0.1:14550</source>
-      <translation type="unfinished">Example: 127.0.0.1:14550</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences/UdpSettings.qml" line="77"/>
-      <source>Add Server</source>
-      <translation type="unfinished">Add Server</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsFirstRunPrompt</name>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="21"/>
-      <source>Measurement Units</source>
-      <translation type="unfinished">Measurement Units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Horizontal Distance</source>
-      <translation type="unfinished">Horizontal Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Vertical Distance</source>
-      <translation type="unfinished">Vertical Distance</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Area</source>
-      <translation type="unfinished">Area</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Speed</source>
-      <translation type="unfinished">Speed</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="27"/>
-      <source>Temperature</source>
-      <translation type="unfinished">Temperature</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="64"/>
-      <source>Choose the measurement units you want to use. You can also change it later in General Settings.</source>
-      <translation type="unfinished">Choose the measurement units you want to use. You can also change it later in General Settings.</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="84"/>
-      <source>System of units</source>
-      <translation type="unfinished">System of units</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Metric System</source>
-      <translation type="unfinished">Metric System</translation>
-    </message>
-    <message>
-      <location filename="../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml" line="97"/>
-      <source>Imperial System</source>
-      <translation type="unfinished">Imperial System</translation>
-    </message>
-  </context>
-  <context>
-    <name>UnitsSettings</name>
-    <message>
-      <location filename="../src/Settings/UnitsSettings.cc" line="196"/>
-      <source>Weight units</source>
-      <translation type="unfinished">Weight units</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLChecklist</name>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="25"/>
-      <source>VTOL Initial Checks</source>
-      <translation type="unfinished">VTOL Initial Checks</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="28"/>
-      <source>Hardware</source>
-      <translation type="unfinished">Hardware</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="29"/>
-      <source>Props mounted? Wings secured? Tail secured?</source>
-      <translation type="unfinished">Props mounted? Wings secured? Tail secured?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="50"/>
-      <source>Please arm the vehicle here</source>
-      <translation type="unfinished">Please arm the vehicle here</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="53"/>
-      <source>Actuators</source>
-      <translation type="unfinished">Actuators</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="54"/>
-      <source>Move all control surfaces. Did they work properly?</source>
-      <translation type="unfinished">Move all control surfaces. Did they work properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="58"/>
-      <source>Motors</source>
-      <translation type="unfinished">Motors</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="59"/>
-      <source>Propellers free? Then throttle up gently. Working properly?</source>
-      <translation type="unfinished">Propellers free? Then throttle up gently. Working properly?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="63"/>
-      <source>Mission</source>
-      <translation type="unfinished">Mission</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="64"/>
-      <source>Please confirm mission is valid (waypoints valid, no terrain collision).</source>
-      <translation type="unfinished">Please confirm mission is valid (waypoints valid, no terrain collision).</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="72"/>
-      <source>Last preparations before launch</source>
-      <translation type="unfinished">Last preparations before launch</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="76"/>
-      <source>Payload</source>
-      <translation type="unfinished">Payload</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="77"/>
-      <source>Configured and started? Payload lid closed?</source>
-      <translation type="unfinished">Configured and started? Payload lid closed?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="82"/>
-      <source>OK for your platform? Lauching into the wind?</source>
-      <translation type="unfinished">OK for your platform? Lauching into the wind?</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="86"/>
-      <source>Flight area</source>
-      <translation type="unfinished">Flight area</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VTOLChecklist.qml" line="87"/>
-      <source>Launch area and path free of obstacles/people?</source>
-      <translation type="unfinished">Launch area and path free of obstacles/people?</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingComplexItem</name>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="23"/>
-      <source>VTOL Landing</source>
-      <translation type="unfinished">VTOL Landing</translation>
-    </message>
-    <message>
-      <location filename="../src/MissionManager/VTOLLandingComplexItem.cc" line="82"/>
-      <source>%1 complex item version %2 not supported</source>
-      <translation type="unfinished">%1 complex item version %2 not supported</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternEditor</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="40"/>
-      <source>Set to vehicle heading</source>
-      <translation type="unfinished">Set to vehicle heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="41"/>
-      <source>Set to vehicle location</source>
-      <translation type="unfinished">Set to vehicle location</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="58"/>
-      <source>Final approach</source>
-      <translation type="unfinished">Final approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="70"/>
-      <source>Use loiter to altitude</source>
-      <translation type="unfinished">Use loiter to altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="80"/>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="142"/>
-      <source>Altitude</source>
-      <translation type="unfinished">Altitude</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="89"/>
-      <source>Radius</source>
-      <translation type="unfinished">Radius</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="103"/>
-      <source>Loiter clockwise</source>
-      <translation type="unfinished">Loiter clockwise</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="119"/>
-      <source>Landing point</source>
-      <translation type="unfinished">Landing point</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="135"/>
-      <source>Heading</source>
-      <translation type="unfinished">Heading</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="150"/>
-      <source>Landing Dist</source>
-      <translation type="unfinished">Landing Dist</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="170"/>
-      <source>Altitudes relative to launch</source>
-      <translation type="unfinished">Altitudes relative to launch</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="180"/>
-      <source>Camera</source>
-      <translation type="unfinished">Camera</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="218"/>
-      <source>* Actual flight path will vary.</source>
-      <translation type="unfinished">* Actual flight path will vary.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="227"/>
-      <source>* Avoid tailwind on approach to land.</source>
-      <translation type="unfinished">* Avoid tailwind on approach to land.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="236"/>
-      <source>* Ensure landing distance is enough to complete transition.</source>
-      <translation type="unfinished">* Ensure landing distance is enough to complete transition.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="262"/>
-      <source>Click in map to set landing point.</source>
-      <translation type="unfinished">Click in map to set landing point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="269"/>
-      <source>- or -</source>
-      <translation type="unfinished">- or -</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="301"/>
-      <source>Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</source>
-      <translation type="unfinished">Drag the loiter point to adjust landing direction for wind and obstacles as well as distance to land point.</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternEditor.qml" line="305"/>
-      <source>Done</source>
-      <translation type="unfinished">Done</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLLandingPatternMapVisual</name>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Loiter</source>
-      <translation type="unfinished">Loiter</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="238"/>
-      <source>Approach</source>
-      <translation type="unfinished">Approach</translation>
-    </message>
-    <message>
-      <location filename="../src/PlanView/VTOLLandingPatternMapVisual.qml" line="259"/>
-      <source>Land</source>
-      <translation type="unfinished">Land</translation>
-    </message>
-  </context>
-  <context>
-    <name>VTOLModeIndicator</name>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: FW</source>
-      <translation type="unfinished">VTOL: FW</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="24"/>
-      <source>VTOL: MR</source>
-      <translation type="unfinished">VTOL: MR</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Fixed Wing</source>
-      <translation type="unfinished">VTOL: Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/toolbar/VTOLModeIndicator.qml" line="25"/>
-      <source>VTOL: Multi-Rotor</source>
-      <translation type="unfinished">VTOL: Multi-Rotor</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle</name>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="558"/>
-      <source>MAVLink Generic</source>
-      <translation type="unfinished">MAVLink Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="565"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="567"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="569"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="571"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="573"/>
-      <source>Rover</source>
-      <translation type="unfinished">Rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="575"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="577"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="866"/>
-      <source> ... </source>
-      <comment>Indicates missing chunk from chunked STATUS_TEXT</comment>
-      <translation type="unfinished"> ... </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2168"/>
-      <source>Mission transfer failed. Error: %1</source>
-      <translation type="unfinished">Mission transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2174"/>
-      <source>GeoFence transfer failed. Error: %1</source>
-      <translation type="unfinished">GeoFence transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2180"/>
-      <source>Rally Point transfer failed. Error: %1</source>
-      <translation type="unfinished">Rally Point transfer failed. Error: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1423"/>
-      <source>battery %1 level low</source>
-      <translation type="unfinished">battery %1 level low</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1429"/>
-      <source>battery %1 level is critical</source>
-      <translation type="unfinished">battery %1 level is critical</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1435"/>
-      <source>battery %1 level emergency</source>
-      <translation type="unfinished">battery %1 level emergency</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1441"/>
-      <source>battery %1 failed</source>
-      <translation type="unfinished">battery %1 failed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1447"/>
-      <source>battery %1 unhealthy</source>
-      <translation type="unfinished">battery %1 unhealthy</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="1459"/>
-      <source>warning</source>
-      <translation type="unfinished">warning</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2391"/>
-      <source>Generic micro air vehicle</source>
-      <translation type="unfinished">Generic micro air vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2392"/>
-      <source>Fixed wing aircraft</source>
-      <translation type="unfinished">Fixed wing aircraft</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2393"/>
-      <source>Quadrotor</source>
-      <translation type="unfinished">Quadrotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2394"/>
-      <source>Coaxial helicopter</source>
-      <translation type="unfinished">Coaxial helicopter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2395"/>
-      <source>Normal helicopter with tail rotor.</source>
-      <translation type="unfinished">Normal helicopter with tail rotor.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2396"/>
-      <source>Ground installation</source>
-      <translation type="unfinished">Ground installation</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2397"/>
-      <source>Operator control unit / ground control station</source>
-      <translation type="unfinished">Operator control unit / ground control station</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2398"/>
-      <source>Airship, controlled</source>
-      <translation type="unfinished">Airship, controlled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2399"/>
-      <source>Free balloon, uncontrolled</source>
-      <translation type="unfinished">Free balloon, uncontrolled</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2400"/>
-      <source>Rocket</source>
-      <translation type="unfinished">Rocket</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2401"/>
-      <source>Ground rover</source>
-      <translation type="unfinished">Ground rover</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2402"/>
-      <source>Surface vessel, boat, ship</source>
-      <translation type="unfinished">Surface vessel, boat, ship</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2403"/>
-      <source>Submarine</source>
-      <translation type="unfinished">Submarine</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2404"/>
-      <source>Hexarotor</source>
-      <translation type="unfinished">Hexarotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2405"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2406"/>
-      <source>Octorotor</source>
-      <translation type="unfinished">Octorotor</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2407"/>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2408"/>
-      <source>Flapping wing</source>
-      <translation type="unfinished">Flapping wing</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2409"/>
-      <source>Onboard companion controller</source>
-      <translation type="unfinished">Onboard companion controller</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2410"/>
-      <source>Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</source>
-      <translation type="unfinished">Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2411"/>
-      <source>Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</source>
-      <translation type="unfinished">Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2412"/>
-      <source>Tiltrotor VTOL</source>
-      <translation type="unfinished">Tiltrotor VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2413"/>
-      <source>VTOL reserved 2</source>
-      <translation type="unfinished">VTOL reserved 2</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2414"/>
-      <source>VTOL reserved 3</source>
-      <translation type="unfinished">VTOL reserved 3</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2415"/>
-      <source>VTOL reserved 4</source>
-      <translation type="unfinished">VTOL reserved 4</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2416"/>
-      <source>VTOL reserved 5</source>
-      <translation type="unfinished">VTOL reserved 5</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2417"/>
-      <source>Onboard gimbal</source>
-      <translation type="unfinished">Onboard gimbal</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2418"/>
-      <source>Onboard ADSB peripheral</source>
-      <translation type="unfinished">Onboard ADSB peripheral</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2427"/>
-      <source>Vehicle %1 </source>
-      <translation type="unfinished">Vehicle %1 </translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3224"/>
-      <source>Vehicle reboot failed.</source>
-      <translation type="unfinished">Vehicle reboot failed.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2435"/>
-      <source>%1 %2 flight mode</source>
-      <translation type="unfinished">%1 %2 flight mode</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>armed</source>
-      <translation type="unfinished">armed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2441"/>
-      <source>disarmed</source>
-      <translation type="unfinished">disarmed</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Unable to send command: %1.</source>
-      <translation type="unfinished">Unable to send command: %1.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Internal error - MAV_COMP_ID_ALL not supported</source>
-      <translation type="unfinished">Internal error - MAV_COMP_ID_ALL not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2835"/>
-      <source>Waiting on previous response to same command.</source>
-      <translation type="unfinished">Waiting on previous response to same command.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2886"/>
-      <source>Vehicle did not respond to command: %1</source>
-      <translation type="unfinished">Vehicle did not respond to command: %1</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="2997"/>
-      <source>Bootloader flash succeeded</source>
-      <translation type="unfinished">Bootloader flash succeeded</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3012"/>
-      <source>%1 command temporarily rejected</source>
-      <translation type="unfinished">%1 command temporarily rejected</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3015"/>
-      <source>%1 command denied</source>
-      <translation type="unfinished">%1 command denied</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3018"/>
-      <source>%1 command not supported</source>
-      <translation type="unfinished">%1 command not supported</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/Vehicle.cc" line="3021"/>
-      <source>%1 command failed</source>
-      <translation type="unfinished">%1 command failed</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vehicle Class</name>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="149"/>
-      <source>Airship</source>
-      <translation type="unfinished">Airship</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="151"/>
-      <source>Fixed Wing</source>
-      <translation type="unfinished">Fixed Wing</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="153"/>
-      <source>Rover-Boat</source>
-      <translation type="unfinished">Rover-Boat</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="155"/>
-      <source>Sub</source>
-      <translation type="unfinished">Sub</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="157"/>
-      <source>Multi-Rotor</source>
-      <translation type="unfinished">Multi-Rotor</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="159"/>
-      <source>VTOL</source>
-      <translation type="unfinished">VTOL</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="161"/>
-      <source>Generic</source>
-      <translation type="unfinished">Generic</translation>
-    </message>
-    <message>
-      <location filename="../src/comm/QGCMAVLink.cc" line="163"/>
-      <source>Unknown</source>
-      <translation type="unfinished">Unknown</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleLinkManager</name>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <source>%1Communication regained on %2 link</source>
-      <translation type="unfinished">%1Communication regained on %2 link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>primary</source>
-      <translation type="unfinished">primary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="62"/>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>secondary</source>
-      <translation type="unfinished">secondary</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="64"/>
-      <source>%1Communication regained</source>
-      <translation type="unfinished">%1Communication regained</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="69"/>
-      <source>%1Switching communication to new primary link</source>
-      <translation type="unfinished">%1Switching communication to new primary link</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="115"/>
-      <source>%1Communication lost on %2 link.</source>
-      <translation type="unfinished">%1Communication lost on %2 link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="126"/>
-      <source>%1Switching communication to secondary link.</source>
-      <translation type="unfinished">%1Switching communication to secondary link.</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="146"/>
-      <source>%1Communication lost</source>
-      <translation type="unfinished">%1Communication lost</translation>
-    </message>
-    <message>
-      <location filename="../src/Vehicle/VehicleLinkManager.cc" line="392"/>
-      <source>Comm Lost</source>
-      <translation type="unfinished">Comm Lost</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleMapItem</name>
-    <message>
-      <location filename="../src/FlightMap/MapItems/VehicleMapItem.qml" line="89"/>
-      <source>Vehicle %1</source>
-      <translation type="unfinished">Vehicle %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleRotationCal</name>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="26"/>
-      <source>Hold Still</source>
-      <translation type="unfinished">Hold Still</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Completed</source>
-      <translation type="unfinished">Completed</translation>
-    </message>
-    <message>
-      <location filename="../src/QmlControls/VehicleRotationCal.qml" line="58"/>
-      <source>Incomplete</source>
-      <translation type="unfinished">Incomplete</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleSummary</name>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="87"/>
-      <source>Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</source>
-      <translation type="unfinished">Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.</translation>
-    </message>
-    <message>
-      <location filename="../src/VehicleSetup/VehicleSummary.qml" line="88"/>
-      <source>WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</source>
-      <translation type="unfinished">WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VehicleWarnings</name>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="37"/>
-      <source>No GPS Lock for Vehicle</source>
-      <translation type="unfinished">No GPS Lock for Vehicle</translation>
-    </message>
-    <message>
-      <location filename="../src/FlightDisplay/VehicleWarnings.qml" line="56"/>
-      <source>The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</source>
-      <translation type="unfinished">The vehicle has failed a pre-arm check. In order to arm the vehicle, resolve the failure.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VibrationPage</name>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="26"/>
-      <source>Analyze vibration associated with your vehicle.</source>
-      <translation type="unfinished">Analyze vibration associated with your vehicle.</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="74"/>
-      <source>X</source>
-      <translation type="unfinished">X</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="96"/>
-      <source>Y</source>
-      <translation type="unfinished">Y</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="118"/>
-      <source>Z</source>
-      <translation type="unfinished">Z</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="139"/>
-      <source>Clip count</source>
-      <translation type="unfinished">Clip count</translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="143"/>
-      <source>Accel 1: </source>
-      <translation type="unfinished">Accel 1: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="147"/>
-      <source>Accel 2: </source>
-      <translation type="unfinished">Accel 2: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="151"/>
-      <source>Accel 3: </source>
-      <translation type="unfinished">Accel 3: </translation>
-    </message>
-    <message>
-      <location filename="../src/AnalyzeView/VibrationPage.qml" line="165"/>
-      <source>Not Available</source>
-      <translation type="unfinished">Not Available</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoManager</name>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="288"/>
-      <source>Video receiver is not ready.</source>
-      <translation type="unfinished">Video receiver is not ready.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="295"/>
-      <source>Invalid video format defined.</source>
-      <translation type="unfinished">Invalid video format defined.</translation>
-    </message>
-    <message>
-      <location filename="../src/VideoManager/VideoManager.cc" line="306"/>
-      <source>Unabled to record video. Video save path must be specified in Settings.</source>
-      <translation type="unfinished">Unabled to record video. Video save path must be specified in Settings.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VideoSettings</name>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="22"/>
-      <source>No Video Available</source>
-      <translation type="unfinished">No Video Available</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="23"/>
-      <source>Video Stream Disabled</source>
-      <translation type="unfinished">Video Stream Disabled</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="24"/>
-      <source>RTSP Video Stream</source>
-      <translation type="unfinished">RTSP Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="25"/>
-      <source>UDP h.264 Video Stream</source>
-      <translation type="unfinished">UDP h.264 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="26"/>
-      <source>UDP h.265 Video Stream</source>
-      <translation type="unfinished">UDP h.265 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="27"/>
-      <source>TCP-MPEG2 Video Stream</source>
-      <translation type="unfinished">TCP-MPEG2 Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="28"/>
-      <source>MPEG-TS (h.264) Video Stream</source>
-      <translation type="unfinished">MPEG-TS (h.264) Video Stream</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="29"/>
-      <source>3DR Solo (requires restart)</source>
-      <translation type="unfinished">3DR Solo (requires restart)</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="30"/>
-      <source>Parrot Discovery</source>
-      <translation type="unfinished">Parrot Discovery</translation>
-    </message>
-    <message>
-      <location filename="../src/Settings/VideoSettings.cc" line="31"/>
-      <source>Yuneec Mantis G</source>
-      <translation type="unfinished">Yuneec Mantis G</translation>
-    </message>
-  </context>
-</TS>